[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 !

svn path=/trunk/; revision=61926

diff --git a/reactos/dll/cpl/intl/date.c b/reactos/dll/cpl/intl/date.c
index e81422b..4330d8a 100644 (file)
--- a/reactos/dll/cpl/intl/date.c
+++ b/reactos/dll/cpl/intl/date.c
@@ -104,9 +104,7 @@ SetShortDateSep(HWND hwndDlg, LCID lcid)
     {
         if (_istalnum(szShortDateSep[nSepCount]) || (szShortDateSep[nSepCount] == _T('\'')))
         {
     {
         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;
         }
     }
             return FALSE;
         }
     }


@@ -156,9 +154,7 @@ SetShortDateFormat(HWND hwndDlg, LCID lcid)
             !isDateCompAl(szShortDateFmt[nDateCompCount]) &&
             !OpenApostFlg)
         {
             !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;
         }
 
             return FALSE;
         }
 


@@ -166,9 +162,7 @@ SetShortDateFormat(HWND hwndDlg, LCID lcid)
 
     if (OpenApostFlg)
     {
 
     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;
     }
 
         return FALSE;
     }
 


@@ -214,9 +208,7 @@ SetLongDateFormat(HWND hwndDlg, LCID lcid)
             !isDateCompAl(szLongDateFmt[nDateCompCount]) &&
             !OpenApostFlg)
         {
             !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;
         }
 
             return FALSE;
         }
 


@@ -224,9 +216,7 @@ SetLongDateFormat(HWND hwndDlg, LCID lcid)
 
     if (OpenApostFlg)
     {
 
     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;
     }
 
         return FALSE;
     }
 


@@ -575,9 +565,9 @@ DatePageProc(HWND hwndDlg,
             }
             case IDC_SCR_MAX_YEAR:
             {
             }
             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:
             }
             break;
             case IDC_CALTYPE_COMBO:

diff --git a/reactos/dll/cpl/intl/generalp.c b/reactos/dll/cpl/intl/generalp.c
index 398b153..8fadb89 100644 (file)
--- a/reactos/dll/cpl/intl/generalp.c
+++ b/reactos/dll/cpl/intl/generalp.c
@@ -161,23 +161,21 @@ SetNewLocale(LCID lcid)
     ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, OEMPage, sizeof(OEMPage)/sizeof(TCHAR));
     if (ret == 0)
     {
     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)
     {
         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)
     {
         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;
     }
 
         return;
     }
 


@@ -190,9 +188,7 @@ SetNewLocale(LCID lcid)
     ret = RegOpenKey(HKEY_USERS, _T(".DEFAULT\\Control Panel\\International"), &localeKey);
     if (ret != ERROR_SUCCESS)
     {
     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;
     }
 
         return;
     }
 


@@ -206,8 +202,7 @@ SetNewLocale(LCID lcid)
     ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"), &langKey);
     if (ret != ERROR_SUCCESS)
     {
     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;
     }
 
         return;
     }
 


@@ -221,8 +216,7 @@ SetNewLocale(LCID lcid)
     ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"), &langKey);
     if (ret != ERROR_SUCCESS)
     {
     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;
     }
 
         return;
     }
 

diff --git a/reactos/dll/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c
index 197d32d..2bb503e 100644 (file)
--- a/reactos/dll/cpl/intl/intl.c
+++ b/reactos/dll/cpl/intl/intl.c
@@ -29,6 +29,8 @@
 
 #define NUM_APPLETS    (1)
 
 
 #define NUM_APPLETS    (1)
 

+#define BUFFERSIZE 512
+

 static LONG APIENTRY
 Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
 static LONG APIENTRY
 Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 


@@ -46,6 +48,17 @@ APPLET Applets[NUM_APPLETS] =
     {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet}
 };
 
     {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)
 
 static VOID
 InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)


@@ -124,7 +137,7 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
 {
     PROPSHEETPAGE psp[3];
     PROPSHEETHEADER psh;
 {
     PROPSHEETPAGE psp[3];
     PROPSHEETHEADER psh;

-    TCHAR Caption[256];
+    TCHAR Caption[BUFFERSIZE];

 
     if (OpenSetupInf())
     {
 
     if (OpenSetupInf())
     {

diff --git a/reactos/dll/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h
index ccbf011..c4a1076 100644 (file)
--- a/reactos/dll/cpl/intl/intl.h
+++ b/reactos/dll/cpl/intl/intl.h
@@ -57,6 +57,7 @@ extern DWORD IsUnattendedSetupEnabled;
 extern DWORD UnattendLCID;
 
 /* intl.c */
 extern DWORD UnattendLCID;
 
 /* intl.c */

+VOID PrintErrorMsgBox(UINT msg);

 
 /* languages.c */
 INT_PTR CALLBACK
 
 /* languages.c */
 INT_PTR CALLBACK

diff --git a/reactos/dll/cpl/intl/lang/bg-BG.rc b/reactos/dll/cpl/intl/lang/bg-BG.rc
index 5ee73f4..eccff1d 100644 (file)
--- a/reactos/dll/cpl/intl/lang/bg-BG.rc
+++ b/reactos/dll/cpl/intl/lang/bg-BG.rc
@@ -191,3 +191,18 @@ BEGIN
     IDS_CPLNAME "Местни и езикови настройки"
     IDS_CPLDESCRIPTION "Избор на езици и изписване на числата, валутите, времето и датата."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/cs-CZ.rc b/reactos/dll/cpl/intl/lang/cs-CZ.rc
index 0ea16f9..8f2a694 100644 (file)
--- a/reactos/dll/cpl/intl/lang/cs-CZ.rc
+++ b/reactos/dll/cpl/intl/lang/cs-CZ.rc
@@ -196,3 +196,18 @@ BEGIN
     IDS_CPLNAME "Místní nastavení"
     IDS_CPLDESCRIPTION "Zde lze nastavit zobrazení jazyků, čísel, měn, času a dat."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/de-DE.rc b/reactos/dll/cpl/intl/lang/de-DE.rc
index 4b4cba3..c86be4b 100644 (file)
--- a/reactos/dll/cpl/intl/lang/de-DE.rc
+++ b/reactos/dll/cpl/intl/lang/de-DE.rc
@@ -191,3 +191,18 @@ BEGIN
     IDS_CPLNAME "Regionale Einstellungen"
     IDS_CPLDESCRIPTION "Wählen Sie Anzeigeeinstellungen für Sprache, Zahlen, Währung, Uhrzeit und Datum aus."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/en-US.rc b/reactos/dll/cpl/intl/lang/en-US.rc
index a7478f1..dff5ad8 100644 (file)
--- a/reactos/dll/cpl/intl/lang/en-US.rc
+++ b/reactos/dll/cpl/intl/lang/en-US.rc
@@ -191,3 +191,18 @@ BEGIN
     IDS_CPLNAME "Regional Options"
     IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/es-ES.rc b/reactos/dll/cpl/intl/lang/es-ES.rc
index fe83931..e2c5862 100644 (file)
--- a/reactos/dll/cpl/intl/lang/es-ES.rc
+++ b/reactos/dll/cpl/intl/lang/es-ES.rc
@@ -193,3 +193,18 @@ BEGIN
     IDS_CPLNAME "Opciones regionales"
     IDS_CPLDESCRIPTION "Personaliza la configuración para mostrar idiomas, números, horas y fechas."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/fr-FR.rc b/reactos/dll/cpl/intl/lang/fr-FR.rc
index 03dd398..f14372a 100644 (file)
--- a/reactos/dll/cpl/intl/lang/fr-FR.rc
+++ b/reactos/dll/cpl/intl/lang/fr-FR.rc
@@ -190,6 +190,21 @@ END
 
 STRINGTABLE
 BEGIN
 
 STRINGTABLE
 BEGIN

-    IDS_CPLNAME "Options régionales"
-    IDS_CPLDESCRIPTION "Sélectionner les langues, les formats de nombres, les monnaies, l'heure et la date."
+  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
 END

diff --git a/reactos/dll/cpl/intl/lang/he-IL.rc b/reactos/dll/cpl/intl/lang/he-IL.rc
index 22d426d..97fa1ca 100644 (file)
--- a/reactos/dll/cpl/intl/lang/he-IL.rc
+++ b/reactos/dll/cpl/intl/lang/he-IL.rc
@@ -193,3 +193,18 @@ BEGIN
     IDS_CPLNAME "אפשרויות אזוריות"
     IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/it-IT.rc b/reactos/dll/cpl/intl/lang/it-IT.rc
index c9f9ad7..0e78853 100644 (file)
--- a/reactos/dll/cpl/intl/lang/it-IT.rc
+++ b/reactos/dll/cpl/intl/lang/it-IT.rc
@@ -193,3 +193,18 @@ BEGIN
     IDS_CPLNAME "Opzioni internazionali e della lingua"
     IDS_CPLDESCRIPTION "Personalizza le impostazioni per la visualizzazione delle lingue, numeri, ora e data."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/no-NO.rc b/reactos/dll/cpl/intl/lang/no-NO.rc
index 809d17b..44a157e 100644 (file)
--- a/reactos/dll/cpl/intl/lang/no-NO.rc
+++ b/reactos/dll/cpl/intl/lang/no-NO.rc
@@ -191,3 +191,18 @@ BEGIN
     IDS_CPLNAME "Regionale innstillinger"
     IDS_CPLDESCRIPTION "Velg språk og nummer format, valuta, tid og dato."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/pl-PL.rc b/reactos/dll/cpl/intl/lang/pl-PL.rc
index 1ef9a4c..d1aef16 100644 (file)
--- a/reactos/dll/cpl/intl/lang/pl-PL.rc
+++ b/reactos/dll/cpl/intl/lang/pl-PL.rc
@@ -199,3 +199,18 @@ BEGIN
     IDS_CPLNAME "Ustawienia regionalne"
     IDS_CPLDESCRIPTION "Ustawienia języków oraz formaty liczb, walut, daty i czasu."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/ro-RO.rc b/reactos/dll/cpl/intl/lang/ro-RO.rc
index 25f0225..4f3c22e 100644 (file)
--- a/reactos/dll/cpl/intl/lang/ro-RO.rc
+++ b/reactos/dll/cpl/intl/lang/ro-RO.rc
@@ -190,6 +190,21 @@ END
 
 STRINGTABLE
 BEGIN
 
 STRINGTABLE
 BEGIN

-    IDS_CPLNAME "Opțiuni regionale"
-    IDS_CPLDESCRIPTION "Configurarea limbii și formatarea numerelor, valutelor, datei și orei."
+    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
 END

diff --git a/reactos/dll/cpl/intl/lang/ru-RU.rc b/reactos/dll/cpl/intl/lang/ru-RU.rc
index 0dc3790..9c0a96c 100644 (file)
--- a/reactos/dll/cpl/intl/lang/ru-RU.rc
+++ b/reactos/dll/cpl/intl/lang/ru-RU.rc
@@ -193,3 +193,18 @@ BEGIN
     IDS_CPLNAME "Язык и региональные стандарты"
     IDS_CPLDESCRIPTION "Выбор языка, формата чисел, денежных единиц, времени и даты."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/sk-SK.rc b/reactos/dll/cpl/intl/lang/sk-SK.rc
index a1b5ec3..c13772d 100644 (file)
--- a/reactos/dll/cpl/intl/lang/sk-SK.rc
+++ b/reactos/dll/cpl/intl/lang/sk-SK.rc
@@ -197,3 +197,18 @@ BEGIN
     IDS_CPLNAME "Miestne a jazykové nastavenia"
     IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/tr-TR.rc b/reactos/dll/cpl/intl/lang/tr-TR.rc
index 8afeedb..bbbf553 100644 (file)
--- a/reactos/dll/cpl/intl/lang/tr-TR.rc
+++ b/reactos/dll/cpl/intl/lang/tr-TR.rc
@@ -193,3 +193,18 @@ BEGIN
     IDS_CPLNAME "Bölgelik Ayarlar"
     IDS_CPLDESCRIPTION "Dilleri ve sayı, para birimi, saat ve târih biçimlerini seçer."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/uk-UA.rc b/reactos/dll/cpl/intl/lang/uk-UA.rc
index dd80fef..9356fce 100644 (file)
--- a/reactos/dll/cpl/intl/lang/uk-UA.rc
+++ b/reactos/dll/cpl/intl/lang/uk-UA.rc
@@ -199,3 +199,18 @@ BEGIN
     IDS_CPLNAME "Регіональні стандарти"
     IDS_CPLDESCRIPTION "Налаштування мовних параметрів і формату чисел, грошових одиниць, часу й дат."
 END
     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

diff --git a/reactos/dll/cpl/intl/lang/zh-CN.rc b/reactos/dll/cpl/intl/lang/zh-CN.rc
index 1d4371e..4817610 100644 (file)
--- a/reactos/dll/cpl/intl/lang/zh-CN.rc
+++ b/reactos/dll/cpl/intl/lang/zh-CN.rc
@@ -195,3 +195,18 @@ BEGIN
     IDS_CPLNAME "区域选项"
     IDS_CPLDESCRIPTION "选择语言、数字、货币、时间和日期的显示设置。"
 END
     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

diff --git a/reactos/dll/cpl/intl/languages.c b/reactos/dll/cpl/intl/languages.c
index 00831e8..940b485 100644 (file)
--- a/reactos/dll/cpl/intl/languages.c
+++ b/reactos/dll/cpl/intl/languages.c
@@ -31,10 +31,7 @@ LanguagesPageProc(HWND hwndDlg,
                         shInputDll.lpParameters = _T("shell32.dll,Control_RunDLL input.dll");
                         if (ShellExecuteEx(&shInputDll) == 0)
                         {
                         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;
                         }
                     }
                     break;

diff --git a/reactos/dll/cpl/intl/resource.h b/reactos/dll/cpl/intl/resource.h
index 2093a84..094297d 100644 (file)
--- a/reactos/dll/cpl/intl/resource.h
+++ b/reactos/dll/cpl/intl/resource.h
@@ -76,3 +76,15 @@
 #define IDS_SPAIN           1003
 #define IDS_METRIC          1004
 #define IDS_IMPERIAL        1005
 #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