From 98b4a0178fa77c682a7ddf424c88e43e911e99c2 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Wed, 31 May 2017 08:55:48 +0000 Subject: [PATCH] Portal: Added a "Reload page" button on the error page. SVN:trunk[4753] --- datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php | 1 + datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php | 1 + datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php | 1 + .../2.x/itop-portal-base/es_cr.dict.itop-portal-base.php | 1 + datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php | 1 + datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php | 1 + .../portal/src/views/errors/layout.html.twig | 5 +++-- datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php | 1 + 8 files changed, 10 insertions(+), 2 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php index 8b16ca7cc1..ade9426dd1 100644 --- a/datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php +++ b/datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php @@ -34,6 +34,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Page:Home' => 'Domů', 'Page:GoPortalHome' => 'Domů', 'Page:GoPreviousPage' => 'Předchozí stránka', + 'Page:ReloadPage' => 'Reload page~~', 'Portal:Button:Submit' => 'Odeslat', 'Portal:Button:Apply' => 'Update~~', 'Portal:Button:Cancel' => 'Zrušit', diff --git a/datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php index a70f37ef8d..95b355b452 100644 --- a/datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php +++ b/datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php @@ -31,6 +31,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Page:Home' => 'Start', 'Page:GoPortalHome' => 'Startseite', 'Page:GoPreviousPage' => 'vorherige Seite', + 'Page:ReloadPage' => 'Reload page~~', 'Portal:Button:Submit' => 'Abschicken', 'Portal:Button:Apply' => 'Update~~', 'Portal:Button:Cancel' => 'Zurück', diff --git a/datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php index 46157c8c1e..992c3cb8a7 100644 --- a/datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php +++ b/datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php @@ -30,6 +30,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Page:Home' => 'Home', 'Page:GoPortalHome' => 'Home page', 'Page:GoPreviousPage' => 'Previous page', + 'Page:ReloadPage' => 'Reload page', 'Portal:Button:Submit' => 'Submit', 'Portal:Button:Apply' => 'Update', 'Portal:Button:Cancel' => 'Cancel', diff --git a/datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php index 81024b3242..e67a9e196e 100644 --- a/datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php +++ b/datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php @@ -30,6 +30,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'Page:Home' => 'Bienvenido', 'Page:GoPortalHome' => 'Regresar a bienvenida', 'Page:GoPreviousPage' => 'página anterior', + 'Page:ReloadPage' => 'Reload page~~', 'Portal:Button:Submit' => 'Enviar', 'Portal:Button:Apply' => 'Update~~', 'Portal:Button:Cancel' => 'Cancelar', diff --git a/datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php index e29e615998..d672d5f20c 100644 --- a/datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php +++ b/datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php @@ -30,6 +30,7 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Page:Home' => 'Accueil', 'Page:GoPortalHome' => 'Revenir à l\'accueil', 'Page:GoPreviousPage' => 'Page précédente', + 'Page:ReloadPage' => 'Recharger la page', 'Portal:Button:Submit' => 'Valider', 'Portal:Button:Apply' => 'Mettre à jour', 'Portal:Button:Cancel' => 'Annuler', diff --git a/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php index a81e415220..3260105e7a 100644 --- a/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php +++ b/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php @@ -30,6 +30,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Page:Home' => 'Welkom', 'Page:GoPortalHome' => 'Startpagina', 'Page:GoPreviousPage' => 'Vorige pagina', + 'Page:ReloadPage' => 'Reload page~~', 'Portal:Button:Submit' => 'Verstuur', 'Portal:Button:Apply' => 'Update~~', 'Portal:Button:Cancel' => 'Afbreken', diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/errors/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/errors/layout.html.twig index a3b70537ae..20a476636b 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/errors/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/errors/layout.html.twig @@ -35,8 +35,9 @@

{{ error_message }}

{{ 'Error:HTTP:GetHelp'|dict_s }}

- {{ 'Page:GoPreviousPage'|dict_s }} - {{ 'Page:GoPortalHome'|dict_s }} + {{ 'Page:GoPreviousPage'|dict_s }} + {{ 'Page:ReloadPage'|dict_s }} + {{ 'Page:GoPortalHome'|dict_s }}

diff --git a/datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php index 7945e9a2c2..8df4bf6312 100755 --- a/datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php +++ b/datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php @@ -17,6 +17,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Page:Home' => 'Домашняя страница', 'Page:GoPortalHome' => 'Домашняя страница', 'Page:GoPreviousPage' => 'Предыдущяя страница', + 'Page:ReloadPage' => 'Reload page~~', 'Portal:Button:Submit' => 'Применить', 'Portal:Button:Apply' => 'Update~~', 'Portal:Button:Cancel' => 'Отменить',