composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 00:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1047.1 Internal: Modified some calls to the ITOP_XXX constants.

Browse Source 
SVN:trunk[4915]
This commit is contained in:
Guillaume Lajarige
2017-09-15 15:46:03 +00:00
parent 8ff2151448
commit 4290d94841
21 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php
View File

@@ -29,7 +29,7 @@
// Portal
Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Page:DefaultTitle' => 'Uživatelský portál iTop',
'Page:DefaultTitle' => 'Uživatelský portál %1$s',
'Page:PleaseWait' => 'Počkejte prosím',
'Page:Home' => 'Domů',
'Page:GoPortalHome' => 'Domů',

10
datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php
View File

@@ -26,7 +26,7 @@
// Portal
Dict::Add('DE DE', 'German', 'Deutsch', array(
'Page:DefaultTitle' => 'iTop - Benutzer Portal',
'Page:DefaultTitle' => '%1$s - Benutzer Portal',
'Page:PleaseWait' => 'Bitte warten...',
'Page:Home' => 'Start',
'Page:GoPortalHome' => 'Startseite',
@@ -44,8 +44,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Seite nicht gefunden.',
'Error:HTTP:500' => 'Oops! Es ist ein Fehler aufgetreten.',
'Error:HTTP:GetHelp' => 'Bitte kontaktieren Sie Ihren iTop administrator falls das Problem öfter auftaucht.',
'Error:XHR:Fail' => 'Konnte Daten nicht laden, bitte kontaktieren Sie Ihren iTop administrator',
'Error:HTTP:GetHelp' => 'Bitte kontaktieren Sie Ihren %1$s administrator falls das Problem öfter auftaucht.',
'Error:XHR:Fail' => 'Konnte Daten nicht laden, bitte kontaktieren Sie Ihren %1$s administrator',
'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.~~',
'Portal:Datatables:Language:Processing' => 'Bitte warten...',
'Portal:Datatables:Language:Search' => 'Filter :',
@@ -76,8 +76,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Brick:Portal:UserProfile:Password:Title' => 'Passwort',
'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Passwort wählen',
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Passwort bestätigen',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Um das Password zu ändern, kontaktieren Sie bitte Ihren iTop Administrator',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Kann das Passwort nicht ändern - bitte kontaktieren Sie Ihren iTop Administrator',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Um das Password zu ändern, kontaktieren Sie bitte Ihren %1$s Administrator',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Kann das Passwort nicht ändern - bitte kontaktieren Sie Ihren %1$s Administrator',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Persönliche Informationen',
'Brick:Portal:UserProfile:Photo:Title' => 'Foto',
));

10
datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php
View File

@@ -25,7 +25,7 @@
// Portal
Dict::Add('EN US', 'English', 'English', array(
'Page:DefaultTitle' => 'iTop User portal',
'Page:DefaultTitle' => '%1$s User portal',
'Page:PleaseWait' => 'Please wait...',
'Page:Home' => 'Home',
'Page:GoPortalHome' => 'Home page',
@@ -43,8 +43,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Error:HTTP:401' => 'Authentication',
'Error:HTTP:404' => 'Page not found',
'Error:HTTP:500' => 'Oops! An error has occured.',
'Error:HTTP:GetHelp' => 'Please contact your iTop administrator if the problem keeps happening.',
'Error:XHR:Fail' => 'Could not load data, please contact your iTop administrator',
'Error:HTTP:GetHelp' => 'Please contact your %1$s administrator if the problem keeps happening.',
'Error:XHR:Fail' => 'Could not load data, please contact your %1$s administrator',
'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.',
'Portal:Datatables:Language:Processing' => 'Please wait...',
'Portal:Datatables:Language:Search' => 'Filter:',
@@ -76,8 +76,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Brick:Portal:UserProfile:Password:Title' => 'Password',
'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Choose password',
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your iTop administrator',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your iTop administrator',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo',
));

10
datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php
View File

@@ -25,7 +25,7 @@
// Portal
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'Page:DefaultTitle' => 'iTop User portal',
'Page:DefaultTitle' => '%1$s User portal',
'Page:PleaseWait' => 'Please wait...',
'Page:Home' => 'Bienvenido',
'Page:GoPortalHome' => 'Regresar a bienvenida',
@@ -43,8 +43,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Página no encontrada',
'Error:HTTP:500' => '¡Vaya! Ha ocurrido un error.',
'Error:HTTP:GetHelp' => 'Póngase en contacto con el administrador de iTop si el problema persiste.',
'Error:XHR:Fail' => 'No se pudieron cargar datos, póngase en contacto con su administrador de iTop',
'Error:HTTP:GetHelp' => 'Póngase en contacto con el administrador de %1$s si el problema persiste.',
'Error:XHR:Fail' => 'No se pudieron cargar datos, póngase en contacto con su administrador de %1$s',
'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.~~',
'Portal:Datatables:Language:Processing' => 'Por favor esperar...',
'Portal:Datatables:Language:Search' => 'Filtrar:',
@@ -76,8 +76,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'Brick:Portal:UserProfile:Password:Title' => 'Contraseña',
'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Elegir una contraseña',
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirmar contraseña',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Para cambiar su contraseña, póngase en contacto con su administrador de iTop',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'No se puede cambiar la contraseña, póngase en contacto con el administrador de iTop',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Para cambiar su contraseña, póngase en contacto con su administrador de %1$s',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'No se puede cambiar la contraseña, póngase en contacto con el administrador de %1$s',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Informaciones personales',
'Brick:Portal:UserProfile:Photo:Title' => 'Foto',
));

10
datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php
View File

@@ -25,7 +25,7 @@
// Portal
Dict::Add('FR FR', 'French', 'Français', array(
'Page:DefaultTitle' => 'Portail utilisateur iTop',
'Page:DefaultTitle' => 'Portail utilisateur %1$s',
'Page:PleaseWait' => 'Veuillez patienter...',
'Page:Home' => 'Accueil',
'Page:GoPortalHome' => 'Revenir à l\'accueil',
@@ -43,8 +43,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Error:HTTP:401' => 'Authentification',
'Error:HTTP:404' => 'Page non trouvée',
'Error:HTTP:500' => 'Oups ! Une erreur est survenue.',
'Error:HTTP:GetHelp' => 'Si le problème persiste, veuillez contacter votre administrateur iTop.',
'Error:XHR:Fail' => 'Impossible de charger les données, veuillez contacter votre administrateur iTop si le problème persiste.',
'Error:HTTP:GetHelp' => 'Si le problème persiste, veuillez contacter votre administrateur %1$s.',
'Error:XHR:Fail' => 'Impossible de charger les données, veuillez contacter votre administrateur %1$s si le problème persiste.',
'Portal:ErrorUserLoggedOut' => 'Vous êtes déconnecté et devez vous reconnecter pour continuer.',
'Portal:Datatables:Language:Processing' => 'Veuillez patienter...',
'Portal:Datatables:Language:Search' => 'Filtrer :',
@@ -76,8 +76,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Brick:Portal:UserProfile:Password:Title' => 'Mot de passe',
'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Choisissez un mot de passe',
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirmer le mot de passe',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Veuillez vous adresser à votre administrateur iTop pour changer votre mot de passe',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Impossible de modifier votre mot de passe, veuillez contacter votre administrateur iTop',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Veuillez vous adresser à votre administrateur %1$s pour changer votre mot de passe',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Impossible de modifier votre mot de passe, veuillez contacter votre administrateur %1$s',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Informations personnelles',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo',
));

2
datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php
View File

@@ -25,7 +25,7 @@
// Portal
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Page:DefaultTitle' => 'iTop Gebruikersportaal',
'Page:DefaultTitle' => '%1$s Gebruikersportaal',
'Page:PleaseWait' => 'Even geduld...',
'Page:Home' => 'Welkom',
'Page:GoPortalHome' => 'Startpagina',

4
datamodels/2.x/itop-portal-base/portal/src/forms/passwordformmanager.class.inc.php
View File

@@ -113,7 +113,7 @@ class PasswordFormManager extends FormManager
if (!UserRights::CanChangePassword())
{
$aData['valid'] = false;
$aData['messages']['error'] += array('_main' => array(Dict::S('Brick:Portal:UserProfile:Password:CantChangeContactAdministrator')));
$aData['messages']['error'] += array('_main' => array(Dict::Format('Brick:Portal:UserProfile:Password:CantChangeContactAdministrator', ITOP_APPLICATION_SHORT)));
}
else if (!UserRights::CheckCredentials($sAuthUser, $sOldPassword))
{
@@ -128,7 +128,7 @@ class PasswordFormManager extends FormManager
else if (!UserRights::ChangePassword($sOldPassword, $sNewPassword))
{
$aData['valid'] = false;
$aData['messages']['error'] += array('confirm_password' => array(Dict::S('Brick:Portal:UserProfile:Password:CantChangeForUnknownReason')));
$aData['messages']['error'] += array('confirm_password' => array(Dict::Format('Brick:Portal:UserProfile:Password:CantChangeForUnknownReason', ITOP_APPLICATION_SHORT)));
}
else
{

2
datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig
View File

@@ -127,7 +127,7 @@
registerToggleListeners();
})
.fail(function() {
alert('{{ 'Error:XHR:Fail'|dict_s }}');
alert('{{ 'Error:XHR:Fail'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}');
})
.always(function(){
hideMosaicLoader();

2
datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig
View File

@@ -170,7 +170,7 @@
registerToggleListeners();
})
.fail(function() {
alert('{{ 'Error:XHR:Fail'|dict_s }}');
alert('{{ 'Error:XHR:Fail'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}');
});
};
// Build tree nodes from data under the nodeId

2
datamodels/2.x/itop-portal-base/portal/src/views/bricks/layout.html.twig
View File

@@ -5,7 +5,7 @@
{% block pPageTitle %}
{# Overloading the default template's title to show the brick's title #}
{% if oBrick is defined and oBrick is not null and oBrick.GetTitle() != '' %}
{{ oBrick.GetTitle()|dict_s }} - iTop
{{ oBrick.GetTitle()|dict_s }} - {{ constant('ITOP_APPLICATION_SHORT') }}
{% else %}
{{ parent() }}
{% endif %}

2
datamodels/2.x/itop-portal-base/portal/src/views/errors/layout.html.twig
View File

@@ -40,7 +40,7 @@
<div class="well">
<h1><div class="ion ion-alert-circled"></div> {{ error_title }}</h1>
<p>{{ error_message }}</p>
<p>{{ 'Error:HTTP:GetHelp'|dict_s }}</p>
<p>{{ 'Error:HTTP:GetHelp'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}</p>
<p>
<a class="btn btn-default" href="#" onclick="history.back(); return false;"><span class="fa fa-arrow-left"></span> {{ 'Page:GoPreviousPage'|dict_s }}</a>
<a class="btn btn-default" href=""><span class="fa fa-repeat"></span> {{ 'Page:ReloadPage'|dict_s }}</a>

4
datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig
View File

@@ -22,7 +22,7 @@
{# This block can be used to add your own meta tags by extending the default template #}
{% block pPageExtraMetas %}
{% endblock %}
<title>{% block pPageTitle %}{% if sPageTitle is defined and sPageTitle is not null %}{{ sPageTitle }} - {{ constant('ITOP_APPLICATION') }}{% else %}{{ 'Page:DefaultTitle'|dict_s }}{% endif %}{% endblock %}</title>
<title>{% block pPageTitle %}{% if sPageTitle is defined and sPageTitle is not null %}{{ sPageTitle }} - {{ constant('ITOP_APPLICATION_SHORT') }}{% else %}{{ 'Page:DefaultTitle'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}{% endif %}{% endblock %}</title>
<link rel="shortcut icon" href="{{ app['combodo.absolute_url'] ~ 'images/favicon.ico'|add_itop_version }}" />
{% block pPageStylesheets %}
@@ -403,7 +403,7 @@
}
if(sBody === undefined)
{
sBody = '{{ 'Error:XHR:Fail'|dict_s|escape('js') }}';
sBody = '{{ 'Error:XHR:Fail'|dict_format(constant('ITOP_APPLICATION_SHORT'))|escape('js') }}';
}
var oModalElem = $('#modal-for-alert');
oModalElem.find('.modal-content .modal-header .modal-title').html(sTitle);

10
datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php
View File

@@ -12,7 +12,7 @@
// Portal
Dict::Add('RU RU', 'Russian', 'Русский', array(
'Page:DefaultTitle' => 'Пользовательский портал iTop',
'Page:DefaultTitle' => 'Пользовательский портал %1$s',
'Page:PleaseWait' => 'Пожалуйста, подождите...',
'Page:Home' => 'Домашняя страница',
'Page:GoPortalHome' => 'Домашняя страница',
@@ -28,8 +28,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Страница не найдена',
'Error:HTTP:500' => 'Упс! Произошла ошибка.',
'Error:XHR:Fail' => 'Не удалось загрузить данные. Пожалуйста, свяжитесь с вашим администратором iTop.',
'Error:HTTP:GetHelp' => 'Пожалуйста, свяжитесь с вашим администратором iTop, если проблема сохраняется.',
'Error:XHR:Fail' => 'Не удалось загрузить данные. Пожалуйста, свяжитесь с вашим администратором %1$s.',
'Error:HTTP:GetHelp' => 'Пожалуйста, свяжитесь с вашим администратором %1$s, если проблема сохраняется.',
'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.~~',
'Portal:Datatables:Language:Processing' => 'Пожалуйста, подождите...',
'Portal:Datatables:Language:Search' => 'Фильтр :',
@@ -58,8 +58,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Brick:Portal:UserProfile:Password:Title' => 'Пароль',
'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Введите новый пароль',
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Подтвердите новый пароль',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Пожалуйста, свяжитесь с вашим администратором iTop для изменения пароля.',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Не удалось изменить пароль, пожалуйста, свяжитесь с вашим администратором iTop.',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Пожалуйста, свяжитесь с вашим администратором %1$s для изменения пароля.',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Не удалось изменить пароль, пожалуйста, свяжитесь с вашим администратором %1$s.',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Персональная информация',
'Brick:Portal:UserProfile:Photo:Title' => 'Фотография',
));