diff --git a/core/translation.cpp b/core/translation.cpp index afbc639eaa6..ee132476639 100644 --- a/core/translation.cpp +++ b/core/translation.cpp @@ -1030,6 +1030,13 @@ StringName TranslationServer::translate(const StringName &p_message) const { if (!enabled) return p_message; + // Locale can be of the form 'll_CC', i.e. language code and regional code, + // e.g. 'en_US', 'en_GB', etc. It might also be simply 'll', e.g. 'en'. + // To find the relevant translation, we look for those with locale starting + // with the language code, and then if any is an exact match for the long + // form. If not found, we fall back to a near match (another locale with + // same language code). + StringName res; bool near_match = false; const CharType *lptr = &locale[0]; @@ -1039,13 +1046,11 @@ StringName TranslationServer::translate(const StringName &p_message) const { const Ref &t = E->get(); String l = t->get_locale(); if (lptr[0] != l[0] || lptr[1] != l[1]) - continue; // locale not match + continue; // Language code does not match. - //near match - bool match = (l != locale); - - if (near_match && !match) - continue; //only near-match once + bool exact_match = (l == locale); + if (!exact_match && near_match) + continue; // Only near-match once, but keep looking for exact matches. StringName r = t->get_message(p_message); @@ -1054,43 +1059,38 @@ StringName TranslationServer::translate(const StringName &p_message) const { res = r; - if (match) + if (exact_match) break; else near_match = true; } - if (!res) { - //try again with fallback - if (fallback.length() >= 2) { + if (!res && fallback.length() >= 2) { + // Try again with the fallback locale. + const CharType *fptr = &fallback[0]; + near_match = false; + for (const Set >::Element *E = translations.front(); E; E = E->next()) { - const CharType *fptr = &fallback[0]; - near_match = false; - for (const Set >::Element *E = translations.front(); E; E = E->next()) { + const Ref &t = E->get(); + String l = t->get_locale(); + if (fptr[0] != l[0] || fptr[1] != l[1]) + continue; // Language code does not match. - const Ref &t = E->get(); - String l = t->get_locale(); - if (fptr[0] != l[0] || fptr[1] != l[1]) - continue; // locale not match + bool exact_match = (l == fallback); + if (!exact_match && near_match) + continue; // Only near-match once, but keep looking for exact matches. - //near match - bool match = (l != fallback); + StringName r = t->get_message(p_message); - if (near_match && !match) - continue; //only near-match once + if (!r) + continue; - StringName r = t->get_message(p_message); + res = r; - if (!r) - continue; - - res = r; - - if (match) - break; - else - near_match = true; - } + if (exact_match) + break; + else + near_match = true; } }