Add support for comment column in translation csv

godotengine · Nov 7, 2023 · 1b07b41 · 1b07b41
1 parent 5ee9831
commit 1b07b41
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/editor/import/resource_importer_csv_translation.cpp b/editor/import/resource_importer_csv_translation.cpp
@@ -101,9 +101,12 @@ Error ResourceImporterCSVTranslation::import(const String &p_source_file, const
  for (int i = 1; i < line.size(); i++) {
  String locale = TranslationServer::get_singleton()->standardize_locale(line[i]);
 
- if (locale.is_empty()) {
+ if (line[i].left(1) == "_") {
  skipped_locales.insert(i);
- ERR_CONTINUE_MSG(true, vformat("Error importing CSV translation: Invalid locale format '%s', should be 'language_Script_COUNTRY_VARIANT@extra'.", line[i]));
+ continue;
+ } else if (locale.is_empty()) {
+ skipped_locales.insert(i);
+ ERR_CONTINUE_MSG(true, vformat("Error importing CSV translation: Invalid locale format '%s', should be 'language_Script_COUNTRY_VARIANT@extra'. This column will be ignored.", line[i]));
  }
 
  locales.push_back(locale);
@@ -117,7 +120,7 @@ Error ResourceImporterCSVTranslation::import(const String &p_source_file, const
  line = f->get_csv_line(delimiter);
  String key = line[0];
  if (!key.is_empty()) {
- ERR_CONTINUE_MSG(line.size() != locales.size() + 1, vformat("Error importing CSV translation: expected %d locale(s), but the '%s' key has %d locale(s).", locales.size(), key, line.size() - 1));
+ ERR_CONTINUE_MSG(line.size() != locales.size() + (int)skipped_locales.size() + 1, vformat("Error importing CSV translation: expected %d locale(s), but the '%s' key has %d locale(s).", locales.size(), key, line.size() - 1));
 
  for (int i = 1; i < line.size(); i++) {
  if (skipped_locales.has(i)) {