Removed quick dirty fix and fixed issue SANKORE-187

preferencesAboutTextFull
Claudio Valerio 14 years ago
parent 2d35e74bd7
commit 70ec5ca9c3
  1. 7
      Sankore_3.1.pro
  2. 4
      src/frameworks/UBPlatformUtils_win.cpp

@ -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
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 \

@ -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;

Loading…
Cancel
Save