diff options
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); |