fixed proper handling of language parameter at startup

retroshare-gui/src/gui/GenCertDialog.cpp

@@ -251,7 +251,7 @@ void GenCertDialog::initKeyList()
 
 void GenCertDialog::mouseMoveEvent(QMouseEvent *e)
 {
-	std::cerr << "Mouse : " << e->x() << ", " << e->y() << std::endl;
+    //std::cerr << "Mouse : " << e->x() << ", " << e->y() << std::endl;
 
 	QDialog::mouseMoveEvent(e) ;
 }

retroshare-gui/src/gui/settings/GeneralPage.ui

@@ -146,7 +146,7 @@
       <item row="5" column="0">
        <widget class="QCheckBox" name="useLocalServer">
         <property name="toolTip">
-         <string>When checked, this instance receives new parameters (like RsLink or RsFile) and avoid new one.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When checked, this retroshare instance will accept calls by your operating system to open Retroshare collection files, and download links.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Use Local Server to get new arguments.</string>

retroshare-gui/src/main.cpp

@@ -120,13 +120,13 @@ static void showHelp(const argstream& as)
             "+================================================================+"
                  << std::endl ;
 
-        std::cerr << as.usage(true) << std::endl;
+        std::cerr << as.usage(false) << std::endl;
 
         char *argv[1];
         int argc=0;
         QApplication dummyApp (argc, argv); // needed for QMessageBox
         QMessageBox box;
-        QString text = QString::fromUtf8(as.usage(true,false).c_str());
+        QString text = QString::fromUtf8(as.usage(false,false).c_str());
         QFont font("Courier New",10,50,false);
         font.setStyleHint(QFont::TypeWriter,QFont::PreferMatch);
         font.setStyle(QFont::StyleNormal);
@@ -212,6 +212,31 @@ static void sendArgsToRunningInstance(const QStringList& args)
     newArgs.detach();
 }
 
+static bool setLanguage(const std::string& language)
+{
+    if(!language.empty())
+    {
+        if(!LanguageSupport::translate(QString::fromStdString(language)))
+        {
+            RsErr() << "Language \"" << language << "\" is not supported." ;
+
+            QString s;
+            for(QString ss:LanguageSupport::languageCodes())
+                s += ss + ", " ;
+
+            RsErr() << "Possible choices are: " << s.toStdString();
+            return false;
+        }
+        return true;
+    }
+    else
+    {
+        LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
+        return true;
+    }
+}
+
+
 static void displayWarningAboutDSAKeys()
 {
     std::map<std::string,std::vector<std::string> > unsupported_keys;
@@ -354,10 +379,10 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
             >> parameter('i',"ip-address"         ,conf.forcedInetAddress        ,"nnn.nnn.nnn.nnn"                       ,"Force IP address "                                    ,false)
             >> parameter('p',"port"               ,conf.forcedPort               ,"port"                                  ,"Set listenning port "                                 ,false)
             >> parameter('o',"opmode"             ,conf.opModeStr                ,"opmode (Full, NoTurtle, Gaming, Minimal)","Set mode" ,false)
-            >> parameter('t',"tor"                ,conf.userSuppliedTorExecutable,"tor"                                   ,"supply full tor executable path "            ,false)
+            >> parameter('t',"tor"                ,conf.userSuppliedTorExecutable,"path"                                  ,"supply full tor executable path "                     ,false)
-            >> parameter('g',"style"              ,guistyle                      ,"style "                                ,""            ,false)
+            >> parameter('g',"style"              ,guistyle                      ,"style (fusion,windows,gtk2,breeze)"    ,"set GUI style"                                        ,false)
-            >> parameter('k',"style"              ,guistylesheetfile             ,"style sheet file"                      ,"gui stylesheet file"                         ,false)
+            >> parameter('k',"style"              ,guistylesheetfile             ,"file"                                  ,"gui stylesheet file"                                  ,false)
-            >> parameter('L',"lang"               ,language                      ,"langage"                               ,"language string"                             ,false)
+            >> parameter('L',"lang"               ,language                      ,"langage (fr,cn,...)"                   ,"set language"                                         ,false)
             >> parameter('r',"link"               ,rslink                        ,"retroshare link"                       ,"retroshare link to open (passed to running server)"   ,false)
             >> parameter('f',"rsfile"             ,rsfile                        ,"rsfile"                                ,"rscollection file to open (passed to running server)" ,false);
 #ifdef RS_JSONAPI
@@ -420,7 +445,9 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     {
         QApplication dummyApp (argc, argv); // needed for QMessageBox
         /* Translate into the desired language */
-        LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
+
+        if(!setLanguage(language))
+            return 1;
 
         QMessageBox msgBox;
         msgBox.setText(QObject::tr("This version of RetroShare is using OpenPGP-SDK. As a side effect, it's not using the system shared PGP keyring, but has it's own keyring shared by all RetroShare instances. <br><br>You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software."));
@@ -451,7 +478,9 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
         /* Error occured */
         QApplication dummyApp (argc, argv); // needed for QMessageBox
         /* Translate into the desired language */
-        LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
+
+        if(!setLanguage(language))
+            return 1;
 
         displayWarningAboutDSAKeys();
 
@@ -479,10 +508,16 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
        in this case it can be use only for default values */
     RshareSettings::Create ();
 
+    if(LanguageSupport::isValidLanguageCode(QString::fromStdString(language)))
+        conf.language = QString::fromStdString(language);
+
     /* Setup The GUI Stuff */
     //Rshare rshare(args, argc, argv,  QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()));
     RsApplication rshare(conf);
 
+    if(!setLanguage(language))
+        return 1;
+
     /* Start RetroShare */
     QString sDefaultGXSIdToCreate = "";
     switch (initResult) {