liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged dev into locallab_dev

Browse Source
This commit is contained in:
heckflosse
2017-03-20 15:22:01 +01:00
parent 0464babf36 2228159ff8
commit 04bdea0b84
85 changed files with 5889 additions and 1899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/options.cc
View File

@@ -2237,7 +2237,7 @@ int Options::saveToFile (Glib::ustring fname)
}
}
bool Options::load ()
bool Options::load (bool lightweight)
{
// Find the application data path
@@ -2376,7 +2376,7 @@ bool Options::load ()
// out which are the parent translations. Furthermore, there must be a file <Language> for each locale <Language> (<LC>) -- you cannot have
// 'French (CA)' unless there is a file 'French'.
Glib::ustring defaultTranslation = argv0 + "/languages/default";
Glib::ustring defaultTranslation = Glib::build_filename (argv0, "languages", "default");
Glib::ustring languageTranslation = "";
Glib::ustring localeTranslation = "";
@@ -2388,17 +2388,17 @@ bool Options::load ()
std::vector<Glib::ustring> langPortions = Glib::Regex::split_simple (" ", options.language);
if (langPortions.size() >= 1) {
languageTranslation = argv0 + "/languages/" + langPortions.at (0);
languageTranslation = Glib::build_filename (argv0, "languages", langPortions.at (0));
}
if (langPortions.size() >= 2) {
localeTranslation = argv0 + "/languages/" + options.language;
localeTranslation = Glib::build_filename (argv0, "languages", options.language);
}
}
langMgr.load (localeTranslation, new MultiLangMgr (languageTranslation, new MultiLangMgr (defaultTranslation)));
rtengine::init (&options.rtSettings, argv0, rtdir);
rtengine::init (&options.rtSettings, argv0, rtdir, !lightweight);
return true;
}