[akhaldi] 61926: [INTL] * Localize the message boxes that contained hardcoded strings. * Create PrintErrorMsgBox() to reduce code duplication for the error messages. * Brought to you by Lee Schroed...
Author: akhaldi Date: Sun Feb 2 19:31:07 2014 New Revision: 61926
URL: http://svn.reactos.org/svn/reactos?rev=61926&view=rev Log: [INTL] * Localize the message boxes that contained hardcoded strings. * Create PrintErrorMsgBox() to reduce code duplication for the error messages. * Brought to you by Lee Schroeder. CORE-7339 #resolve #comment Committed in r61926. Cheers !
Modified: trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/he-IL.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/no-NO.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/sk-SK.rc trunk/reactos/dll/cpl/intl/lang/tr-TR.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/lang/zh-CN.rc trunk/reactos/dll/cpl/intl/languages.c trunk/reactos/dll/cpl/intl/resource.h
Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=619... ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -104,9 +104,7 @@ { if (_istalnum(szShortDateSep[nSepCount]) || (szShortDateSep[nSepCount] == _T('''))) { - MessageBox(NULL, - _T("Entered short date separator contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_SEPARATE); return FALSE; } } @@ -156,9 +154,7 @@ !isDateCompAl(szShortDateFmt[nDateCompCount]) && !OpenApostFlg) { - MessageBox(NULL, - _T("Entered short date format contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_FORMAT_SHORT); return FALSE; }
@@ -166,9 +162,7 @@
if (OpenApostFlg) { - MessageBoxW(NULL, - _T("Entered short date format contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_FORMAT_SHORT); return FALSE; }
@@ -214,9 +208,7 @@ !isDateCompAl(szLongDateFmt[nDateCompCount]) && !OpenApostFlg) { - MessageBox(NULL, - _T("Entered long date format contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_FORMAT_LONG); return FALSE; }
@@ -224,9 +216,7 @@
if (OpenApostFlg) { - MessageBoxW(NULL, - _T("Entered long date format contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_FORMAT_LONG); return FALSE; }
@@ -575,9 +565,9 @@ } case IDC_SCR_MAX_YEAR: { - /* Set "Apply" button enabled */ - /* FIXME */ - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + /* Set "Apply" button enabled */ + /* FIXME */ + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; case IDC_CALTYPE_COMBO:
Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?rev... ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -161,23 +161,21 @@ ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, OEMPage, sizeof(OEMPage)/sizeof(TCHAR)); if (ret == 0) { - MessageBox(NULL, _T("Problem reading OEM code page"), _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_OEM_CODE_PAGE); return; }
ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, ACPPage, sizeof(ACPPage)/sizeof(TCHAR)); if (ret == 0) { - MessageBox(NULL, _T("Problem reading ANSI code page"), _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_ANSI_CODE_PAGE); return; }
ret = RegOpenKey(HKEY_CURRENT_USER, _T("Control Panel\International"), &localeKey); if (ret != ERROR_SUCCESS) { - // Some serious error - MessageBox(NULL, _T("Problem opening HKCU\Control Panel\International key"), - _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_INT_KEY_REG); return; }
@@ -190,9 +188,7 @@ ret = RegOpenKey(HKEY_USERS, _T(".DEFAULT\Control Panel\International"), &localeKey); if (ret != ERROR_SUCCESS) { - // Some serious error - MessageBox(NULL, _T("Problem opening HKU\.DEFAULT\Control Panel\International key"), - _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_DEF_INT_KEY_REG); return; }
@@ -206,8 +202,7 @@ ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\CurrentControlSet\Control\NLS\Language"), &langKey); if (ret != ERROR_SUCCESS) { - MessageBoxW(NULL, _T("Problem opening HKLM\SYSTEM\CurrentControlSet\Control\NLS\Language key"), - _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_NLS_KEY_REG); return; }
@@ -221,8 +216,7 @@ ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\CurrentControlSet\Control\NLS\CodePage"), &langKey); if (ret != ERROR_SUCCESS) { - MessageBox(NULL, _T("Problem opening HKLM\SYSTEM\CurrentControlSet\Control\NLS\CodePage key"), - _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_NLS_CODE_REG); return; }
Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=619... ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -29,6 +29,8 @@
#define NUM_APPLETS (1)
+#define BUFFERSIZE 512 + static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
@@ -46,6 +48,17 @@ {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} };
+VOID +PrintErrorMsgBox(UINT msg) +{ + TCHAR szErrorText[BUFFERSIZE]; + TCHAR szErrorCaption[BUFFERSIZE]; + + LoadString(hApplet, msg, szErrorText, sizeof(szErrorText)/sizeof(TCHAR)); + LoadString(hApplet, IDS_ERROR, szErrorCaption, sizeof(szErrorCaption)/sizeof(TCHAR)); + + MessageBox(NULL, szErrorText, szErrorCaption, MB_OK | MB_ICONERROR); +}
static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) @@ -124,7 +137,7 @@ { PROPSHEETPAGE psp[3]; PROPSHEETHEADER psh; - TCHAR Caption[256]; + TCHAR Caption[BUFFERSIZE];
if (OpenSetupInf()) {
Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=619... ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -57,6 +57,7 @@ extern DWORD UnattendLCID;
/* intl.c */ +VOID PrintErrorMsgBox(UINT msg);
/* languages.c */ INT_PTR CALLBACK
Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/bg-BG.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -191,3 +191,18 @@ IDS_CPLNAME "ÐеÑÑни и езикови наÑÑÑойки" IDS_CPLDESCRIPTION "ÐÐ·Ð±Ð¾Ñ Ð½Ð° езиÑи и изпиÑване на ÑиÑлаÑа, валÑÑиÑе, вÑемеÑо и даÑаÑа." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -196,3 +196,18 @@ IDS_CPLNAME "MÃstnà nastavenÃ" IDS_CPLDESCRIPTION "Zde lze nastavit zobrazenà jazyků, ÄÃsel, mÄn, Äasu a dat." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -191,3 +191,18 @@ IDS_CPLNAME "Regionale Einstellungen" IDS_CPLDESCRIPTION "Wählen Sie Anzeigeeinstellungen für Sprache, Zahlen, Währung, Uhrzeit und Datum aus." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -191,3 +191,18 @@ IDS_CPLNAME "Regional Options" IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -193,3 +193,18 @@ IDS_CPLNAME "Opciones regionales" IDS_CPLDESCRIPTION "Personaliza la configuración para mostrar idiomas, números, horas y fechas." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -190,6 +190,21 @@
STRINGTABLE BEGIN - IDS_CPLNAME "Options régionales" - IDS_CPLDESCRIPTION "Sélectionner les langues, les formats de nombres, les monnaies, l'heure et la date." -END + IDS_CPLNAME "Options régionales" + IDS_CPLDESCRIPTION "Sélectionner les langues, les formats de nombres, les monnaies, l'heure et la date." +END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/he-IL.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -193,3 +193,18 @@ IDS_CPLNAME "×פשר×××ת ×××ר××ת" IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -193,3 +193,18 @@ IDS_CPLNAME "Opzioni internazionali e della lingua" IDS_CPLDESCRIPTION "Personalizza le impostazioni per la visualizzazione delle lingue, numeri, ora e data." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/no-NO.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -191,3 +191,18 @@ IDS_CPLNAME "Regionale innstillinger" IDS_CPLDESCRIPTION "Velg språk og nummer format, valuta, tid og dato." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -199,3 +199,18 @@ IDS_CPLNAME "Ustawienia regionalne" IDS_CPLDESCRIPTION "Ustawienia jÄzyków oraz formaty liczb, walut, daty i czasu." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -190,6 +190,21 @@
STRINGTABLE BEGIN - IDS_CPLNAME "OpÈiuni regionale" - IDS_CPLDESCRIPTION "Configurarea limbii Èi formatarea numerelor, valutelor, datei Èi orei." -END + IDS_CPLNAME "OpÈiuni regionale" + IDS_CPLDESCRIPTION "Configurarea limbii Èi formatarea numerelor, valutelor, datei Èi orei." +END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -193,3 +193,18 @@ IDS_CPLNAME "ЯзÑк и ÑегионалÑнÑе ÑÑандаÑÑÑ" IDS_CPLDESCRIPTION "ÐÑÐ±Ð¾Ñ ÑзÑка, ÑоÑмаÑа ÑиÑел, денежнÑÑ ÐµÐ´Ð¸Ð½Ð¸Ñ, вÑемени и даÑÑ." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -197,3 +197,18 @@ IDS_CPLNAME "Miestne a jazykové nastavenia" IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/tr-TR.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -193,3 +193,18 @@ IDS_CPLNAME "Bölgelik Ayarlar" IDS_CPLDESCRIPTION "Dilleri ve sayı, para birimi, saat ve târih biçimlerini seçer." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -199,3 +199,18 @@ IDS_CPLNAME "РегÑоналÑÐ½Ñ ÑÑандаÑÑи" IDS_CPLDESCRIPTION "ÐалаÑÑÑÐ²Ð°Ð½Ð½Ñ Ð¼Ð¾Ð²Ð½Ð¸Ñ Ð¿Ð°ÑамеÑÑÑв Ñ ÑоÑмаÑÑ ÑиÑел, гÑоÑÐ¾Ð²Ð¸Ñ Ð¾Ð´Ð¸Ð½Ð¸ÑÑ, ÑаÑÑ Ð¹ даÑ." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-CN.rc?... ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -195,3 +195,18 @@ IDS_CPLNAME "åºåé项" IDS_CPLDESCRIPTION "éæ©è¯è¨ãæ°åãè´§å¸ãæ¶é´åæ¥æçæ¾ç¤ºè®¾ç½®ã" END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\Control Panel\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\.DEFAULT\Control Panel\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END
Modified: trunk/reactos/dll/cpl/intl/languages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/languages.c?re... ============================================================================== --- trunk/reactos/dll/cpl/intl/languages.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/languages.c [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -31,10 +31,7 @@ shInputDll.lpParameters = _T("shell32.dll,Control_RunDLL input.dll"); if (ShellExecuteEx(&shInputDll) == 0) { - MessageBox(NULL, - _T("Can't start input.dll"), - _T("Error"), - MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_INPUT_DLL); } } break;
Modified: trunk/reactos/dll/cpl/intl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?rev... ============================================================================== --- trunk/reactos/dll/cpl/intl/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/resource.h [iso-8859-1] Sun Feb 2 19:31:07 2014 @@ -76,3 +76,15 @@ #define IDS_SPAIN 1003 #define IDS_METRIC 1004 #define IDS_IMPERIAL 1005 + +#define IDS_ERROR 1006 +#define IDS_ERROR_ANSI_CODE_PAGE 1007 +#define IDS_ERROR_INT_KEY_REG 1008 +#define IDS_ERROR_DEF_INT_KEY_REG 1009 +#define IDS_ERROR_NLS_KEY_REG 1010 +#define IDS_ERROR_NLS_CODE_REG 1011 +#define IDS_ERROR_OEM_CODE_PAGE 1012 +#define IDS_ERROR_SYMBOL_SEPARATE 1013 +#define IDS_ERROR_SYMBOL_FORMAT_SHORT 1014 +#define IDS_ERROR_SYMBOL_FORMAT_LONG 1015 +#define IDS_ERROR_INPUT_DLL 1016
-
akhaldi＠svn.reactos.org