merge with dev
This commit is contained in:
commit
cd222aacbf
@ -43,6 +43,8 @@ struct LocaleToLang : private std::map<std::pair<Glib::ustring, Glib::ustring>,
|
|||||||
emplace (key ("cs", "CZ"), "Czech");
|
emplace (key ("cs", "CZ"), "Czech");
|
||||||
emplace (key ("da", "DK"), "Dansk");
|
emplace (key ("da", "DK"), "Dansk");
|
||||||
emplace (key ("de", "DE"), "Deutsch");
|
emplace (key ("de", "DE"), "Deutsch");
|
||||||
|
emplace (key ("en", "GB"), "English (UK)");
|
||||||
|
emplace (key ("en", "US"), "English (US)");
|
||||||
emplace (key ("es", "ES"), "Espanol");
|
emplace (key ("es", "ES"), "Espanol");
|
||||||
emplace (key ("eu", "ES"), "Euskara");
|
emplace (key ("eu", "ES"), "Euskara");
|
||||||
emplace (key ("fr", "FR"), "Francais");
|
emplace (key ("fr", "FR"), "Francais");
|
||||||
@ -115,6 +117,7 @@ const LocaleToLang localeToLang;
|
|||||||
|
|
||||||
void setGtkLanguage(const Glib::ustring &language)
|
void setGtkLanguage(const Glib::ustring &language)
|
||||||
{
|
{
|
||||||
|
if(language != "default") { // nothing to change when using default
|
||||||
std::string lang = localeToLang.getLocale(language);
|
std::string lang = localeToLang.getLocale(language);
|
||||||
const gchar *env_langc = g_getenv("LANG");
|
const gchar *env_langc = g_getenv("LANG");
|
||||||
if(env_langc) {
|
if(env_langc) {
|
||||||
@ -128,6 +131,7 @@ void setGtkLanguage(const Glib::ustring &language)
|
|||||||
}
|
}
|
||||||
|
|
||||||
g_setenv("LANG", lang.c_str(), true);
|
g_setenv("LANG", lang.c_str(), true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user