[Scummvm-cvs-logs] SF.net SVN: scummvm:[52970] scummvm/branches/branch-1-2-0
criezy at users.sourceforge.net
criezy at users.sourceforge.net
Fri Oct 1 23:43:12 CEST 2010
Revision: 52970
http://scummvm.svn.sourceforge.net/scummvm/?rev=52970&view=rev
Author: criezy
Date: 2010-10-01 21:43:12 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
GUI: backport fix for bug #3075649 (Fonts not found with built-in theme)
Modified Paths:
--------------
scummvm/branches/branch-1-2-0/common/translation.cpp
scummvm/branches/branch-1-2-0/common/translation.h
scummvm/branches/branch-1-2-0/gui/options.cpp
scummvm/branches/branch-1-2-0/gui/themes/translations.dat
scummvm/branches/branch-1-2-0/po/ca_ES.po
scummvm/branches/branch-1-2-0/po/de_DE.po
scummvm/branches/branch-1-2-0/po/es_ES.po
scummvm/branches/branch-1-2-0/po/fr_FR.po
scummvm/branches/branch-1-2-0/po/it_IT.po
scummvm/branches/branch-1-2-0/po/ru_RU.po
scummvm/branches/branch-1-2-0/po/scummvm.pot
scummvm/branches/branch-1-2-0/po/uk_UA.po
Modified: scummvm/branches/branch-1-2-0/common/translation.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/common/translation.cpp 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/common/translation.cpp 2010-10-01 21:43:12 UTC (rev 52970)
@@ -213,6 +213,12 @@
return _currentCharset.c_str();
}
+const char *TranslationManager::getCurrentLanguage() {
+ if (_currentLang == -1)
+ return "C";
+ return _langs[_currentLang].c_str();
+}
+
String TranslationManager::getTranslation(const String &message) {
return getTranslation(message.c_str());
}
@@ -472,6 +478,10 @@
return "ASCII";
}
+const char *TranslationManager::getCurrentLanguage() {
+ return "C";
+}
+
#endif // USE_TRANSLATION
} // End of namespace Common
Modified: scummvm/branches/branch-1-2-0/common/translation.h
===================================================================
--- scummvm/branches/branch-1-2-0/common/translation.h 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/common/translation.h 2010-10-01 21:43:12 UTC (rev 52970)
@@ -151,6 +151,11 @@
*/
const char *getCurrentCharset();
+ /**
+ * Returns currently selected translation language
+ */
+ const char *getCurrentLanguage();
+
private:
#ifdef USE_TRANSLATION
/**
Modified: scummvm/branches/branch-1-2-0/gui/options.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/gui/options.cpp 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/gui/options.cpp 2010-10-01 21:43:12 UTC (rev 52970)
@@ -1281,19 +1281,20 @@
Common::String theme = browser.getSelected();
// FIXME: Actually, any changes (including the theme change) should
// only become active *after* the options dialog has closed.
- Common::String charset = TransMan.getCurrentCharset();
+ Common::String lang = TransMan.getCurrentLanguage();
+ Common::String oldTheme = g_gui.theme()->getThemeId();
if (g_gui.loadNewTheme(theme)) {
- _curTheme->setLabel(g_gui.theme()->getThemeName());
- ConfMan.set("gui_theme", theme);
// If the charset has changed, it means the font were not found for the
// new theme. Since for the moment we do not support change of translation
// language without restarting, we let the user know about this.
- if (charset != TransMan.getCurrentCharset()) {
- MessageDialog error(
- "The theme you selected does not support your current language. You need to close "
- "ScummVM and when you start it again it will be using this new theme and english language."
- );
+ if (lang != TransMan.getCurrentLanguage()) {
+ TransMan.setLanguage(lang.c_str());
+ g_gui.loadNewTheme(oldTheme);
+ MessageDialog error(_("The theme you selected does not support your current language. If you want to use this theme you need to switch to another language first."));
error.runModal();
+ } else {
+ _curTheme->setLabel(g_gui.theme()->getThemeName());
+ ConfMan.set("gui_theme", theme);
}
}
draw();
Modified: scummvm/branches/branch-1-2-0/gui/themes/translations.dat
===================================================================
(Binary files differ)
Modified: scummvm/branches/branch-1-2-0/po/ca_ES.po
===================================================================
--- scummvm/branches/branch-1-2-0/po/ca_ES.po 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/po/ca_ES.po 2010-10-01 21:43:12 UTC (rev 52970)
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:00+0100\n"
+"POT-Creation-Date: 2010-10-01 22:29+0100\n"
"PO-Revision-Date: 2010-09-21 23:37+0100\n"
"Last-Translator: Jordi Vilalta Prat <jvprat at jvprat.com>\n"
"Language-Team: Catalan <scummvm-devel at lists.sf.net>\n"
-"Language: Catalan\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Catalan\n"
#: gui/about.cpp:96
#, c-format
@@ -877,6 +877,12 @@
msgid "Select directory for plugins"
msgstr "Seleccioneu el directori dels connectors"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "No hi ha data desada"
Modified: scummvm/branches/branch-1-2-0/po/de_DE.po
===================================================================
--- scummvm/branches/branch-1-2-0/po/de_DE.po 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/po/de_DE.po 2010-10-01 21:43:12 UTC (rev 52970)
@@ -7,15 +7,15 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:00+0100\n"
+"POT-Creation-Date: 2010-10-01 22:29+0100\n"
"PO-Revision-Date: 2010-09-17 08:05+0100\n"
"Last-Translator: Simon Sawatzki <SimSaw at gmx.de>\n"
"Language-Team: Lothar Serra Mari <Lothar at Windowsbase.de> & Simon Sawatzki "
"<SimSaw at gmx.de>\n"
-"Language: Deutsch\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Deutsch\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: gui/about.cpp:96
@@ -881,6 +881,12 @@
msgid "Select directory for plugins"
msgstr "Verzeichnis f\xFCr Erweiterungen ausw\xE4hlen"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "Kein Datum gespeichert"
Modified: scummvm/branches/branch-1-2-0/po/es_ES.po
===================================================================
--- scummvm/branches/branch-1-2-0/po/es_ES.po 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/po/es_ES.po 2010-10-01 21:43:12 UTC (rev 52970)
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:00+0100\n"
+"POT-Creation-Date: 2010-10-01 22:29+0100\n"
"PO-Revision-Date: 2010-09-25 17:11+0100\n"
"Last-Translator: Tom\xE1s Maidagan\n"
"Language-Team: \n"
-"Language: Espanol\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Espanol\n"
#: gui/about.cpp:96
#, c-format
@@ -873,6 +873,12 @@
msgid "Select directory for plugins"
msgstr "Selecciona el directorio de plugins"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "No hay fecha guardada"
Modified: scummvm/branches/branch-1-2-0/po/fr_FR.po
===================================================================
--- scummvm/branches/branch-1-2-0/po/fr_FR.po 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/po/fr_FR.po 2010-10-01 21:43:12 UTC (rev 52970)
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:00+0100\n"
-"PO-Revision-Date: 2010-09-19 23:54+0100\n"
+"POT-Creation-Date: 2010-10-01 22:29+0100\n"
+"PO-Revision-Date: 2010-10-01 22:30+0100\n"
"Last-Translator: Thierry Crozat <criezy at scummvm.org>\n"
"Language-Team: French <scummvm-devel at lists.sf.net>\n"
-"Language: Francais\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Francais\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
#: gui/about.cpp:96
@@ -878,6 +878,14 @@
msgid "Select directory for plugins"
msgstr "S\xE9lectionner le r\xE9pertoire des plugins"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+"Le th\xE8me que vous avez s\xE9lection\xE9 ne support pas la langue fran\xE7aise. Si "
+"vous voulez l'utiliser vous devez d'abord changer de langue."
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "Date inconnue"
@@ -1670,8 +1678,8 @@
#~ msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
#~ msgstr ""
-#~ "Le plugin %s a \xE9chou\xE9 dans l'instanciation du moteur de jeu: %s (cible "
-#~ "'%s', chemin '%s')"
+#~ "Le plugin %s a \xE9chou\xE9 dans l'instanciation du moteur de jeu: %s (cible '%"
+#~ "s', chemin '%s')"
#~ msgid "Ok"
#~ msgstr "Ok"
Modified: scummvm/branches/branch-1-2-0/po/it_IT.po
===================================================================
--- scummvm/branches/branch-1-2-0/po/it_IT.po 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/po/it_IT.po 2010-10-01 21:43:12 UTC (rev 52970)
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:00+0100\n"
+"POT-Creation-Date: 2010-10-01 22:29+0100\n"
"PO-Revision-Date: 2010-09-21 19:33+0100\n"
"Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n"
"Language-Team: Italian\n"
-"Language: Italiano\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Italiano\n"
#: gui/about.cpp:96
#, c-format
@@ -873,6 +873,12 @@
msgid "Select directory for plugins"
msgstr "Seleziona la cartella dei plugin"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "Nessuna data salvata"
Modified: scummvm/branches/branch-1-2-0/po/ru_RU.po
===================================================================
--- scummvm/branches/branch-1-2-0/po/ru_RU.po 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/po/ru_RU.po 2010-10-01 21:43:12 UTC (rev 52970)
@@ -7,16 +7,16 @@
msgstr ""
"Project-Id-Version: ScummVM VERSION\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:00+0100\n"
+"POT-Creation-Date: 2010-10-01 22:29+0100\n"
"PO-Revision-Date: 2010-06-13 20:55+0300\n"
"Last-Translator: Eugene Sandulenko <sev at scummvm.org>\n"
"Language-Team: Russian\n"
-"Language: Russian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-5\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: Russian\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%"
+"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: gui/about.cpp:96
#, c-format
@@ -883,6 +883,12 @@
msgid "Select directory for plugins"
msgstr "\xB2\xEB\xD1\xD5\xE0\xD8\xE2\xD5 \xD4\xD8\xE0\xD5\xDA\xE2\xDE\xE0\xD8\xEE \xE1 \xDF\xDB\xD0\xD3\xD8\xDD\xD0\xDC\xD8"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "\xB4\xD0\xE2\xD0 \xDD\xD5 \xD7\xD0\xDF\xD8\xE1\xD0\xDD\xD0"
Modified: scummvm/branches/branch-1-2-0/po/scummvm.pot
===================================================================
--- scummvm/branches/branch-1-2-0/po/scummvm.pot 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/po/scummvm.pot 2010-10-01 21:43:12 UTC (rev 52970)
@@ -8,11 +8,10 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0pre\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:00+0100\n"
+"POT-Creation-Date: 2010-10-01 22:29+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -855,6 +854,12 @@
msgid "Select directory for plugins"
msgstr ""
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr ""
Modified: scummvm/branches/branch-1-2-0/po/uk_UA.po
===================================================================
--- scummvm/branches/branch-1-2-0/po/uk_UA.po 2010-10-01 21:41:40 UTC (rev 52969)
+++ scummvm/branches/branch-1-2-0/po/uk_UA.po 2010-10-01 21:43:12 UTC (rev 52970)
@@ -7,16 +7,16 @@
msgstr ""
"Project-Id-Version: ScummVM VERSION\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:00+0100\n"
+"POT-Creation-Date: 2010-10-01 22:29+0100\n"
"PO-Revision-Date: 2010-09-21 18:46+0200\n"
"Last-Translator: Lubomyr Lisen\n"
"Language-Team: Ukrainian\n"
-"Language: Ukrainian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-5\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: Ukrainian\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%"
+"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: gui/about.cpp:96
#, c-format
@@ -872,6 +872,12 @@
msgid "Select directory for plugins"
msgstr "\xB2\xD8\xD1\xD5\xE0\xF6\xE2\xEC \xDF\xD0\xDF\xDA\xE3 \xD7 \xDF\xDB\xD0\xD3\xD8\xDD\xD0\xDC\xD8"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "\xB4\xD0\xE2\xD0 \xDD\xD5 \xD7\xD0\xDF\xD8\xE1\xD0\xDD\xD0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list