feat: allow toggle i18n-ally.extract.autoDetect from UI, close #591

antfu · antfu · commit a9ca8ca658a7 · 2021-06-29T10:38:42.000+08:00
diff --git a/locales/de.json b/locales/de.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Schlüssel löschen",
   "command.duplicate_key": "Schlüssel kopieren",
   "command.edit_key": "Übersetzung bearbeiten",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "Vervollständige Schlüssel mit leeren Texten",
   "command.go_to_range": "",
   "command.insert_key": "Schlüssel einfügen",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "Zeige Hinweise im Text",
   "config.annotation_max_length": "Maximale Zeichenlänge für Hinweise die im Text angezeigt werden. Abgeschnitte Zeichen werden als (...) angezeigt",
   "config.annotations": "Hinweise im Text aktivieren",
+  "config.auto_detection": "",
   "config.deepl_api_key": "API key für die DeepL translate engine",
   "config.deepl_log": "DeepL debug logs anzeigen",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/en.json b/locales/en.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Delete key",
   "command.duplicate_key": "Duplicate key",
   "command.edit_key": "Edit translation",
+  "command.extract.disable-auto-detect": "Disable hard-coded strings auto detection",
+  "command.extract.enable-auto-detect": "Enable hard-coded strings auto detection",
   "command.fulfill_keys": "Fulfill keys with empty strings",
   "command.go_to_range": "Go to range",
   "command.insert_key": "Insert key",
diff --git a/locales/es.json b/locales/es.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Eliminar clave",
   "command.duplicate_key": "Duplicar clave",
   "command.edit_key": "Editar traducción",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "Rellenar claves con cadena vacía",
   "command.go_to_range": "",
   "command.insert_key": "Insertar clave",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "Mostrar la anotación en su lugar en vez de agregar a la cola",
   "config.annotation_max_length": "Máximo número de caracteres que se mostrarán en las anotaciones en línea. Los restantes se mostrarán como elipses (...)",
   "config.annotations": "Habilitar las anotaciones en línea.",
+  "config.auto_detection": "",
   "config.deepl_api_key": "API key para el traductor DeepL",
   "config.deepl_log": "Mostrar mensajes de depuración del motor DeepL",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/fr.json b/locales/fr.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Supprimer une Clé",
   "command.duplicate_key": "Dupliquer une Clé",
   "command.edit_key": "Modifier la traduction",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "Remplir les champs vides de Clés",
   "command.go_to_range": "Aller à la plage",
   "command.insert_key": "Insérer une clé",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "Montrer une annotation sur place au lieu d'ajouter dans la queue",
   "config.annotation_max_length": "Nombre maximum de caractères à afficher dans les annotations. Le surplus sera affiché sous forme d'ellipse (...)",
   "config.annotations": "Activer les annotations.",
+  "config.auto_detection": "",
   "config.deepl_api_key": "Clé API pour utiliser le moteur de traduction DeepL",
   "config.deepl_log": "Montrer le journal de debug du moteur DeepL",
   "config.deepl_use_free_api_entry": "Utiliser le point d'entrée gratuite de DeepL",
diff --git a/locales/ja.json b/locales/ja.json
@@ -8,6 +8,8 @@
   "command.delete_key": "i18nキーを削除する",
   "command.duplicate_key": "",
   "command.edit_key": "翻訳を編集する",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "空文字でキーを埋める",
   "command.go_to_range": "",
   "command.insert_key": "",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "",
   "config.annotation_max_length": "インラインアノテーションの最大文字数です。超過している部分は(...)と表示されます。",
   "config.annotations": "インラインアノテーションを有効にする.",
+  "config.auto_detection": "",
   "config.deepl_api_key": "",
   "config.deepl_log": "",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/nb-NO.json b/locales/nb-NO.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Slett nøkkel",
   "command.duplicate_key": "",
   "command.edit_key": "Rediger oversettelse",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "",
   "command.go_to_range": "",
   "command.insert_key": "",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "",
   "config.annotation_max_length": "Maksimalt antall tegn vist i hjelpevindu. Resterende del vil bli vist som (...)",
   "config.annotations": "Slå på hjelpevindu",
+  "config.auto_detection": "",
   "config.deepl_api_key": "",
   "config.deepl_log": "",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/nl-NL.json b/locales/nl-NL.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Verwijder sleutel",
   "command.duplicate_key": "Dupliceer sleutel",
   "command.edit_key": "Bewerk vertaling",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "Sleutels met lege waarden aanvullen",
   "command.go_to_range": "",
   "command.insert_key": "",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "",
   "config.annotation_max_length": "Max. aantal karakters zichtbaar binnen inline annotaties. Overschreden delen worden getoond als ellipses (...)",
   "config.annotations": "Inline annotaties inschakelen.",
+  "config.auto_detection": "",
   "config.deepl_api_key": "",
   "config.deepl_log": "",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Deletar chave",
   "command.duplicate_key": "Duplicar chave",
   "command.edit_key": "Editar tradução",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "Preencher chaves com strings vazias",
   "command.go_to_range": "",
   "command.insert_key": "",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "",
   "config.annotation_max_length": "Número máximo de caracteres exibidos nas anotações inline. O restante será exibido em forma de reticências (...)",
   "config.annotations": "Habilitar anotações inline",
+  "config.auto_detection": "",
   "config.deepl_api_key": "",
   "config.deepl_log": "",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/ru.json b/locales/ru.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Удалить ключ",
   "command.duplicate_key": "Повторяющийся ключ",
   "command.edit_key": "Редактировать перевод",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "Заполнять ключ пустой строкой",
   "command.go_to_range": "",
   "command.insert_key": "Вставить ключ",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "Показывать аннотацию на месте вместо добавления в конец",
   "config.annotation_max_length": "Максимальное количество символов, отображаемых во встроенных аннотациях. Лишние символы будут отображаться в виде многоточия (...)",
   "config.annotations": "Включить встроенные аннотации.",
+  "config.auto_detection": "",
   "config.deepl_api_key": "API ключ для использования DeepL",
   "config.deepl_log": "Отображать отладочные журналы DeepL",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/sv-SE.json b/locales/sv-SE.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Ta bort nyckel",
   "command.duplicate_key": "Duplicera nyckel",
   "command.edit_key": "Ändra översättning",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "Skapa saknade nycklar med tomma strängar",
   "command.go_to_range": "",
   "command.insert_key": "Lägg till nyckel",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "Visa anteckningar på plats istället för att vidhänga på slutet",
   "config.annotation_max_length": "Max antal bokstävers som visas i insatta anteckningen. Överflödiga bokstäver kommer visas som en ellips (…)",
   "config.annotations": "Aktivera insatta anteckningar.",
+  "config.auto_detection": "",
   "config.deepl_api_key": "",
   "config.deepl_log": "",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/tr.json b/locales/tr.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Çeviriyi sil",
   "command.duplicate_key": "Çeviriyi klonla",
   "command.edit_key": "Çeviriyi düzenle",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "Boş bırakılmış çevirileri doldur",
   "command.go_to_range": "Aralığa git",
   "command.insert_key": "Çeviri ekle",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "Ek açıklamaları kuyruğa eklemek yerine olduğu yerde göster",
   "config.annotation_max_length": "Satır aralığında gösterilen ek açıklamaların maksimum karakter uzunluğu. Fazladan karakterler noktalı şekilde görüntülenecektir (...)",
   "config.annotations": "Satır aralığında ek açıklamaları etkinleştir",
+  "config.auto_detection": "",
   "config.deepl_api_key": "DeepL çeviri sistemini kullanmak için API anahtarı",
   "config.deepl_log": "DeepL sisteminin hata ayıklama kayıtlarını göster",
   "config.deepl_use_free_api_entry": "DeepL'in Bedava API giriş noktasını kullanın",
diff --git a/locales/uk-UA.json b/locales/uk-UA.json
@@ -8,6 +8,8 @@
   "command.delete_key": "Видалити ключ",
   "command.duplicate_key": "Дублікат ключа",
   "command.edit_key": "Редагувати переклад",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "Заповнювати ключ порожній рядком",
   "command.go_to_range": "",
   "command.insert_key": "Вставити ключ",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "Показувати анотацію на місці замість додавання в кінець",
   "config.annotation_max_length": "Максимальна кількість символів, що відображаються у вбудованих анотаціях. Зайві символи будуть відображатися у вигляді трьох крапок (...)",
   "config.annotations": "Включити вбудовані анотації.",
+  "config.auto_detection": "",
   "config.deepl_api_key": "Ключ для використання API DeepL",
   "config.deepl_log": "Відображати налагоджувальні журнали DeepL",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
@@ -8,6 +8,8 @@
   "command.delete_key": "删除路径",
   "command.duplicate_key": "建立副本",
   "command.edit_key": "编辑文案",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "使用空字符串填充文案路径",
   "command.go_to_range": "",
   "command.insert_key": "插入i18n文案",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "在路径原位显示翻译文案，而不是附加在末尾",
   "config.annotation_max_length": "内联注释显示的最大字符数。超出的部分将显示为省略号（...）",
   "config.annotations": "启用内联注释",
+  "config.auto_detection": "",
   "config.deepl_api_key": "",
   "config.deepl_log": "",
   "config.deepl_use_free_api_entry": "",
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
@@ -8,6 +8,8 @@
   "command.delete_key": "刪除路徑",
   "command.duplicate_key": "建立副本",
   "command.edit_key": "編輯文案",
+  "command.extract.disable-auto-detect": "",
+  "command.extract.enable-auto-detect": "",
   "command.fulfill_keys": "使用空字串填充文案路徑",
   "command.go_to_range": "",
   "command.insert_key": "插入i18n文案",
@@ -32,6 +34,7 @@
   "config.annotation_in_place": "在路徑原位顯示翻譯文案，而不是附加在末尾",
   "config.annotation_max_length": "內聯註釋顯示的最大文字數。超出的部分將顯示為省略號（...）",
   "config.annotations": "啟用內聯註釋",
+  "config.auto_detection": "",
   "config.deepl_api_key": "",
   "config.deepl_log": "",
   "config.deepl_use_free_api_entry": "",
diff --git a/package.json b/package.json
@@ -370,6 +370,16 @@
         "category": "%extname%",
         "title": "%command.show_docs%",
         "icon": "$(question)"
+      },
+      {
+        "command": "i18n-ally.extract-disable-auto-detect",
+        "category": "%extname%",
+        "title": "%command.extract.disable-auto-detect%"
+      },
+      {
+        "command": "i18n-ally.extract-enable-auto-detect",
+        "category": "%extname%",
+        "title": "%command.extract.enable-auto-detect%"
       }
     ],
     "menus": {
@@ -465,6 +475,14 @@
         {
           "command": "i18n-ally.go-to-range",
           "when": "false"
+        },
+        {
+          "command": "i18n-ally.extract-disable-auto-detect",
+          "when": "false"
+        },
+        {
+          "command": "i18n-ally.extract-enable-auto-detect",
+          "when": "false"
         }
       ],
       "view/item/context": [
@@ -560,6 +578,16 @@
           "command": "i18n-ally.extract-hard-strings-batch",
           "when": "viewItem =~ /i18n-ally-hard-string-root/",
           "group": "i18nally@1"
+        },
+        {
+          "command": "i18n-ally.extract-disable-auto-detect",
+          "when": "viewItem =~ /i18n-ally-hard-string-root/ && i18n-ally.extract.autoDetect == true",
+          "group": "i18nally@2"
+        },
+        {
+          "command": "i18n-ally.extract-enable-auto-detect",
+          "when": "viewItem =~ /i18n-ally-hard-string-root/ && i18n-ally.extract.autoDetect == false",
+          "group": "i18nally@2"
         }
       ],
       "view/title": [
diff --git a/src/commands/commands.ts b/src/commands/commands.ts
@@ -9,6 +9,8 @@ export const enum Commands {
   set_source_language = 'i18n-ally.set-source-language',
   extract_text = 'i18n-ally.extract-text',
   extract_hard_strings_batch = 'i18n-ally.extract-hard-strings-batch',
+  extract_disable_auto_detect = 'i18n-ally.extract-disable-auto-detect',
+  extract_enable_auto_detect = 'i18n-ally.extract-enable-auto-detect',
   detect_hard_strings = 'i18n-ally.detect_hard_strings',
   replace_with = 'i18n-ally.replace-with',
   copy_key = 'i18n-ally.copy-key',
diff --git a/src/commands/extractText.ts b/src/commands/extractText.ts
@@ -205,6 +205,12 @@ async function ExtractOrInsertCommnad(options?: ExtractTextOptions, detection?:
 const m: ExtensionModule = () => {
   return [
     commands.registerCommand(Commands.extract_text, ExtractOrInsertCommnad),
+    commands.registerCommand(Commands.extract_enable_auto_detect, () => {
+      Config.extractAutoDetect = true
+    }),
+    commands.registerCommand(Commands.extract_disable_auto_detect, () => {
+      Config.extractAutoDetect = false
+    }),
   ]
 }
 
diff --git a/src/core/Config.ts b/src/core/Config.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 import { execSync } from 'child_process'
-import { workspace, extensions, ExtensionContext } from 'vscode'
+import { workspace, extensions, ExtensionContext, commands } from 'vscode'
 import { trimEnd, uniq } from 'lodash'
 import { TagSystems } from '../tagSystems'
 import { EXT_NAMESPACE, EXT_ID, EXT_LEGACY_NAMESPACE, KEY_REG_DEFAULT, KEY_REG_ALL, DEFAULT_LOCALE_COUNTRY_MAP } from '../meta'
@@ -437,6 +437,11 @@ export class Config {
     return this.getConfig<boolean>('extract.autoDetect') ?? false
   }
 
+  static set extractAutoDetect(v: boolean) {
+    this.setConfig('extract.autoDetect', v, false)
+    commands.executeCommand('setContext', 'i18n-ally.extract.autoDetect', v)
+  }
+
   static get extractParserHTMLOptions() {
     return this.getConfig<ExtractionHTMLOptions>('extract.parsers.html') ?? {}
   }
diff --git a/src/core/Global.ts b/src/core/Global.ts
@@ -366,6 +366,8 @@ export class Global {
       Log.info(`🧩 Enabled frameworks: ${this.enabledFrameworks.map(i => i.display).join(', ')}`)
       Log.info(`🧬 Enabled parsers: ${this.enabledParsers.map(i => i.id).join(', ')}`)
       Log.info('')
+      commands.executeCommand('setContext', 'i18n-ally.extract.autoDetect', Config.extractAutoDetect)
+
       await this.initLoader(this._rootpath, reload)
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,12 @@ async function ExtractOrInsertCommnad(options?: ExtractTextOptions, detection?:`
`205`	`205`	`const m: ExtensionModule = () => {`
`206`	`206`	`return [`
`207`	`207`	`commands.registerCommand(Commands.extract_text, ExtractOrInsertCommnad),`
	`208`	`+ commands.registerCommand(Commands.extract_enable_auto_detect, () => {`
	`209`	`+ Config.extractAutoDetect = true`
	`210`	`+ }),`
	`211`	`+ commands.registerCommand(Commands.extract_disable_auto_detect, () => {`
	`212`	`+ Config.extractAutoDetect = false`
	`213`	`+ }),`
`208`	`214`	`]`
`209`	`215`	`}`
`210`	`216`
Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,8 @@ export class Global {`
`366`	`366`	Log.info(`🧩 Enabled frameworks: ${this.enabledFrameworks.map(i => i.display).join(', ')}`)
`367`	`367`	Log.info(`🧬 Enabled parsers: ${this.enabledParsers.map(i => i.id).join(', ')}`)
`368`	`368`	`Log.info('')`
	`369`	`+ commands.executeCommand('setContext', 'i18n-ally.extract.autoDetect', Config.extractAutoDetect)`
	`370`	`+`
`369`	`371`	`await this.initLoader(this._rootpath, reload)`
`370`	`372`	`}`
`371`	`373`	`else {`