Add command-line option help-text localization

[cygwin-apps/setup.git] / ini.cc

diff --git a/ini.cc b/ini.cc
index 2c568e1dcd89d674c67faa205cdef5cc411d69ad..3ef131185cc37abe16dcd890cf7dc57a45fb1e32 100644 (file)
--- a/ini.cc
+++ b/ini.cc
@@ -61,19 +61,18 @@ std::string ini_setup_version;
 IniList setup_ext_list (setup_exts,
                        setup_exts + (sizeof(setup_exts) / sizeof(*setup_exts)));
 
-static BoolOption NoVerifyOption (false, 'X', "no-verify", "Don't verify setup.ini signatures");
-static BoolOption NoVersionCheckOption (false, '\0', "no-version-check", "Suppress checking if a newer version of setup is available");
-
-extern int yyparse ();
+static BoolOption NoVerifyOption (false, 'X', "no-verify", IDS_HELPTEXT_NO_VERIFY);
+static BoolOption NoVersionCheckOption (false, '\0', "no-version-check", IDS_HELPTEXT_NO_VERSION_CHECK);
 
 class GuiParseFeedback : public IniParseFeedback
 {
 public:
   GuiParseFeedback () : lastpct (0)
     {
+      Progress.SetText1 (IDS_PROGRESS_PARSING);
       Progress.SetText2 ("");
       Progress.SetText3 ("");
-      Progress.SetText4 ("Progress:");
+      Progress.SetText4 (IDS_PROGRESS_PROGRESS);
 
       yyerror_count = 0;
       yyerror_messages.clear ();
@@ -100,7 +99,6 @@ public:
     }
   virtual void iniName (const std::string& name)
     {
-      Progress.SetText1 ("Parsing...");
       Progress.SetText2 (name.c_str ());
       Progress.SetText3 ("");
       filename = name;
@@ -136,7 +134,10 @@ public:
     }
   virtual ~ GuiParseFeedback ()
     {
-      Progress.SetText4 ("Package:");
+      Progress.SetText2 ("");
+      Progress.SetText3 ("");
+      Progress.SetText4 (IDS_PROGRESS_PACKAGE);
+      Progress.SetBar1 (0);
     }
 private:
   unsigned int lastpct;
@@ -439,6 +440,8 @@ do_ini_thread_reflector (void* p)
   HANDLE *context;
   context = (HANDLE*)p;
 
+  SetThreadUILanguage(langid);
+
   try
   {
     bool succeeded = do_ini_thread ((HINSTANCE)context[0], (HWND)context[1]);