From 4b670cfa9008feede8356c33bb03c657d244cb15 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 20 Oct 2022 16:46:37 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B05625=20Fix=20crash=20when=20opening=20Do?= =?UTF-8?q?cumentFile=20in=20ES=20language?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression introduced in 3.0.1 with a merge : 67fa156c The % was removed in 530ec111 but we kept the call to Dict::Format, and the merge restored the % in ES dict A larger fix will be done later with N°5491 --- application/cmdbabstract.class.inc.php | 2 +- core/cmdbchangeop.class.inc.php | 2 +- dictionaries/es_cr.dictionary.itop.ui.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 7adaaa934..c75e8017f 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -3667,7 +3667,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 = <<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 = << '%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',