Skip to content

Commit

Permalink
https://github.com/StephaneCouturier/Katalog/issues/137
Browse files Browse the repository at this point in the history
Stéphane committed May 25, 2021
1 parent dd3b680 commit ac0f277
Showing 10 changed files with 1,547 additions and 21 deletions.
7 changes: 4 additions & 3 deletions Katalog.pro
Original file line number Diff line number Diff line change
@@ -32,8 +32,7 @@
#/////////////////////////////////////////////////////////////////////////////

#QT Libraries
QT += core gui charts network
QT += sql widgets
QT += core widgets gui sql charts network
requires(qtConfig(tableview))
requires(qtConfig(treeview))
requires(qtConfig(listview))
@@ -96,7 +95,8 @@ FORMS += \

TRANSLATIONS += \
translations/Katalog_en_US.ts \
translations/Katalog_fr_FR.ts
translations/Katalog_fr_FR.ts \
translations/Katalog_cz_CZ.ts

# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
@@ -110,3 +110,4 @@ RESOURCES += \

#For executable icon under Windows
RC_ICONS = images/Katalog_logo_64.ico

1 change: 1 addition & 0 deletions images.qrc
Original file line number Diff line number Diff line change
@@ -12,5 +12,6 @@
<file>images/link_blue/link-v.png</file>
<file>images/flags/fr.png</file>
<file>images/flags/us.png</file>
<file>images/flags/cz.png</file>
</qresource>
</RCC>
Binary file added images/flags/cz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 17 additions & 9 deletions main.cpp
Original file line number Diff line number Diff line change
@@ -51,20 +51,28 @@ int main(int argc, char *argv[])
QString homePath = standardsPaths[0];

//Define Setting file path and name
QString settingsFile = homePath + "/.config/katalog_settings.ini";
QSettings settings(settingsFile, QSettings:: IniFormat);
QString settingsFilePath = homePath + "/.config/katalog_settings.ini";
QSettings settings(settingsFilePath, QSettings:: IniFormat);

QString userLanguage = settings.value("Settings/Language").toString();

if ( userLanguage == "" ) userLanguage = "en_US";
//Define a language for the first run (no value in the settings file)
if ( userLanguage == "" ){

//Get the language of the user's system
userLanguage = QLocale::system().name();

//If this language is not supported yet, default to Engish US.
QStringList availableUserLanguages;
availableUserLanguages << "en_US" << "fr_FR" << "cz_CZ";
if ( availableUserLanguages.contains(userLanguage) == false )
userLanguage = "en_US";
}

QTranslator* translator=new QTranslator(0);
//if ( userLanguage != "en_US" ){
//if (translator->load(QLocale(), QLatin1String("Katalog"), QLatin1String("_"), QLatin1String(":/translations"))) {
if (translator->load("Katalog_" + userLanguage, ":translations")) {
app.installTranslator(translator);
}
//}
if (translator->load("Katalog_" + userLanguage, ":translations")) {
app.installTranslator(translator);
}

#ifdef Q_OS_LINUX
KLocalizedString::setApplicationDomain("Katalog");
1 change: 1 addition & 0 deletions translations.qrc
Original file line number Diff line number Diff line change
@@ -2,5 +2,6 @@
<qresource prefix="/">
<file>translations/Katalog_en_US.qm</file>
<file>translations/Katalog_fr_FR.qm</file>
<file>translations/Katalog_cz_CZ.qm</file>
</qresource>
</RCC>
Binary file added translations/Katalog_cz_CZ.qm
Binary file not shown.
Loading

0 comments on commit ac0f277

Please sign in to comment.