Merge branch 'master' of github.com:PhotoFlare/photoflare

PhotoFlare · Jun 24, 2018 · 8fc1e99 · 8fc1e99
2 parents 7e4a2e7 + e8164b7
commit 8fc1e99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -70,12 +70,12 @@ int main(int argc, char *argv[])
 
             for(int i = 0;i < paths.length(); i++)
             {
-                //QFileInfo check_file(paths[i]+"/languages/"+SETTINGS->getUserLanguage()+".qm");  //for installers
-                QFileInfo check_file("languages/"+SETTINGS->getUserLanguage()+".qm");  //local builds
+                QFileInfo check_file(paths[i]+"/languages/"+SETTINGS->getUserLanguage()+".qm");  //for installers
+                //QFileInfo check_file("languages/"+SETTINGS->getUserLanguage()+".qm");  //local builds
                 if(check_file.exists() && check_file.isFile())
                 {
-                    //translator.load(SETTINGS->getUserLanguage()+".qm", paths[i]+"/languages/");  //for installers
-                    translator.load(SETTINGS->getUserLanguage()+".qm", "languages/"); //local builds
+                    translator.load(SETTINGS->getUserLanguage()+".qm", paths[i]+"/languages/");  //for installers
+                    //translator.load(SETTINGS->getUserLanguage()+".qm", "languages/"); //local builds
                 }
             }
             app.installTranslator(&translator);

diff --git a/versions/dev.json b/versions/dev.json
@@ -1 +1 @@
-1.6.0
+1.5.4