From d029039d22298792bf3fb9243ecdcc8a9659b42e Mon Sep 17 00:00:00 2001 From: Timothee Date: Mon, 27 Oct 2025 15:16:44 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B06759=20-=20Fix=20shortcut=20&=20dictiona?= =?UTF-8?q?ry=20entry=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2.x/itop-config/dictionaries/cs.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/da.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/de.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/en.dict.itop-config.php | 2 +- .../itop-config/dictionaries/en_gb.dict.itop-config.php | 2 +- .../itop-config/dictionaries/es_cr.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/fr.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/hu.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/it.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/ja.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/nl.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/pl.dict.itop-config.php | 2 +- .../itop-config/dictionaries/pt_br.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/ru.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/sk.dict.itop-config.php | 2 +- .../2.x/itop-config/dictionaries/tr.dict.itop-config.php | 2 +- .../itop-config/dictionaries/zh_cn.dict.itop-config.php | 2 +- datamodels/2.x/itop-config/templates/Edit.html.twig | 2 +- datamodels/2.x/itop-config/templates/Edit.ready.js.twig | 7 +++---- 19 files changed, 21 insertions(+), 22 deletions(-) diff --git a/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php index 906dbcd5d..63d19b7cd 100644 --- a/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php @@ -13,7 +13,7 @@ */ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Editor konfiguračního souboru', + 'itop-config/Operation:Edit/Title' => 'Editor konfiguračního souboru', 'config-edit-intro' => 'Při úpravách konfiguračního souboru buďte velice opatrní. Nesprávné nastavení může vést k nedostupnosti '.ITOP_APPLICATION_SHORT, 'Menu:ConfigEditor' => 'Konfigurace', 'config-apply' => 'Použít', 'config-apply-title' => 'Použít (Ctrl+S)', diff --git a/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php index dcd0577cc..f84848e9e 100644 --- a/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php @@ -11,7 +11,7 @@ */ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Configuration File Editor~~', + 'itop-config/Operation:Edit/Title' => 'Configuration File Editor~~', 'config-edit-intro' => 'Be very cautious when editing the configuration file.~~', 'Menu:ConfigEditor' => 'General configuration~~', 'config-apply' => 'Apply~~', diff --git a/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php index 05d6f4606..50e928963 100644 --- a/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php @@ -12,7 +12,7 @@ */ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Konfigurations-Editor', + 'itop-config/Operation:Edit/Title' => 'Konfigurations-Editor', 'config-edit-intro' => 'Achtung: Eine falsche Konfiguration kann dazu führen, dass '.ITOP_APPLICATION_SHORT.' für alle Benutzer unbenutzbar ist!', 'Menu:ConfigEditor' => 'Konfiguration', 'config-apply' => 'Anwenden (Ctrl+S)', diff --git a/datamodels/2.x/itop-config/dictionaries/en.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/en.dict.itop-config.php index ffbecacbe..8c55ddbcb 100644 --- a/datamodels/2.x/itop-config/dictionaries/en.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/en.dict.itop-config.php @@ -24,7 +24,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Menu:ConfigFileEditor' => 'Plain text editor', - 'config-edit-title' => 'Configuration File Editor', + 'itop-config/Operation:Edit/Title' => 'Configuration File Editor', 'config-edit-intro' => 'Be very cautious when editing the configuration file.', 'config-apply' => 'Apply', 'config-apply-title' => 'Apply (Ctrl+S)', diff --git a/datamodels/2.x/itop-config/dictionaries/en_gb.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/en_gb.dict.itop-config.php index 41ba17f08..d53bf08f1 100644 --- a/datamodels/2.x/itop-config/dictionaries/en_gb.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/en_gb.dict.itop-config.php @@ -24,7 +24,7 @@ Dict::Add('EN GB', 'British English', 'British English', array( 'Menu:ConfigFileEditor' => 'Plain text editor', - 'config-edit-title' => 'Configuration File Editor', + 'itop-config/Operation:Edit/Title' => 'Configuration File Editor', 'config-edit-intro' => 'Be very cautious when editing the configuration file.', 'config-apply' => 'Apply', 'config-apply-title' => 'Apply (Ctrl+S)', diff --git a/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php index cb97826f8..a363c9d5d 100644 --- a/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php @@ -9,7 +9,7 @@ */ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Editor de Archivo de Configuración', + 'itop-config/Operation:Edit/Title' => 'Editor de Archivo de Configuración', 'config-edit-intro' => 'Sea muy cuidadoso cuando edite el archivo de configuración. En particular, sólo los elementos superiores (ejem.: the global configuration y modules settings) deberian ser editados.', 'Menu:ConfigEditor' => 'Configuración', 'config-apply' => 'Aplicar', diff --git a/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php index 9df9c5dde..c20c907eb 100644 --- a/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php @@ -11,7 +11,7 @@ */ Dict::Add('FR FR', 'French', 'Français', array( 'Menu:ConfigFileEditor' => 'Éditeur de texte brut', - 'config-edit-title' => 'Éditeur du Fichier de Configuration', + 'itop-config/Operation:Edit/Title' => 'Éditeur du Fichier de Configuration', 'config-edit-intro' => 'Attention: une configuration incorrecte peut rendre '.ITOP_APPLICATION_SHORT.' inopérant pour tous les utilisateurs!', 'config-apply' => 'Enregistrer', 'config-apply-title' => 'Enregistrer (Ctrl+S)', diff --git a/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php index 56983cc4b..78542754a 100644 --- a/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php @@ -11,7 +11,7 @@ */ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Konfigurációs fájl szerkesztő', + 'itop-config/Operation:Edit/Title' => 'Konfigurációs fájl szerkesztő', 'config-edit-intro' => 'Legyen nagyon óvatos a konfiguráció szerkesztésénél!', 'Menu:ConfigEditor' => 'Konfiguráció szerkesztő', 'config-apply' => 'Alkalmaz', diff --git a/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php index 7b6a3629b..6145516c9 100644 --- a/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php @@ -10,7 +10,7 @@ * */ Dict::Add('IT IT', 'Italian', 'Italiano', array( - 'config-edit-title' => 'Modifica file di configurazione', + 'itop-config/Operation:Edit/Title' => 'Modifica file di configurazione', 'config-edit-intro' => 'Prestare molta attenzione durante la modifica del file di configurazione.', 'Menu:ConfigEditor' => 'Configurazione', 'config-apply' => 'Applica', diff --git a/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php index 1a8c11c26..4d52eb383 100644 --- a/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php @@ -11,7 +11,7 @@ */ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Configuration File Editor~~', + 'itop-config/Operation:Edit/Title' => 'Configuration File Editor~~', 'config-edit-intro' => 'Be very cautious when editing the configuration file.~~', 'Menu:ConfigEditor' => 'General configuration~~', 'config-apply' => 'Apply~~', diff --git a/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php index 2da9a55ce..548a3f30a 100644 --- a/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php @@ -12,7 +12,7 @@ */ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Aanpassen configuratie', + 'itop-config/Operation:Edit/Title' => 'Aanpassen configuratie', 'config-edit-intro' => 'Wees uiterst voorzichtig bij het aanpassen van de configuratie.', 'Menu:ConfigEditor' => 'Configuratie', 'config-apply' => 'Opslaan', diff --git a/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php index ac2e607b0..9b8bca2d1 100644 --- a/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php @@ -11,7 +11,7 @@ */ Dict::Add('PL PL', 'Polish', 'Polski', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Edycja pliku konfiguracyjnego', + 'itop-config/Operation:Edit/Title' => 'Edycja pliku konfiguracyjnego', 'config-edit-intro' => 'Zachowaj ostrożność podczas edycji pliku konfiguracyjnego.', 'Menu:ConfigEditor' => 'Konfiguracja ogólna', 'config-apply' => 'Zastosuj', diff --git a/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php index 40af56241..9625de2a7 100644 --- a/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php @@ -11,7 +11,7 @@ */ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Menu:ConfigFileEditor' => 'Configurações', - 'config-edit-title' => 'Editor do arquivo de configuração', + 'itop-config/Operation:Edit/Title' => 'Editor do arquivo de configuração', 'config-edit-intro' => 'Tenha cuidado ao editar o arquivo de configuração', 'Menu:ConfigEditor' => 'Configurações', 'config-apply' => 'Aplicar', diff --git a/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php index 8b2004333..d2ba8aa92 100644 --- a/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php @@ -12,7 +12,7 @@ */ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Редактор файла конфигурации', + 'itop-config/Operation:Edit/Title' => 'Редактор файла конфигурации', 'config-edit-intro' => 'Будьте очень осторожны при редактировании файла конфигурации. В частности, отредактированы могут быть только глобальная конфигурация и настройки модулей.', 'Menu:ConfigEditor' => 'Основные настройки', 'config-apply' => 'Применить', diff --git a/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php index 2aa45484a..c3a31621f 100644 --- a/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php @@ -11,7 +11,7 @@ */ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Configuration File Editor~~', + 'itop-config/Operation:Edit/Title' => 'Configuration File Editor~~', 'config-edit-intro' => 'Be very cautious when editing the configuration file.~~', 'Menu:ConfigEditor' => 'General configuration~~', 'config-apply' => 'Apply~~', diff --git a/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php index 77d5dac0f..fa8891c64 100644 --- a/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php @@ -11,7 +11,7 @@ */ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', - 'config-edit-title' => 'Configuration File Editor~~', + 'itop-config/Operation:Edit/Title' => 'Configuration File Editor~~', 'config-edit-intro' => 'Be very cautious when editing the configuration file.~~', 'Menu:ConfigEditor' => 'General configuration~~', 'config-apply' => 'Apply~~', diff --git a/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php index d12deeb12..e2e8ad296 100644 --- a/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php +++ b/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php @@ -23,7 +23,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Menu:ConfigFileEditor' => 'Plain text editor~~', 'Menu:ConfigEditor' => '编辑配置文件', - 'config-edit-title' => '配置文件编辑器', + 'itop-config/Operation:Edit/Title' => '配置文件编辑器', 'config-edit-intro' => '编辑配置文件时请务必格外小心.', 'config-apply' => '应用', 'config-apply-title' => '应用 (Ctrl+S)', diff --git a/datamodels/2.x/itop-config/templates/Edit.html.twig b/datamodels/2.x/itop-config/templates/Edit.html.twig index c959ab8c6..3af607607 100644 --- a/datamodels/2.x/itop-config/templates/Edit.html.twig +++ b/datamodels/2.x/itop-config/templates/Edit.html.twig @@ -11,7 +11,7 @@ {% UIAlert ForSuccess{sContent: sSuccess} %}{% EndUIAlert %} {% endfor %} -{% UITitle ForPage {'sTitle':'config-edit-title'|dict_s} %}{% EndUITitle %} +{% UITitle ForPage {'sTitle':'itop-config/Operation:Edit/Title'|dict_s} %}{% EndUITitle %} {% if bShowEditor %}

{{ 'config-edit-intro'|dict_s }}

diff --git a/datamodels/2.x/itop-config/templates/Edit.ready.js.twig b/datamodels/2.x/itop-config/templates/Edit.ready.js.twig index a4e80b254..ce1c311fd 100644 --- a/datamodels/2.x/itop-config/templates/Edit.ready.js.twig +++ b/datamodels/2.x/itop-config/templates/Edit.ready.js.twig @@ -91,11 +91,10 @@ editor.commands.addCommand({ name: 'save', bindKey: {win: "Ctrl-S", "mac": "Cmd-S"}, exec: function(editor) { - var editorForm = EditorUtils.getEditorForm(editor); - var submitButton = document.getElementById('submit_button'); + let submitButton = document.getElementById('submit_button'); - if (submitButton.is(":enabled")) { - editorForm.trigger('submit'); + if (!submitButton.disabled) { + submitButton.click(); } } });