Skip to content

Commit b6f4b15

Browse files
committed
fix(i18n): replace hardcoded 'Conflict' title with t() call in quick commands
1 parent b41ce53 commit b6f4b15

4 files changed

Lines changed: 6 additions & 1 deletion

File tree

Tools/WebServer/static/js/features/quick-commands.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,9 @@ function openImportDialog(fileData) {
13771377
'">';
13781378
if (conflict) {
13791379
line +=
1380-
'<span class="qc-import-conflict-icon" title="Conflict">⚠</span> ' +
1380+
'<span class="qc-import-conflict-icon" title="' +
1381+
t('quick_commands.conflict', 'Conflict') +
1382+
'">⚠</span> ' +
13811383
'<span class="qc-import-label">' +
13821384
label +
13831385
'</span>' +

Tools/WebServer/static/js/locales/en.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ window.i18nResources['en'] = {
368368
ungrouped: '(Ungrouped)',
369369
nothing_to_import: 'No commands to import',
370370
conflict_skip: 'Skip',
371+
conflict: 'Conflict',
371372
conflict_overwrite: 'Overwrite',
372373
conflict_strategy: 'Conflict strategy:',
373374
strategy_per_item: 'Ask per item',

Tools/WebServer/static/js/locales/zh-CN.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ window.i18nResources['zh-CN'] = {
359359
ungrouped: '(未分组)',
360360
nothing_to_import: '没有可导入的命令',
361361
conflict_skip: '跳过',
362+
conflict: '冲突',
362363
conflict_overwrite: '覆盖',
363364
conflict_strategy: '冲突策略:',
364365
strategy_per_item: '逐项选择',

Tools/WebServer/static/js/locales/zh-TW.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ window.i18nResources['zh-TW'] = {
360360
ungrouped: '(未分組)',
361361
nothing_to_import: '沒有可匯入的指令',
362362
conflict_skip: '跳過',
363+
conflict: '衝突',
363364
conflict_overwrite: '覆蓋',
364365
conflict_strategy: '衝突策略:',
365366
strategy_per_item: '逐項選擇',

0 commit comments

Comments
 (0)