This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 66a2ab231ff2c982d2b72ab2ca94e4ebc6ed74b9 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 28 01:45:26 2016 +0100 onmainwindow.cpp: use lowercase version of locale. Fixes: #953. Fixes loading up the nb_NO translation file, which is actually baked as nb_no into the binary. --- debian/changelog | 3 +++ src/onmainwindow.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9aae452..24053a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low - macbuild.sh: add stdlib forcing. Should not be used unless you really know what you're doing. If you ponder using this, you probably don't. - res/resources.rcc: add Turkish translation file. Fixes: #987. + - onmainwindow.cpp: use lowercase version of locale. Fixes: #953. + Fixes loading up the nb_NO translation file, which is actually baked as + nb_no into the binary. * debian/control: - Change apache2-dev | libc6-dev build dependency back to apache2-dev only. Otherwise, apache2-dev is not installed at all, even though diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index b947995..3c90ba5 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -613,7 +613,7 @@ bool ONMainWindow::get_translator (QString file_name_start, QTranslator **transl QString tmp_locale = (*it); tmp_locale.replace ("-", "_"); load_filename = filename; - load_filename.append ("_").append (tmp_locale); + load_filename.append ("_").append (tmp_locale.toLower ()); if (tmp_translator->load (load_filename)) { /* Some translation successfully loaded. That's good enough. */ -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git