Merge pull request #61878 from bruvzg/backport_locale_select

[3.x] Backport locale selection improvements.
This commit is contained in:
Rémi Verschelde
2022-08-05 23:45:17 +02:00
committed by GitHub
19 changed files with 2430 additions and 1214 deletions

View File

@ -97,8 +97,7 @@ Error ResourceImporterCSVTranslation::import(const String &p_source_file, const
Vector<Ref<Translation>> translations;
for (int i = 1; i < line.size(); i++) {
String locale = line[i];
ERR_FAIL_COND_V_MSG(!TranslationServer::is_locale_valid(locale), ERR_PARSE_ERROR, "Error importing CSV translation: '" + locale + "' is not a valid locale.");
String locale = TranslationServer::get_singleton()->standardize_locale(line[i]);
locales.push_back(locale);
Ref<Translation> translation;