Minor UI locale updates.

Qt: Call setlocale before commandline_early_options so that we get
proper "-v" output, similar to the GTK+ UI.

GTK+: Call setlocale once at startup.

Bug: 11960
Change-Id: I3c3a196b9d94fc768e1085200891bc8d67e21a08
Reviewed-on: https://code.wireshark.org/review/16132
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

4 files changed, 12 insertions, 15 deletions

diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 9c61cae68a..e7d37df5cd 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2095,7 +2095,10 @@ main(int argc, char *argv[])
 
     cmdarg_err_init(wireshark_cmdarg_err, wireshark_cmdarg_err_cont);
 
-    /* Set the C-language locale to the native environment. */
+    /* Set the current locale according to the program environment.
+     * We haven't localized anything, but some GTK widgets are localized
+     * (the file selection dialogue, for example).
+     * This also sets the C-language locale to the native environment. */
     setlocale(LC_ALL, "");
 #ifdef _WIN32
     arg_list_utf_16to8(argc, argv);
@@ -2235,12 +2238,6 @@ main(int argc, char *argv[])
     }
 #endif
 
-    /* Set the current locale according to the program environment.
-     * We haven't localized anything, but some GTK widgets are localized
-     * (the file selection dialogue, for example).
-     * This also sets the C-language locale to the native environment. */
-    setlocale (LC_ALL, "");
-
     /* Let GTK get its args (will need an X server, so do this after command line only commands handled) */
     gtk_init (&argc, &argv);
 
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 523907555e..2ddb59af6c 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -1051,7 +1051,7 @@ static void switchTranslator(QTranslator& myTranslator, const QString& filename,
         wsApp->installTranslator(&myTranslator);
 }
 
-void WiresharkApplication::loadLanguage(const QString& newLanguage)
+void WiresharkApplication::loadLanguage(const QString newLanguage)
 {
     QLocale locale;
     QString localeLanguage;
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index 1de706cb27..599cf31b5c 100644
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.h
@@ -118,7 +118,7 @@ public:
 
     QTranslator translator;
     QTranslator translatorQt;
-    void loadLanguage(const QString& language);
+    void loadLanguage(const QString language);
 
 private:
     bool initialized_;
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index cf73e5deb9..4268257a31 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -27,6 +27,8 @@
 #include <signal.h>
 #endif
 
+#include <locale.h>
+
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
@@ -355,8 +357,8 @@ int main(int argc, char *argv[])
 #endif
 
     /* Set the C-language locale to the native environment. */
-    // The GTK+ UI calls this. Should we as well?
-    //setlocale(LC_ALL, "");
+    setlocale(LC_ALL, "");
+
 #ifdef _WIN32
     // QCoreApplication clobbers argv. Let's have a local copy.
     ws_argv = (char **) g_malloc(sizeof(char *) * argc);
@@ -467,7 +469,6 @@ int main(int argc, char *argv[])
 
     AirPDcapInitContext(&airpdcap_ctx);
 
-    QString locale;
     QString cf_name;
     unsigned int in_file_type = WTAP_TYPE_AUTO;
 
@@ -498,10 +499,9 @@ int main(int argc, char *argv[])
 
     // Initialize our language
     read_language_prefs();
-    locale = QString(language);
-    wsApp->loadLanguage(locale);
+    wsApp->loadLanguage(language);
 
-    g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Translator %s", locale.toStdString().c_str());
+    g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Translator %s", language);
 
     // Init the main window (and splash)
     main_w = new(MainWindow);