Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 14:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not auto add default script and country codes to the locale.

Browse source
This commit is contained in:
bruvzg 2022-10-27 09:19:01 +03:00
parent 06cad89060
commit ec3c4fcba9
No known key found for this signature in database
GPG key ID: 7960FCF39844EC38
2 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
core/string/translation.cpp
View file

@ -293,6 +293,10 @@ void TranslationServer::init_locale_info() {
} }
String TranslationServer::standardize_locale(const String &p_locale) const { String TranslationServer::standardize_locale(const String &p_locale) const {
return _standardize_locale(p_locale, false);
}
String TranslationServer::_standardize_locale(const String &p_locale, bool p_add_defaults) const {
// Replaces '-' with '_' for macOS style locales. // Replaces '-' with '_' for macOS style locales.
String univ_locale = p_locale.replace("-", "_"); String univ_locale = p_locale.replace("-", "_");
@ -354,24 +358,26 @@ String TranslationServer::standardize_locale(const String &p_locale) const {
} }
// Add script code base on language and country codes for some ambiguous cases. // Add script code base on language and country codes for some ambiguous cases.
if (script_name.is_empty()) { if (p_add_defaults) {
for (int i = 0; i < locale_script_info.size(); i++) { if (script_name.is_empty()) {
const LocaleScriptInfo &info = locale_script_info[i]; for (int i = 0; i < locale_script_info.size(); i++) {
if (info.name == lang_name) { const LocaleScriptInfo &info = locale_script_info[i];
if (country_name.is_empty() || info.supported_countries.has(country_name)) { if (info.name == lang_name) {
script_name = info.script; if (country_name.is_empty() || info.supported_countries.has(country_name)) {
break; script_name = info.script;
break;
}
} }
} }
} }
} if (!script_name.is_empty() && country_name.is_empty()) {
if (!script_name.is_empty() && country_name.is_empty()) { // Add conntry code based on script for some ambiguous cases.
// Add conntry code based on script for some ambiguous cases. for (int i = 0; i < locale_script_info.size(); i++) {
for (int i = 0; i < locale_script_info.size(); i++) { const LocaleScriptInfo &info = locale_script_info[i];
const LocaleScriptInfo &info = locale_script_info[i]; if (info.name == lang_name && info.script == script_name) {
if (info.name == lang_name && info.script == script_name) { country_name = info.default_country;
country_name = info.default_country; break;
break; }
} }
} }
} }
@ -391,8 +397,8 @@ String TranslationServer::standardize_locale(const String &p_locale) const {
} }
int TranslationServer::compare_locales(const String &p_locale_a, const String &p_locale_b) const { int TranslationServer::compare_locales(const String &p_locale_a, const String &p_locale_b) const {
String locale_a = standardize_locale(p_locale_a); String locale_a = _standardize_locale(p_locale_a, true);
String locale_b = standardize_locale(p_locale_b); String locale_b = _standardize_locale(p_locale_b, true);
if (locale_a == locale_b) { if (locale_a == locale_b) {
// Exact match. // Exact match.

1
core/string/translation.h
View file

@ -102,6 +102,7 @@ class TranslationServer : public Object {
static TranslationServer *singleton; static TranslationServer *singleton;
bool _load_translations(const String &p_from); bool _load_translations(const String &p_from);
String _standardize_locale(const String &p_locale, bool p_add_defaults) const;
StringName _get_message_from_translations(const StringName &p_message, const StringName &p_context, const String &p_locale, bool plural, const String &p_message_plural = "", int p_n = 0) const; StringName _get_message_from_translations(const StringName &p_message, const StringName &p_context, const String &p_locale, bool plural, const String &p_message_plural = "", int p_n = 0) const;