WSL/SLF GitLab Repository

Commit e9edcd1c authored by Mathias Bavay's avatar Mathias Bavay
Browse files

More fixes for the changed directory name

parent fab971fc
......@@ -48,7 +48,7 @@ CONFIG(debug) { #in release, we try everything
VERSION = "2.0.6"
VERSION_PE_HEADER = "2.0"
DEFINES += APP_VERSION_STR=\\\"$$VERSION\\\"
#DEFINES += APP_VERSION_STR=\\\"$$VERSION\\\"
QMAKE_TARGET_COMPANY = "WSL Institute for Snow and Avalanche Research"
QMAKE_TARGET_DESCRIPTION = "Graphical User Interface for various models. The GUI is dynamically generated from a semantic description contained in XML files."
QMAKE_TARGET_COPYRIGHT = "GPLv3"
......@@ -173,7 +173,7 @@ HEADERS += \
#automatic creation of .qm language files from .ts language dictionaries:
LANGUAGES = de
for(language, LANGUAGES) {
TRANSLATIONS += "resources/languages/inishell_$${language}.ts"
TRANSLATIONS += "resources/langs/inishell_$${language}.ts"
}
TRANSLATIONS_FILES = ""
qtPrepareTool(LRELEASE, lrelease) #get real lrelease tool
......@@ -184,7 +184,7 @@ for(file_ts, TRANSLATIONS) {
system($$cmd) | message("Error: could not execute '$${cmd}'")
TRANSLATIONS_FILES += $$file_qm
}
#TRANSLATIONS = resources/languages/inishell_de.ts #manual way
#TRANSLATIONS = resources/langs/inishell_de.ts #manual way
DESTDIR = ./build #put executable here
MOC_DIR = ./tmp/obj #clutter build directory instead of source
......
This diff is collapsed.
......@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
const QString language( getSetting("user::appearance::language", "value") );
QTranslator translator; //can't go out of scope
if (!language.isEmpty() && language != "en") { //texts that are not found will remain in English
const QString language_file(":/languages/inishell_" + language);
const QString language_file(":/langs/inishell_" + language);
if (translator.load(language_file)) {
QApplication::installTranslator(&translator);
} else { //should not happen since it's a resource and the build process would complain
......
Supports Markdown
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