From b3d20effd68efbdfc3604f51abd855471c596822 Mon Sep 17 00:00:00 2001 From: Timothee Date: Mon, 15 Jul 2024 17:51:25 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B07589=20-=20Move=20oauth=20client=20menu?= =?UTF-8?q?=20under=20Integration=20and=20revert=20general=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/datamodel.application.xml | 4 ++-- datamodels/2.x/itop-config/datamodel.itop-config.xml | 4 ++-- .../2.x/itop-oauth-client/datamodel.itop-oauth-client.xml | 2 +- dictionaries/cs.dictionary.itop.ui.php | 4 ++++ dictionaries/da.dictionary.itop.ui.php | 4 ++++ dictionaries/de.dictionary.itop.ui.php | 4 ++++ dictionaries/en.dictionary.itop.ui.php | 4 +++- dictionaries/es_cr.dictionary.itop.ui.php | 4 ++++ dictionaries/hu.dictionary.itop.ui.php | 4 ++++ dictionaries/it.dictionary.itop.ui.php | 4 ++++ dictionaries/ja.dictionary.itop.ui.php | 4 ++++ dictionaries/nl.dictionary.itop.ui.php | 4 ++++ dictionaries/pl.dictionary.itop.ui.php | 4 ++++ dictionaries/pt_br.dictionary.itop.ui.php | 4 ++++ dictionaries/ru.dictionary.itop.ui.php | 4 ++++ dictionaries/sk.dictionary.itop.ui.php | 4 ++++ dictionaries/tr.dictionary.itop.ui.php | 4 ++++ dictionaries/zh_cn.dictionary.itop.ui.php | 4 ++++ 18 files changed, 64 insertions(+), 6 deletions(-) diff --git a/application/datamodel.application.xml b/application/datamodel.application.xml index 45f6139fd..a7f8af513 100644 --- a/application/datamodel.application.xml +++ b/application/datamodel.application.xml @@ -185,8 +185,8 @@ fas fa-cog - - 10 + + 15 ConfigurationTools diff --git a/datamodels/2.x/itop-config/datamodel.itop-config.xml b/datamodels/2.x/itop-config/datamodel.itop-config.xml index bc9431560..1b8226cb7 100644 --- a/datamodels/2.x/itop-config/datamodel.itop-config.xml +++ b/datamodels/2.x/itop-config/datamodel.itop-config.xml @@ -1,9 +1,9 @@ - + 10 - ConfigEditor + ConfigurationTools config.php 1 diff --git a/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml b/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml index f05f956a3..f2321aa2e 100644 --- a/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml +++ b/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml @@ -936,7 +936,7 @@ HTML 100 - ConfigurationTools + Integrations 1 0 diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php index aaddffeb8..975d090a8 100755 --- a/dictionaries/cs.dictionary.itop.ui.php +++ b/dictionaries/cs.dictionary.itop.ui.php @@ -1463,4 +1463,8 @@ Domény nejčastěji odpovídají skupinám řešitelů, které následně oprav 'UI_CountOfObjectsShort' => '%1$d objektů.', 'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office', 'portal:legacy_portal' => 'Uživatelský portál', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrations~~', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php index f76608db1..4a505e186 100644 --- a/dictionaries/da.dictionary.itop.ui.php +++ b/dictionaries/da.dictionary.itop.ui.php @@ -1465,4 +1465,8 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge" 'UI_CountOfObjectsShort' => '%1$d objekter.', 'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~', 'portal:legacy_portal' => 'End-User Portal~~', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrations~~', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php index 4bc82c45f..e8e87a2ee 100644 --- a/dictionaries/de.dictionary.itop.ui.php +++ b/dictionaries/de.dictionary.itop.ui.php @@ -1463,4 +1463,8 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm 'UI_CountOfObjectsShort' => '%1$d Objekte.', 'portal:backoffice' => ITOP_APPLICATION_SHORT.' Backend', 'portal:legacy_portal' => 'Endbenutzer-Portal', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrationen', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php index 8e55ed8ba..904bcc833 100644 --- a/dictionaries/en.dictionary.itop.ui.php +++ b/dictionaries/en.dictionary.itop.ui.php @@ -1713,6 +1713,8 @@ Dict::Add('EN US', 'English', 'English', array( 'Menu:Queries' => 'Queries', 'Menu:ConfigurationTools' => 'Configuration', 'Menu:ConfigEditor' => 'General configuration', - 'Menu:ConfigEditor+' => 'Configuration File editors', + 'Menu:ConfigEditor+' => 'Configuration File editor', + 'Menu:Integrations' => 'Integrations', + 'Menu:Integrations+' => '', )); diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php index e8c32e9b0..8aed2225d 100644 --- a/dictionaries/es_cr.dictionary.itop.ui.php +++ b/dictionaries/es_cr.dictionary.itop.ui.php @@ -1471,4 +1471,8 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden", 'UI_CountOfObjectsShort' => '%1$d Elemento(s)', 'portal:backoffice' => 'Portal de Soporte', 'portal:legacy_portal' => 'Portal de Clientes', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integraciones', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php index 914ff8a8d..908f20232 100755 --- a/dictionaries/hu.dictionary.itop.ui.php +++ b/dictionaries/hu.dictionary.itop.ui.php @@ -1466,4 +1466,8 @@ A művelet eseményindítóhoz rendelésekor kap egy sorszámot , amely meghatá 'UI_CountOfObjectsShort' => '%1$d objektum.', 'portal:backoffice' => ITOP_APPLICATION_SHORT.' Adminisztrációs felület', 'portal:legacy_portal' => 'Végfelhasználói Portál', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrációk', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php index 5da663a89..14556b705 100644 --- a/dictionaries/it.dictionary.itop.ui.php +++ b/dictionaries/it.dictionary.itop.ui.php @@ -1467,4 +1467,8 @@ Quando è associata a un trigger, a ogni azione è assegnato un numero "ordine", 'UI_CountOfObjectsShort' => '%1$d oggetti.', 'portal:backoffice' => 'Interfaccia utente di '.ITOP_APPLICATION_SHORT.' Back-Office', 'portal:legacy_portal' => 'Portale per gli utenti finali', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrations~~', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php index 34f2b1df3..7c1b52283 100644 --- a/dictionaries/ja.dictionary.itop.ui.php +++ b/dictionaries/ja.dictionary.itop.ui.php @@ -1465,4 +1465,8 @@ Domain usually correspond to who is responsible for checking and fixing errors~~ 'UI_CountOfObjectsShort' => '%1$d オブジェクト。', 'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~', 'portal:legacy_portal' => 'End-User Portal~~', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrations~~', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php index 36844b0d0..a6052549b 100644 --- a/dictionaries/nl.dictionary.itop.ui.php +++ b/dictionaries/nl.dictionary.itop.ui.php @@ -1468,4 +1468,8 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt 'UI_CountOfObjectsShort' => '%1$d objecten.', 'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface', 'portal:legacy_portal' => 'Portaal voor eindgebruikers', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integraties', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/pl.dictionary.itop.ui.php b/dictionaries/pl.dictionary.itop.ui.php index 37d85150c..0d450c2e3 100644 --- a/dictionaries/pl.dictionary.itop.ui.php +++ b/dictionaries/pl.dictionary.itop.ui.php @@ -1477,4 +1477,8 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą 'core/Operation:Wizard/Title' => 'Konfiguracja OAuth 2.0', 'portal:backoffice' => ITOP_APPLICATION_SHORT.' Interfejs użytkownika biurowego', 'portal:legacy_portal' => 'Portal użytkownika', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrations~~', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php index 1c852480e..781e888ce 100644 --- a/dictionaries/pt_br.dictionary.itop.ui.php +++ b/dictionaries/pt_br.dictionary.itop.ui.php @@ -1465,4 +1465,8 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif 'UI_CountOfObjectsShort' => '%1$d objeto(s)', 'portal:backoffice' => 'Interface de usuário back-office do '.ITOP_APPLICATION_SHORT, 'portal:legacy_portal' => 'Portal do usuário (legado) do '.ITOP_APPLICATION_SHORT, + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrations~~', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php index e31fb4d18..16e36fed1 100644 --- a/dictionaries/ru.dictionary.itop.ui.php +++ b/dictionaries/ru.dictionary.itop.ui.php @@ -1466,4 +1466,8 @@ Domain usually correspond to who is responsible for checking and fixing errors~~ 'UI_CountOfObjectsShort' => '%1$d объектов.', 'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office интерфейс', 'portal:legacy_portal' => 'Пользовательский портал', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrations~~', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/sk.dictionary.itop.ui.php b/dictionaries/sk.dictionary.itop.ui.php index a5b29832d..07806afd3 100644 --- a/dictionaries/sk.dictionary.itop.ui.php +++ b/dictionaries/sk.dictionary.itop.ui.php @@ -1462,4 +1462,8 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp 'UI_CountOfObjectsShort' => '%1$d objekt/y/ov.', 'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~', 'portal:legacy_portal' => 'End-User Portal~~', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrations~~', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php index 205c9f6b4..6cbe65489 100644 --- a/dictionaries/tr.dictionary.itop.ui.php +++ b/dictionaries/tr.dictionary.itop.ui.php @@ -1466,4 +1466,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe 'UI_CountOfObjectsShort' => '%1$d nesne.', 'portal:backoffice' => ITOP_APPLICATION_SHORT.'Arka Ofis Kullanıcı Arayüzü', 'portal:legacy_portal' => 'Son Kullanıcı Arayüzü', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => 'Integrations~~', + 'Menu:Integrations+' => '~~', ]); diff --git a/dictionaries/zh_cn.dictionary.itop.ui.php b/dictionaries/zh_cn.dictionary.itop.ui.php index 799fb80b9..b17611076 100644 --- a/dictionaries/zh_cn.dictionary.itop.ui.php +++ b/dictionaries/zh_cn.dictionary.itop.ui.php @@ -1465,4 +1465,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [ 'UI_CountOfObjectsShort' => '%1$d个对象.', 'portal:backoffice' => ITOP_APPLICATION_SHORT.'后台用户界面', 'portal:legacy_portal' => '终端用户门户', + 'Menu:ConfigEditor' => 'General configuration~~', + 'Menu:ConfigEditor+' => 'Configuration File editor~~', + 'Menu:Integrations' => '集成', + 'Menu:Integrations+' => '~~', ]);