composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source
This commit is contained in:
Pierre Goiffon
2022-10-20 16:47:38 +02:00
parent 7028b2f76c 4b670cfa90
commit 6e8949a880
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/cmdbabstract.class.inc.php
View File

@@ -3634,7 +3634,7 @@ HTML;
$sDisplayLabel = Dict::S('UI:OpenDocumentInNewWindow_');
$sDisplayUrl = $oDocument->GetDisplayURL(get_class($this), $this->GetKey(), $sAttCode);
$sDownloadLabel = Dict::Format('UI:DownloadDocument_');
$sDownloadLabel = Dict::S('UI:DownloadDocument_');
$sDownloadUrl = $oDocument->GetDownloadURL(get_class($this), $this->GetKey(), $sAttCode);
$sDisplayValue = <<<HTML

2
core/cmdbchangeop.class.inc.php
View File

@@ -472,7 +472,7 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
$sDisplayLabel = Dict::S('UI:OpenDocumentInNewWindow_');
$sDisplayUrl = $oPrevDoc->GetDisplayURL(get_class($this), $this->GetKey(), 'prevdata');
$sDownloadLabel = Dict::Format('UI:DownloadDocument_');
$sDownloadLabel = Dict::S('UI:DownloadDocument_');
$sDownloadUrl = $oPrevDoc->GetDownloadURL(get_class($this), $this->GetKey(), 'prevdata');
$sDocView = <<<HTML

4
dictionaries/es_cr.dictionary.itop.ui.php
View File

@@ -1053,8 +1053,8 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
'UI:iTopVersion:Long' => '%1$s versión %2$s-%3$s compilada en %4$s',
'UI:PropertiesTab' => 'Propiedades',
'UI:OpenDocumentInNewWindow_' => 'Abra este documento en una ventana nueva: %1$s',
'UI:DownloadDocument_' => 'Descargue este documento: %1$s',
'UI:OpenDocumentInNewWindow_' => 'Abrir~~',
'UI:DownloadDocument_' => 'Descargar~~',
'UI:Document:NoPreview' => 'No hay prevista disponible para este tipo de archivo',
'UI:Download-CSV' => 'Descargar %1$s',