Automatically selected profiles are now correctly loaded on first use.

This commit is contained in:
Hombre
2017-03-13 01:30:34 +01:00
parent 2392701119
commit 567ed3629c
6 changed files with 126 additions and 32 deletions

View File

@@ -2315,7 +2315,7 @@ bool Options::load (bool lightweight)
// 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 = "";
@@ -2327,11 +2327,11 @@ bool Options::load (bool lightweight)
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);
}
}