This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/translation in repository x2goclient. from 36c2dd5 onmainwindow.cpp: follow-up to last translation fix. new e680566 onmainwindow.{cpp,h}: make new get_translator() function static. new cc5d696 onmainwindow.h: include used types/headers. new c857cba onmainwindow.cpp: correctly call QLocale::uiLanguages (). new 351e405 onmainwindow.cpp: copy strings before manipulating them. new ddbf9b4 onmainwindow.h: make get_translator() const. Does not change any state. new 2df78cd onmainwindow.cpp: fix compile error triggered by a missing parenthesis/typo. new 553b75c onmainwindow.cpp: workaround https://bugreports.qt.io/browse/QTBUG-25973. new 81a3e1c debian/changelog: fixup for non-referenced file. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 11 ++++++++++- src/onmainwindow.cpp | 19 +++++++++++++------ src/onmainwindow.h | 4 +++- 3 files changed, 26 insertions(+), 8 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/translation in repository x2goclient. commit e6805669924ee92e50b0b354b11833f6533efa58 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 11 06:49:32 2015 +0200 onmainwindow.{cpp,h}: make new get_translator() function static. Correct typo in implementation. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 2 +- src/onmainwindow.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 71c6316..31f38ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -384,6 +384,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low case. - onmainwindow.cpp: follow-up to last translation fix. Actually handle English locales correctly and don't duplicate code too much. + - onmainwindow.{cpp,h}: make new get_translator() function static. Correct + typo in implementation. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index c6d6a2e..cda60d9 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -546,7 +546,7 @@ void ONMainWindow::slotSyncX() } -bool get_translator (QString file_name_start, QTranslator **translator) { +bool ONMainWindow::get_translator (QString file_name_start, QTranslator **translator) { QTranslator *tmp_translator = new QTranslator (); /* Qt 4.8.0 introduced a new overload for QTranslator::load(), taking a QLocale diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 10fb353..7709e50 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -981,7 +981,7 @@ private: * Otherwise returns true and sets the translator object to loaded * translation. */ - bool get_translator (QString file_name_start, QTranslator **translator); + static bool get_translator (QString file_name_start, QTranslator **translator); protected: -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/translation in repository x2goclient. commit cc5d696a0dda805dfa75e9ae7e1f2317fab9af28 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 11 06:50:35 2015 +0200 onmainwindow.h: include used types/headers. --- debian/changelog | 1 + src/onmainwindow.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 31f38ef..a0ec0b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -386,6 +386,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low English locales correctly and don't duplicate code too much. - onmainwindow.{cpp,h}: make new get_translator() function static. Correct typo in implementation. + - onmainwindow.h: include used types/headers. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 7709e50..6db35a2 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -41,6 +41,8 @@ #include "LDAPSession.h" #include <QToolBar> #include <QSystemTrayIcon> +#include <QTranslator> +#include <QLocale> #include "sshmasterconnection.h" #include "non_modal_messagebox.h" -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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@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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/translation in repository x2goclient. commit 351e4052aceca6d03839d230305b11cc6e2618ae Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 11 06:57:39 2015 +0200 onmainwindow.cpp: copy strings before manipulating them. --- debian/changelog | 1 + src/onmainwindow.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4af8f1c..81c497e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -388,6 +388,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low typo in implementation. - onmainwindow.h: include used types/headers. - onmainwindow.cpp: correctly call QLocale::uiLanguages (). + - onmainwindow.cpp: copy strings before manipulating them. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 39cbbb1..df555b8 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -589,7 +589,8 @@ bool ONMainWindow::get_translator (QString file_name_start, QTranslator **transl break; } else { - load_filename = filename.append ("_").append (*it); + load_filename = filename; + load_filename.append ("_").append (*it); if (tmp_ranslator->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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/translation in repository x2goclient. commit ddbf9b424ca01e79cf4a6912ddb435b1a7618662 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 11 06:58:35 2015 +0200 onmainwindow.h: make get_translator() const. Does not change any state. --- debian/changelog | 1 + src/onmainwindow.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 81c497e..11da0d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -389,6 +389,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - onmainwindow.h: include used types/headers. - onmainwindow.cpp: correctly call QLocale::uiLanguages (). - onmainwindow.cpp: copy strings before manipulating them. + - onmainwindow.h: make get_translator() const. Does not change any state. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 6db35a2..ecf910b 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -983,7 +983,7 @@ private: * Otherwise returns true and sets the translator object to loaded * translation. */ - static bool get_translator (QString file_name_start, QTranslator **translator); + static bool get_translator (const QString file_name_start, QTranslator **translator) const; protected: -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/translation in repository x2goclient. commit 2df78cd9c2b127be77e4d662d7eef5f05181dc15 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 11 07:00:06 2015 +0200 onmainwindow.cpp: fix compile error triggered by a missing parenthesis/typo. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 11da0d3..471c601 100644 --- a/debian/changelog +++ b/debian/changelog @@ -390,6 +390,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: correctly call QLocale::uiLanguages (). - onmainwindow.cpp: copy strings before manipulating them. - onmainwindow.h: make get_translator() const. Does not change any state. + - onmainwindow.cpp: fix compile error triggered by a missing + parenthesis/typo. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index df555b8..76c210d 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -584,7 +584,7 @@ bool ONMainWindow::get_translator (QString file_name_start, QTranslator **transl bool translator_found = false; for (QStringList::const_iterator it = ui_languages.constBegin (); it != ui_languages.constEnd (); ++it) { /* Respect English locales. Don't try to load any translation, because we do not ship nop-English translations. */ - if (*it.startsWith ("en") { + if ((*it).startsWith ("en")) { x2goWarningf (1) << tr ("English language requested, not loading translator"); break; } @@ -592,7 +592,7 @@ bool ONMainWindow::get_translator (QString file_name_start, QTranslator **transl load_filename = filename; load_filename.append ("_").append (*it); - if (tmp_ranslator->load (load_filename) { + if (tmp_translator->load (load_filename)) { /* Some translation successfully loaded. That's good enough. */ x2goInfof (4) << tr ("Translator: ") + load_filename.toAscii () + tr (" found."); translator_found = true; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/translation in repository x2goclient. commit 553b75c1e5459777ea87f7214d2aa875d005bc0a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 11 07:01:52 2015 +0200 onmainwindow.cpp: workaround https://bugreports.qt.io/browse/QTBUG-25973. --- debian/changelog | 1 + src/onmainwindow.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 471c601..a495fee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -392,6 +392,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - onmainwindow.h: make get_translator() const. Does not change any state. - onmainwindow.cpp: fix compile error triggered by a missing parenthesis/typo. + - onmainwindow.cpp: workaround https://bugreports.qt.io/browse/QTBUG-25973. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 76c210d..fecf6ed 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -589,8 +589,14 @@ bool ONMainWindow::get_translator (QString file_name_start, QTranslator **transl break; } else { + /* + * QLocale::uiLanguages() may return an unexpected format. + * See: https://bugreports.qt.io/browse/QTBUG-25973 + */ + QString tmp_locale = (*it); + tmp_locale.replace ("-", "_"); load_filename = filename; - load_filename.append ("_").append (*it); + load_filename.append ("_").append (tmp_locale); 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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/translation in repository x2goclient. commit 81a3e1c305e91c613d35a1b1fd212b71ccd65929 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 11 07:02:07 2015 +0200 debian/changelog: fixup for non-referenced file. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a495fee..79e2eec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -382,7 +382,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - config_win.bat: enable release by default, fetch command line parameter and compare against debug. Enable debug and console features in that case. - - onmainwindow.cpp: follow-up to last translation fix. Actually handle + - onmainwindow.{cpp,h}: follow-up to last translation fix. Actually handle English locales correctly and don't duplicate code too much. - onmainwindow.{cpp,h}: make new get_translator() function static. Correct typo in implementation. -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org