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

Change set_locale to fallback to the global language (#6910)

Browse source 
(cherry picked from commit 470ead74db)
This commit is contained in:
Damon Myers 2016-10-27 03:36:32 -05:00 committed by Rémi Verschelde
parent 06c47e6f8a
commit 68b6b50d28
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
core/translation.cpp
View file

@ -779,6 +779,11 @@ Vector<String> TranslationServer::get_all_locale_names(){
} }
static String get_trimmed_locale(const String& p_locale) {
return p_locale.substr(0,2);
}
static bool is_valid_locale(const String& p_locale) { static bool is_valid_locale(const String& p_locale) {
const char **ptr=locale_list; const char **ptr=locale_list;
@ -839,10 +844,18 @@ void Translation::_set_messages(const DVector<String>& p_messages){
void Translation::set_locale(const String& p_locale) { void Translation::set_locale(const String& p_locale) {
ERR_EXPLAIN("Invalid Locale: "+p_locale); if(!is_valid_locale(p_locale)) {
ERR_FAIL_COND(!is_valid_locale(p_locale)); String trimmed_locale = get_trimmed_locale(p_locale);
ERR_EXPLAIN("Invalid Locale: "+trimmed_locale);
ERR_FAIL_COND(!is_valid_locale(trimmed_locale));
locale=trimmed_locale;
}
else {
locale=p_locale; locale=p_locale;
} }
}
void Translation::add_message( const StringName& p_src_text, const StringName& p_xlated_text ) { void Translation::add_message( const StringName& p_src_text, const StringName& p_xlated_text ) {
@ -906,10 +919,18 @@ Translation::Translation() {
void TranslationServer::set_locale(const String& p_locale) { void TranslationServer::set_locale(const String& p_locale) {
ERR_EXPLAIN("Invalid Locale: "+p_locale); if(!is_valid_locale(p_locale)) {
ERR_FAIL_COND(!is_valid_locale(p_locale)); String trimmed_locale = get_trimmed_locale(p_locale);
ERR_EXPLAIN("Invalid Locale: "+trimmed_locale);
ERR_FAIL_COND(!is_valid_locale(trimmed_locale));
locale=trimmed_locale;
}
else {
locale=p_locale; locale=p_locale;
} }
}
String TranslationServer::get_locale() const { String TranslationServer::get_locale() const {