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 remote-tracking branch 'origin/support/2.7' into develop

Browse Source 
# Conflicts:
#	application/dashboard.class.inc.php
#	core/action.class.inc.php
#	datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
#	datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
#	datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
#	datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
#	datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
#	datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
#	datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
#	datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
#	datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
#	datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
#	datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
#	datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
#	datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
#	dictionaries/es_cr.dictionary.itop.core.php
#	dictionaries/es_cr.dictionary.itop.ui.php
#	pages/ajax.render.php
#	setup/wizardsteps.class.inc.php
#	synchro/synchro_import.php
This commit is contained in:
Pierre Goiffon
2021-11-19 10:28:46 +01:00
parent db8462ccc9 9437e689fd
commit 67fa156c0e
42 changed files with 793 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,10 @@
<?php
/**
* Copyright (C) 2013-2021 Combodo SARL
* Spanish Localized data
*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
* @traductor Miguel Turrubiates <miguel_tf@yahoo.com>
*
* This file is part of iTop.
*
@@ -33,7 +37,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:400' => 'Solicitud Incorrecta',
'Error:HTTP:401' => 'Autenticación',
'Error:HTTP:404' => 'Página no encontrada',
'Error:HTTP:500' => '¡Vaya! Ha ocurrido un error.',
@@ -59,14 +63,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Portal:Attachments:DropZone:Message' => 'Agrega tus archivos para agregarlos como documentos adjuntos',
'Portal:File:None' => 'No hay archivo',
'Portal:File:DisplayInfo' => '<a href="%2$s" class="file_download_link">%1$s</a>',
'Portal:File:DisplayInfo+' => '%1$s (%2$s) <a href="%3$s" class="file_open_link" target="_blank">Abierto</a> / <a href="%4$s" class="file_download_link">Download</a>',
'Portal:File:DisplayInfo+' => '%1$s (%2$s) <a href="%3$s" class="file_open_link" target="_blank">Abierto</a> / <a href="%4$s" class="file_download_link">Descarga</a>',
'Portal:Calendar-FirstDayOfWeek' => 'es', //work with moment.js locales
));
// Object form
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Portal:Form:Caselog:Entry:Close:Tooltip' => 'Close this entry~~',
'Portal:Form:Close:Warning' => 'Do you want to leave this form ? Data entered may be lost~~',
'Portal:Form:Close:Warning' => '¿Desea abandorar esta forma? Datos modificados se perderan',
'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting again this form.~~',
'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting again this form.~~',
));
@@ -132,12 +136,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Por favor, proporcione la siguiente información:',
'Brick:Portal:Object:Form:Message:Saved' => 'Guardado',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s guardado~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s guardado',
'Brick:Portal:Object:Search:Regular:Title' => 'Selección %1$s (%2$s)',
'Brick:Portal:Object:Search:Hierarchy:Title' => 'Selección %1$s (%2$s)',
'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s~~',
'Brick:Portal:Object:Copy:Tooltip' => 'Copy object link~~',
'Brick:Portal:Object:Copy:CopiedTooltip' => 'Copied~~'
'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s',
'Brick:Portal:Object:Copy:Tooltip' => 'Copiar liga al objeto',
'Brick:Portal:Object:Copy:CopiedTooltip' => 'Copiado'
));
// CreateBrick brick

20
datamodels/2.x/itop-portal-base/portal/src/EventListener/ExceptionListener.php
View File

@@ -58,11 +58,17 @@ class ExceptionListener implements ContainerAwareInterface
$oException = $oEvent->getException();
// Prepare / format exception data
$sErrorMessage = $oException->getMessage();
if ($oException instanceof \MySQLException) {
// Those exceptions should be caught before (in the metamodel startup, before event starting Symfony !)
// They could contain far too much info :/
// So as an extra precaution we are filtering here anyway !
$sErrorMessage = 'DB Server error, check error log !';
} else {
$sErrorMessage = $oException->getMessage();
}
// - For none HTTP exception, status code will be a generic 500
$iStatusCode = ($oException instanceof HttpExceptionInterface) ? $oException->getStatusCode() : Response::HTTP_INTERNAL_SERVER_ERROR;
switch ($iStatusCode)
{
switch ($iStatusCode) {
case 404:
$sErrorTitle = Dict::S('Error:HTTP:404');
break;
@@ -93,10 +99,10 @@ class ExceptionListener implements ContainerAwareInterface
// Prepare data for template
$aData = array(
'exception' => $oFlattenException,
'code' => $iStatusCode,
'error_title' => $sErrorTitle,
'error_message' => '',
'exception' => $oFlattenException,
'code' => $iStatusCode,
'error_title' => $sErrorTitle,
'error_message' => $sErrorMessage,
);
// Generate the response