From 3df721dae006bb9e55a8b07774395f049895663f Mon Sep 17 00:00:00 2001 From: efalcy <efalcy@afi-sa.fr> Date: Thu, 8 Oct 2015 18:25:04 +0200 Subject: [PATCH] dev #19211 recuperation visuels cd : RT fix translation and remove unuse param --- .../admin/views/scripts/modules/recherche_viewnotice.phtml | 4 ++-- library/Class/Notice/Thumbnail/ProviderAbstract.php | 2 +- library/Class/Notice/Thumbnail/ProviderCloud.php | 4 ++-- library/Class/WebService/Vignette.php | 2 +- library/ZendAfi/View/Helper/UnimarcZoneConfig.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/modules/admin/views/scripts/modules/recherche_viewnotice.phtml b/application/modules/admin/views/scripts/modules/recherche_viewnotice.phtml index 9a14b4eab4b..9980cb32c92 100644 --- a/application/modules/admin/views/scripts/modules/recherche_viewnotice.phtml +++ b/application/modules/admin/views/scripts/modules/recherche_viewnotice.phtml @@ -65,8 +65,8 @@ $codif = Class_Codification::getInstance(); </table> </fieldset> - <?php echo $this->unimarcZoneConfig('Zones de liens',$this->preferences, 'links_zones', $this->links_errors); ?> - <?php echo $this->unimarcZoneConfig('Zones de vignette',$this->preferences, 'thumbnail_fields', $this->thumbs_errors); ?> + <?php echo $this->unimarcZoneConfig($this->_('Zones de liens'),$this->preferences, 'links_zones', $this->links_errors); ?> + <?php echo $this->unimarcZoneConfig($this->_('Zones de vignette'),$this->preferences, 'thumbnail_fields', $this->thumbs_errors); ?> <fieldset> <legend><?php echo $this->_('Dépouillements');?></legend> diff --git a/library/Class/Notice/Thumbnail/ProviderAbstract.php b/library/Class/Notice/Thumbnail/ProviderAbstract.php index 5ae07208515..33af12f8bff 100644 --- a/library/Class/Notice/Thumbnail/ProviderAbstract.php +++ b/library/Class/Notice/Thumbnail/ProviderAbstract.php @@ -64,7 +64,7 @@ abstract class Class_Notice_Thumbnail_ProviderAbstract { } - public function writeImageCache($record, $url) { + public function writeImageCache($url) { return $url; } diff --git a/library/Class/Notice/Thumbnail/ProviderCloud.php b/library/Class/Notice/Thumbnail/ProviderCloud.php index fb798bd8a92..25a66a2ee53 100644 --- a/library/Class/Notice/Thumbnail/ProviderCloud.php +++ b/library/Class/Notice/Thumbnail/ProviderCloud.php @@ -23,8 +23,8 @@ abstract class Class_Notice_Thumbnail_ProviderCloud extends Class_Notice_Thumbnail_ProviderAbstract { - public function writeImageCache($record, $url) { - $nom_fic = 'notice_' . $record->getId().".jpg"; + public function writeImageCache($url) { + $nom_fic = 'notice_' . $this->record->getId().".jpg"; $path = $this->_getPath($nom_fic); try { if ($this->_filesystem->fileExists($path)==false) { diff --git a/library/Class/WebService/Vignette.php b/library/Class/WebService/Vignette.php index a7410097e6f..c18164d0cbd 100644 --- a/library/Class/WebService/Vignette.php +++ b/library/Class/WebService/Vignette.php @@ -116,7 +116,7 @@ class Class_WebService_Vignette extends Class_WebService_Abstract { /** download and save image at given url */ public function writeImageCache($notice, $url) { - return $this->getThumbnailProviderFor($notice)->writeImageCache($notice, $url); + return $this->getThumbnailProviderFor($notice)->writeImageCache($url); } diff --git a/library/ZendAfi/View/Helper/UnimarcZoneConfig.php b/library/ZendAfi/View/Helper/UnimarcZoneConfig.php index aa803aa16bd..a5b5eb4d0f6 100644 --- a/library/ZendAfi/View/Helper/UnimarcZoneConfig.php +++ b/library/ZendAfi/View/Helper/UnimarcZoneConfig.php @@ -27,7 +27,7 @@ class ZendAfi_View_Helper_UnimarcZoneConfig extends ZendAfi_View_Helper_BaseHelp public function unimarcZoneConfig($title,$preferences,$preference_field, $errors) { if ($preference_field == 'thumbnail_fields') $this->unimarc_type='thumbnails'; - $content = $this->_tag('legend', $this->_($title)); + $content = $this->_tag('legend', $title); $content .= $this->displayErrors($errors); $content .= $this->renderMultiInput($preferences,$preference_field); return $this->_tag('fieldset', $content); -- GitLab