Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove more hardcode string to En.rc

Browse source 
svn path=/trunk/; revision=14467
This commit is contained in:
Magnus Olsen 2005-04-03 10:16:56 +00:00
parent 32fce0a991
commit 315c267eef
6 changed files with 138 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
reactos/subsys/system/cmd/En.rc
View file

@ -86,6 +86,53 @@ CMD [/[C|K] command][/P][/Q][/T:bf]\n\n \
(cannot be terminated).\n \ (cannot be terminated).\n \
/T:bf Sets the background/foreground color (see COLOR command)." /T:bf Sets the background/foreground color (see COLOR command)."
STRING_COLOR_HELP1, "Sets the default foreground and background colors.\n\n \
COLOR [attr [/F]] \n\n \
attr Specifies color attribute of console output\n \
/F fill the console with color attribute\n\n \
There are three ways to specify the colors:\n \
1) [bright] name on [bright] name (only the first three letters are required)\n \
2) decimal on decimal\n \
3) two hex digits\n\n \
Colors are:\n \
dec hex name dec hex name\n \
0 0 Black 8 8 Gray(Bright black)\n \
1 1 Blue 9 9 Bright Blue\n \
2 2 Green 10 A Bright Green\n \
3 3 Cyan 11 B Bright Cyan\n \
4 4 Red 12 C Bright Red\n \
5 5 Magenta 13 D Bright Magenta\n \
6 6 Yellow 14 E Bright Yellow\n \
7 7 White 15 F Bright White"
STRING_COPY_HELP1, "Overwrite %s (Yes/No/All)? "
STRING_COPY_HELP2, "Copies one or more files to another location.\n\n \
COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n \
[+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n \
source Specifies the file or files to be copied.\n \
/A Indicates an ASCII text file.\n \
/B Indicates a binary file.\n \
destination Specifies the directory and/or filename for the new file(s).\n \
/V Verifies that new files are written correctly.\n \
/Y Suppresses prompting to confirm you want to overwrite an\n \
existing destination file.\n \
/-Y Causes prompting to confirm you want to overwrite an\n \
existing destination file.\n\n \
The switch /Y may be present in the COPYCMD environment variable.\n \
..."
STRING_DATE_HELP1, "\nEnter new date (mm%cdd%cyyyy): "
STRING_DATE_HELP2, "\nEnter new date (dd%cmm%cyyyy): "
STRING_DATE_HELP3, "\nEnter new date (yyyy%cmm%cdd): "
STRING_DATE_HELP4, "Displays or sets the date.\n\n \
DATE [/T][date]\n\n \
/T display only\n\n \
Type DATE without parameters to display the current date setting and\n \
a prompt for a new one. Press ENTER to keep the same date."
STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT"
@ -103,8 +150,8 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]"
STRING_CHOICE_OPTION, "YN"
STRING_CHOICE_OPTION "YN" STRING_COPY_OPTION, "YNA"
STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n"
@ -121,6 +168,12 @@ STRING_CMD_ERROR2, "Error creating temporary file for pipe data\n"
STRING_CMD_ERROR3, "Can't redirect to file %s\n" STRING_CMD_ERROR3, "Can't redirect to file %s\n"
STRING_CMD_ERROR4, "Running %s...\n" STRING_CMD_ERROR4, "Running %s...\n"
STRING_CMD_ERROR5, "Running cmdexit.bat...\n" STRING_CMD_ERROR5, "Running cmdexit.bat...\n"
STRING_CONSOLE_ERROR, "Unknown error: %d\n"
STRING_COPY_ERROR1, "Error: Cannot open source - %s!\n"
STRING_COPY_ERROR2, "Error: Can't copy onto itself!\n"
STRING_COPY_ERROR3, "Error writing destination!\n"
STRING_COPY_ERROR4, "Error: Not implemented yet!\n"
STRING_DATE_ERROR, "Invalid date."
STRING_PARAM_ERROR, "Required parameter missing\n" STRING_PARAM_ERROR, "Required parameter missing\n"

35
reactos/subsys/system/cmd/color.c
View file

@ -16,44 +16,23 @@
* *
* 14-Oct-1999 (Paolo Pantaleo <paolopan@freemail.it>) * 14-Oct-1999 (Paolo Pantaleo <paolopan@freemail.it>)
* 4nt's syntax implemented * 4nt's syntax implemented
*
* 03-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* Remove all hardcode string to En.rc
*/ */
#include "precomp.h" #include "precomp.h"
#include "resource.h"
#ifdef INCLUDE_CMD_COLOR #ifdef INCLUDE_CMD_COLOR
static VOID ColorHelp (VOID) static VOID ColorHelp (VOID)
{ {
ConOutPuts (_T( WCHAR szMsg[RC_STRING_MAX_SIZE];
"Sets the default foreground and background colors.\n" LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
"\n" ConOutPuts (_T((LPTSTR)szMsg));
"COLOR [attr [/F]] \n\n"
" attr Specifies color attribute of console output\n"
" /F fill the console with color attribute\n"
"\n"
"There are three ways to specify the colors:"
));
ConOutPuts (_T(
"\n"
"1) [bright] name on [bright] name (only the first three letters are required)\n"
"2) decimal on decimal\n"
"3) two hex digits\n"
"\n"
"Colors are:"
));
ConOutPuts (_T(
"dec hex name dec hex name\n"
"0 0 Black 8 8 Gray(Bright black)\n"
"1 1 Blue 9 9 Bright Blue\n"
"2 2 Green 10 A Bright Green\n"
"3 3 Cyan 11 B Bright Cyan\n"
"4 4 Red 12 C Bright Red\n"
"5 5 Magenta 13 D Bright Magenta\n"
"6 6 Yellow 14 E Bright Yellow\n"
"7 7 White 15 F Bright White"));
} }

8
reactos/subsys/system/cmd/console.c
View file

@ -7,9 +7,13 @@
* *
* 20-Jan-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>) * 20-Jan-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>)
* started * started
*
* 03-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* Remove all hardcode string to En.rc
*/ */
#include "precomp.h" #include "precomp.h"
#include "resource.h"
#define OUTPUT_BUFFER_SIZE 4096 #define OUTPUT_BUFFER_SIZE 4096
@ -210,6 +214,7 @@ VOID ConOutFormatMessage (DWORD MessageId, ...)
DWORD ret; DWORD ret;
LPTSTR text; LPTSTR text;
va_list arg_ptr; va_list arg_ptr;
WCHAR szMsg[RC_STRING_MAX_SIZE];
va_start (arg_ptr, MessageId); va_start (arg_ptr, MessageId);
ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
@ -228,7 +233,8 @@ VOID ConOutFormatMessage (DWORD MessageId, ...)
} }
else else
{ {
ConErrPrintf (_T("Unknown error: %d\n"), MessageId); LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg));
} }
} }

56
reactos/subsys/system/cmd/copy.c
View file

@ -20,9 +20,13 @@
* *
* 27-Oct-1998 (Eric Kohl <ekohl@abo.rhein-zeitung.de>) * 27-Oct-1998 (Eric Kohl <ekohl@abo.rhein-zeitung.de>)
* Disabled prompting when used in batch mode. * Disabled prompting when used in batch mode.
*
* 03-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* Remove all hardcode string to En.rc
*/ */
#include "precomp.h" #include "precomp.h"
#include "resource.h"
#ifdef INCLUDE_CMD_COPY #ifdef INCLUDE_CMD_COPY
@ -295,7 +299,16 @@ Overwrite (LPTSTR fn)
TCHAR inp[10]; TCHAR inp[10];
LPTSTR p; LPTSTR p;
ConOutPrintf (_T("Overwrite %s (Yes/No/All)? "), fn); LPTSTR lpOptions;
TCHAR Options[3];
WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, (LPTSTR) Options,sizeof(lpOptions));
lpOptions = _T(Options);
LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg));
ConInString (inp, 10); ConInString (inp, 10);
ConOutPuts (_T("")); ConOutPuts (_T(""));
@ -303,9 +316,9 @@ Overwrite (LPTSTR fn)
for (p = inp; _istspace (*p); p++) for (p = inp; _istspace (*p); p++)
; ;
if (*p != _T('Y') && *p != _T('A')) if (*p != lpOptions[0] && *p != lpOptions[2])
return 0; return 0;
if (*p == _T('A')) if (*p == lpOptions[2])
return 2; return 2;
return 1; return 1;
@ -326,6 +339,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
DWORD dwWritten; DWORD dwWritten;
DWORD i; DWORD i;
BOOL bEof = FALSE; BOOL bEof = FALSE;
WCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("checking mode\n")); DebugPrintf (_T("checking mode\n"));
@ -337,7 +351,8 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
NULL, OPEN_EXISTING, 0, NULL); NULL, OPEN_EXISTING, 0, NULL);
if (hFileSrc == INVALID_HANDLE_VALUE) if (hFileSrc == INVALID_HANDLE_VALUE)
{ {
ConErrPrintf (_T("Error: Cannot open source - %s!\n"), source); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), source);
return 0; return 0;
} }
@ -364,7 +379,9 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
{ {
if (!_tcscmp (dest, source)) if (!_tcscmp (dest, source))
{ {
ConErrPrintf (_T("Error: Can't copy onto itself!\n")); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), source);
CloseHandle (hFileSrc); CloseHandle (hFileSrc);
return 0; return 0;
} }
@ -438,7 +455,10 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL); WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL);
if (dwWritten != dwRead) if (dwWritten != dwRead)
{ {
ConErrPrintf (_T("Error writing destination!\n"));
LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg));
free (buffer); free (buffer);
CloseHandle (hFileDest); CloseHandle (hFileDest);
CloseHandle (hFileSrc); CloseHandle (hFileSrc);
@ -618,6 +638,7 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
TCHAR dir_d[_MAX_DIR]; TCHAR dir_d[_MAX_DIR];
TCHAR file_d[_MAX_FNAME]; TCHAR file_d[_MAX_FNAME];
TCHAR ext_d[_MAX_EXT]; TCHAR ext_d[_MAX_EXT];
WCHAR szMsg[RC_STRING_MAX_SIZE];
int argc; int argc;
int append; int append;
@ -634,23 +655,8 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
if (!_tcsncmp (rest, _T("/?"), 2)) if (!_tcsncmp (rest, _T("/?"), 2))
{ {
ConOutPuts (_T("Copies one or more files to another location.\n" LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
"\n" ConOutPuts (_T((LPTSTR)szMsg));
"COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n"
" [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n"
"\n"
" source Specifies the file or files to be copied.\n"
" /A Indicates an ASCII text file.\n"
" /B Indicates a binary file.\n"
" destination Specifies the directory and/or filename for the new file(s).\n"
" /V Verifies that new files are written correctly.\n"
" /Y Suppresses prompting to confirm you want to overwrite an\n"
" existing destination file.\n"
" /-Y Causes prompting to confirm you want to overwrite an\n"
" existing destination file.\n"
"\n"
"The switch /Y may be present in the COPYCMD environment variable.\n"
"..."));
return 1; return 1;
} }
@ -722,7 +728,9 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
} }
else if (bDestFound && bWildcards) else if (bDestFound && bWildcards)
{ {
ConErrPrintf (_T("Error: Not implemented yet!\n")); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg));
DeleteFileList (sources); DeleteFileList (sources);
freep (p); freep (p);
return 0; return 0;

30
reactos/subsys/system/cmd/date.c
View file

@ -26,9 +26,13 @@
* *
* 04-Feb-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>) * 04-Feb-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>)
* Fixed date input bug. * Fixed date input bug.
*
* 03-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* Remove all hardcode string to En.rc
*/ */
#include "precomp.h" #include "precomp.h"
#include "resource.h"
#ifdef INCLUDE_CMD_DATE #ifdef INCLUDE_CMD_DATE
@ -43,22 +47,24 @@ static WORD awMonths[2][13] =
static VOID static VOID
PrintDateString (VOID) PrintDateString (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE];
switch (nDateFormat) switch (nDateFormat)
{ {
case 0: /* mmddyy */ case 0: /* mmddyy */
default: default:
ConOutPrintf (_T("\nEnter new date (mm%cdd%cyyyy): "), LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
cDateSeparator, cDateSeparator); ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator);
break; break;
case 1: /* ddmmyy */ case 1: /* ddmmyy */
ConOutPrintf (_T("\nEnter new date (dd%cmm%cyyyy): "), LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
cDateSeparator, cDateSeparator); ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator);
break; break;
case 2: /* yymmdd */ case 2: /* yymmdd */
ConOutPrintf (_T("\nEnter new date (yyyy%cmm%cdd): "), LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, (LPTSTR) szMsg,sizeof(szMsg));
cDateSeparator, cDateSeparator); ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator);
break; break;
} }
} }
@ -183,14 +189,12 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
INT i; INT i;
BOOL bPrompt = TRUE; BOOL bPrompt = TRUE;
INT nDateString = -1; INT nDateString = -1;
WCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
ConOutPuts (_T("Displays or sets the date.\n\n" LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
"DATE [/T][date]\n\n" ConOutPuts (_T((LPTSTR)szMsg));
" /T display only\n\n"
"Type DATE without parameters to display the current date setting and\n"
"a prompt for a new one. Press ENTER to keep the same date."));
return 0; return 0;
} }
@ -243,7 +247,9 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
freep (arg); freep (arg);
return 0; return 0;
} }
ConErrPuts (_T("Invalid date.")); LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPuts (_T((LPTSTR)szMsg));
} }
freep (arg); freep (arg);

24
reactos/subsys/system/cmd/resource.h
View file

@ -1,6 +1,7 @@
#define RC_STRING_MAX_SIZE 2048 #define RC_STRING_MAX_SIZE 2048
#define STRING_CHOICE_OPTION 200 #define STRING_CHOICE_OPTION 200
#define STRING_COPY_OPTION 201
#define STRING_ALIAS_ERROR 300 #define STRING_ALIAS_ERROR 300
@ -17,7 +18,13 @@
#define STRING_CMD_ERROR3 311 #define STRING_CMD_ERROR3 311
#define STRING_CMD_ERROR4 312 #define STRING_CMD_ERROR4 312
#define STRING_CMD_ERROR5 313 #define STRING_CMD_ERROR5 313
#define STRING_PARAM_ERROR 314 #define STRING_CONSOLE_ERROR 314
#define STRING_COPY_ERROR1 315
#define STRING_COPY_ERROR2 316
#define STRING_COPY_ERROR3 317
#define STRING_COPY_ERROR4 318
#define STRING_DATE_ERROR 319
#define STRING_PARAM_ERROR 320
#define STRING_ATTRIB_HELP 400 #define STRING_ATTRIB_HELP 400
#define STRING_ALIAS_HELP 401 #define STRING_ALIAS_HELP 401
@ -35,10 +42,17 @@
#define STRING_CMD_HELP6 413 #define STRING_CMD_HELP6 413
#define STRING_CMD_HELP7 414 #define STRING_CMD_HELP7 414
#define STRING_CMD_HELP8 415 #define STRING_CMD_HELP8 415
#define STRING_EXIT_HELP 416 #define STRING_COLOR_HELP1 416
#define STRING_MKDIR_HELP 417 #define STRING_COPY_HELP1 417
#define STRING_RMDIR_HELP 418 #define STRING_COPY_HELP2 418
#define STRING_REM_HELP 419 #define STRING_DATE_HELP1 419
#define STRING_DATE_HELP2 420
#define STRING_DATE_HELP3 421
#define STRING_DATE_HELP4 422
#define STRING_EXIT_HELP 423
#define STRING_MKDIR_HELP 424
#define STRING_RMDIR_HELP 425
#define STRING_REM_HELP 426