[X2Go-Commits] [x2goclient] 03/08: onmainwindow.cpp: correctly call QLocale::uiLanguages ().

git-admin at x2go.org git-admin at x2go.org
Mon May 11 07:02:31 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/translation
in repository x2goclient.

commit c857cbae5a60c791e8abb81e53874d5fc5eadc88
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon May 11 06:51:44 2015 +0200

    onmainwindow.cpp: correctly call QLocale::uiLanguages ().
---
 debian/changelog     |    1 +
 src/onmainwindow.cpp |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a0ec0b4..4af8f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -387,6 +387,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - onmainwindow.{cpp,h}: make new get_translator() function static. Correct
       typo in implementation.
     - onmainwindow.h: include used types/headers.
+    - onmainwindow.cpp: correctly call QLocale::uiLanguages ().
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index cda60d9..39cbbb1 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -566,7 +566,7 @@ bool ONMainWindow::get_translator (QString file_name_start, QTranslator **transl
     filename = QString (filename + "_%1" ).arg (QLocale::system ().name ());
     filename = filename.toLower ();
 #else /* QT_VERSION < 0x040800 */
-    ui_languages = QLocale::uiLanguages ();
+    ui_languages = QLocale::system ().uiLanguages ();
 #endif /* QT_VERSION < 0x040800 */
 
 #if QT_VERSION < 0x040800

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list