Commit 70ec5ca9 authored by Claudio Valerio's avatar Claudio Valerio

Removed quick dirty fix and fixed issue SANKORE-187

parent 2d35e74b
...@@ -185,6 +185,12 @@ macx { ...@@ -185,6 +185,12 @@ macx {
TRANSLATION_fr.path = "$$RESOURCES_DIR/fr.lproj" TRANSLATION_fr.path = "$$RESOURCES_DIR/fr.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_fr QMAKE_BUNDLE_DATA += TRANSLATION_fr
} }
exists(resources/i18n/sankore_fr_CH.qm) {
TRANSLATION_fr.files = resources/i18n/sankore_fr_CH.qm \
resources/i18n/Localizable.strings
TRANSLATION_fr.path = "$$RESOURCES_DIR/fr.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_fr_CH
}
exists(resources/i18n/sankore_de.qm) { exists(resources/i18n/sankore_de.qm) {
TRANSLATION_de.files = resources/i18n/sankore_de.qm \ TRANSLATION_de.files = resources/i18n/sankore_de.qm \
resources/i18n/Localizable.strings resources/i18n/Localizable.strings
...@@ -331,6 +337,7 @@ RESOURCES += resources/sankore.qrc ...@@ -331,6 +337,7 @@ RESOURCES += resources/sankore.qrc
TRANSLATIONS = resources/i18n/sankore_en.ts \ TRANSLATIONS = resources/i18n/sankore_en.ts \
resources/i18n/sankore_en_UK.ts \ resources/i18n/sankore_en_UK.ts \
resources/i18n/sankore_fr.ts \ resources/i18n/sankore_fr.ts \
resources/i18n/sankore_fr_CH.ts \
resources/i18n/sankore_de.ts \ resources/i18n/sankore_de.ts \
resources/i18n/sankore_nl.ts \ resources/i18n/sankore_nl.ts \
resources/i18n/sankore_es.ts \ resources/i18n/sankore_es.ts \
......
/* /*
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "UBPlatformUtils.h" #include "UBPlatformUtils.h"
...@@ -62,9 +62,7 @@ void UBPlatformUtils::fadeDisplayIn() ...@@ -62,9 +62,7 @@ void UBPlatformUtils::fadeDisplayIn()
QString UBPlatformUtils::preferredTranslation() QString UBPlatformUtils::preferredTranslation()
{ {
QString localPreferredLanguage = preferredLanguage(); QString localPreferredLanguage = preferredLanguage();
if (localPreferredLanguage == "fr_CH") {
localPreferredLanguage = "fr";
}
QString qmPath = applicationResourcesDirectory() + "/" + "i18n" + "/" + QString("sankore_") + localPreferredLanguage + ".qm"; QString qmPath = applicationResourcesDirectory() + "/" + "i18n" + "/" + QString("sankore_") + localPreferredLanguage + ".qm";
qDebug() << "Looking for translation:" << qmPath; qDebug() << "Looking for translation:" << qmPath;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment