diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-06-24 16:01:51 -0700 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-06-25 15:56:34 +0000 |
| commit | b47aca5fd1782cea68b2cba54263a75b5a3007e8 (patch) | |
| tree | 6e24a76865882a0ae121fbb2b54a94d8f82032f8 /wireshark-qt.cpp | |
| parent | 79836fa23ae275466fd7414967bd17e0f629c888 (diff) | |
| download | wireshark-b47aca5fd1782cea68b2cba54263a75b5a3007e8.tar.gz | |
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>
Diffstat (limited to 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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); |