Merge pull request #98234 from timothyqiu/locale-compare-cache

[3.x] Cache results for `TranslationServer.compare_locales()`
This commit is contained in:
lawnjelly 2024-10-17 09:00:41 +01:00 committed by GitHub
commit 3841d76515
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 13 deletions

View file

@ -365,32 +365,46 @@ String TranslationServer::_standardize_locale(const String &p_locale, bool p_add
} }
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 {
if (p_locale_a == p_locale_b) {
// Exact match.
return 10;
}
const String cache_key = p_locale_a + "|" + p_locale_b;
const int *cached_result = locale_compare_cache.getptr(cache_key);
if (cached_result) {
return *cached_result;
}
String locale_a = _standardize_locale(p_locale_a, true); String locale_a = _standardize_locale(p_locale_a, true);
String locale_b = _standardize_locale(p_locale_b, true); String locale_b = _standardize_locale(p_locale_b, true);
if (locale_a == locale_b) { if (locale_a == locale_b) {
// Exact match. // Exact match.
locale_compare_cache.set(cache_key, 10);
return 10; return 10;
} }
Vector<String> locale_a_elements = locale_a.split("_"); Vector<String> locale_a_elements = locale_a.split("_");
Vector<String> locale_b_elements = locale_b.split("_"); Vector<String> locale_b_elements = locale_b.split("_");
if (locale_a_elements[0] == locale_b_elements[0]) { if (locale_a_elements[0] != locale_b_elements[0]) {
// Matching language, both locales have extra parts.
// Return number of matching elements.
int matching_elements = 1;
for (int i = 1; i < locale_a_elements.size(); i++) {
for (int j = 1; j < locale_b_elements.size(); j++) {
if (locale_a_elements[i] == locale_b_elements[j]) {
matching_elements++;
}
}
}
return matching_elements;
} else {
// No match. // No match.
locale_compare_cache.set(cache_key, 0);
return 0; return 0;
} }
// Matching language, both locales have extra parts.
// Return number of matching elements.
int matching_elements = 1;
for (int i = 1; i < locale_a_elements.size(); i++) {
for (int j = 1; j < locale_b_elements.size(); j++) {
if (locale_a_elements[i] == locale_b_elements[j]) {
matching_elements++;
}
}
}
locale_compare_cache.set(cache_key, matching_elements);
return matching_elements;
} }
String TranslationServer::get_locale_name(const String &p_locale) const { String TranslationServer::get_locale_name(const String &p_locale) const {

View file

@ -87,6 +87,8 @@ class TranslationServer : public Object {
Ref<Translation> tool_translation; Ref<Translation> tool_translation;
Ref<Translation> doc_translation; Ref<Translation> doc_translation;
mutable HashMap<String, int> locale_compare_cache;
bool enabled; bool enabled;
static TranslationServer *singleton; static TranslationServer *singleton;