asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix locale for macOS-style locales

Browse source 
(cherry picked from commit 1e7f078ce9)
This commit is contained in:
Damon 2016-10-27 07:29:00 -05:00 committed by Rémi Verschelde
parent 68b6b50d28
commit e3be51f87c
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/translation.cpp
View file

@ -844,8 +844,11 @@ void Translation::_set_messages(const DVector<String>& p_messages){
void Translation::set_locale(const String& p_locale) {
if(!is_valid_locale(p_locale)) {
String trimmed_locale = get_trimmed_locale(p_locale);
// replaces '-' with '_' for macOS Sierra-style locales
String univ_locale = p_locale.replace("-", "_");
if(!is_valid_locale(univ_locale)) {
String trimmed_locale = get_trimmed_locale(univ_locale);
ERR_EXPLAIN("Invalid Locale: "+trimmed_locale);
ERR_FAIL_COND(!is_valid_locale(trimmed_locale));
@ -853,7 +856,7 @@ void Translation::set_locale(const String& p_locale) {
locale=trimmed_locale;
}
else {
locale=p_locale;
locale=univ_locale;
}
}
@ -919,8 +922,11 @@ Translation::Translation() {
void TranslationServer::set_locale(const String& p_locale) {
if(!is_valid_locale(p_locale)) {
String trimmed_locale = get_trimmed_locale(p_locale);
// replaces '-' with '_' for macOS Sierra-style locales
String univ_locale = p_locale.replace("-", "_");
if(!is_valid_locale(univ_locale)) {
String trimmed_locale = get_trimmed_locale(univ_locale);
ERR_EXPLAIN("Invalid Locale: "+trimmed_locale);
ERR_FAIL_COND(!is_valid_locale(trimmed_locale));
@ -928,7 +934,7 @@ void TranslationServer::set_locale(const String& p_locale) {
locale=trimmed_locale;
}
else {
locale=p_locale;
locale=univ_locale;
}
}