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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
This commit is contained in:
Pierre Goiffon
2019-03-15 17:23:04 +01:00
parent 34751a52a8 02857a86fd
commit a6a2410c50
53 changed files with 457 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Portal:Button:Delete' => 'Smazat',
'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Stránka nenalezena',
'Error:HTTP:500' => 'Jejda! Nastal problém',

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

@@ -37,6 +37,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Portal:Button:Delete' => 'Delete~~',
'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Page not found~~',
'Error:HTTP:500' => 'Oops! An error has occured.~~',

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

@@ -37,6 +37,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Portal:Button:Delete' => 'Löschen',
'Portal:EnvironmentBanner:Title' => 'Sie sind im Moment im <strong>%1$s</strong> Modus',
'Portal:EnvironmentBanner:GoToProduction' => 'Zurück zum PRODUCTION Modus',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Authentifizierung',
'Error:HTTP:404' => 'Seite nicht gefunden.',
'Error:HTTP:500' => 'Oops! Es ist ein Fehler aufgetreten.',

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

@@ -38,6 +38,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Portal:Button:Delete' => 'Delete',
'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode',
'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode',
'Error:HTTP:400' => 'Bad request',
'Error:HTTP:401' => 'Authentication',
'Error:HTTP:404' => 'Page not found',
'Error:HTTP:500' => 'Oops! An error has occured.',

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

@@ -36,6 +36,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Portal:Button:Delete' => 'Borrar',
'Portal:EnvironmentBanner:Title' => 'Se encuentra en modo <strong>%1$s</strong>',
'Portal:EnvironmentBanner:GoToProduction' => 'Regresar a modo PRODUCTION',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Autenticación',
'Error:HTTP:404' => 'Página no encontrada',
'Error:HTTP:500' => '¡Vaya! Ha ocurrido un error.',

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

@@ -36,6 +36,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Portal:Button:Delete' => 'Supprimer',
'Portal:EnvironmentBanner:Title' => 'Vous êtes dans le mode <strong>%1$s</strong>',
'Portal:EnvironmentBanner:GoToProduction' => 'Retourner au mode PRODUCTION',
'Error:HTTP:400' => 'Requête incorrecte',
'Error:HTTP:401' => 'Authentification',
'Error:HTTP:404' => 'Page non trouvée',
'Error:HTTP:500' => 'Oups ! Une erreur est survenue.',

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

@@ -37,6 +37,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Portal:Button:Delete' => 'Delete~~',
'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Page not found~~',
'Error:HTTP:500' => 'Oops! An error has occured.~~',

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

@@ -37,6 +37,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Portal:Button:Delete' => 'Delete~~',
'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Page not found~~',
'Error:HTTP:500' => 'Oops! An error has occured.~~',

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

@@ -37,6 +37,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Portal:Button:Delete' => 'Delete~~',
'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Page not found~~',
'Error:HTTP:500' => 'Oops! An error has occured.~~',

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

@@ -37,6 +37,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Portal:Button:Delete' => 'Verwijderen',
'Portal:EnvironmentBanner:Title' => 'Je werkt momenteel in de <strong>%1$s</strong>-omgeving',
'Portal:EnvironmentBanner:GoToProduction' => 'Keer terug naar de productie-omgeving',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Aanmelden is vereist',
'Error:HTTP:404' => 'Pagina kan niet worden gevonden',
'Error:HTTP:500' => 'Oeps! Er is een fout opgetreden',

2
datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
View File

@@ -893,7 +893,7 @@ class ManageBrickController extends BrickController
$aGroupingTabsValues[$aDistinctResult['grouped_by_1']] = array(
'value' => $aDistinctResult['grouped_by_1'],
'label_html' => $sHtmlLabel,
'label' => strip_tags($sHtmlLabel),
'label' => strip_tags(html_entity_decode($sHtmlLabel, ENT_QUOTES, 'UTF-8')),
'condition' => $oConditionQuery,
'count' => $aDistinctResult['_itop_count_'],
);

2
datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
View File

@@ -1383,7 +1383,7 @@ class ObjectController extends AbstractController
break;
default:
$oApp->abort(403);
$oApp->abort(403, Dict::S('Error:HTTP:400'));
break;
}

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

@@ -123,7 +123,7 @@
</div>
</form>
{% else %}
{{ 'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator'|dict_s }}
{{ 'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}
{% endif %}
</div>
</div>

2
datamodels/2.x/itop-portal-base/portal/web/index.php
View File

@@ -93,7 +93,7 @@ $oApp->before(function(Symfony\Component\HttpFoundation\Request $oRequest, Silex
$iLogonRes = LoginWebPage::DoLoginEx(PORTAL_ID, false, $iExitMethod);
if( ($iExitMethod === LoginWebPage::EXIT_RETURN) && ($iLogonRes != 0) )
{
die(Dict::S('Portal:ErrorUserLoggedOut'));
$oApp->abort(401);
}
// - User must be associated with a Contact
if (UserRights::GetContactId() == 0)

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

@@ -36,6 +36,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Portal:Button:Delete' => 'Deletar',
'Portal:EnvironmentBanner:Title' => 'Você está atualmente em <strong>%1$s</strong>',
'Portal:EnvironmentBanner:GoToProduction' => 'Volte para o modo PRODUÇÃO',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Autenticação',
'Error:HTTP:404' => 'Está página não existe',
'Error:HTTP:500' => 'Oops! Ocorreu um erro, informe a T.I.',

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

@@ -25,6 +25,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Portal:Button:Delete' => 'Удалить',
'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Ошибка аутентификации',
'Error:HTTP:404' => 'Страница не найдена',
'Error:HTTP:500' => 'Упс! Произошла ошибка.',

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

@@ -37,6 +37,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Portal:Button:Delete' => 'Delete~~',
'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Page not found~~',
'Error:HTTP:500' => 'Oops! An error has occured.~~',

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

@@ -37,6 +37,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Portal:Button:Delete' => '删除',
'Portal:EnvironmentBanner:Title' => '您目前处于 <strong>%1$s</strong> 模式',
'Portal:EnvironmentBanner:GoToProduction' => '回到产品模式',
'Error:HTTP:400' => 'Bad request~~',
'Error:HTTP:401' => '认证',
'Error:HTTP:404' => '页面找不到',
'Error:HTTP:500' => 'Oops! 发生了一个错误.',