From 6ee051baebe57d59fb525b7556043d40ae2f6bcb Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Fri, 13 Nov 2015 11:15:20 +0100
Subject: [PATCH] hotline #32189 fix rt comments
---
.../admin/views/scripts/modo/avisnotice.phtml | 12 ++++++------
library/ZendAfi/View/Helper/AvisBloc.php | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/application/modules/admin/views/scripts/modo/avisnotice.phtml b/application/modules/admin/views/scripts/modo/avisnotice.phtml
index 3c50b14afc2..0706f160451 100644
--- a/application/modules/admin/views/scripts/modo/avisnotice.phtml
+++ b/application/modules/admin/views/scripts/modo/avisnotice.phtml
@@ -1,33 +1,33 @@
<?php
if ($this->display_all)
echo $this->tag('h1', $this->_('Tous les avis de notices modérés')) .
- $this->tagAnchor(['action' => 'avisnotice'], 'Afficher les avis non modérés');
+ $this->tagAnchor(['action' => 'avisnotice'], $this->_('Afficher les avis non modérés'));
if (!$this->display_all)
echo $this->tag('h1', $this->_('Modération des avis sur les notices')) .
- $this->tagAnchor(['action' => 'allreviews'],"Afficher tous les avis modérés");
+ $this->tagAnchor(['action' => 'allreviews'], $this->_('Afficher tous les avis modérés'));
echo $this->tag('div',
- $this->avisBloc('Avis de bibliothécaires ('.$this->nb_bib.')',
+ $this->avisBloc($this->_('Avis de bibliothécaires (%s)', $this->nb_bib),
$this->list_avis_bibliothecaires,
$this->page,
$this->nb_bib,
0) .
- $this->avisBloc('Avis d\'abonnés ('. $this->nb_abo.')',
+ $this->avisBloc($this->_('Avis d\'abonnés (%s)', $this->nb_abo),
$this->list_avis_utilisateurs,
$this->page,
$this->nb_abo,
1) .
- $this->avisBloc('Avis orphelins ('.$this->nb_orphans.')',
+ $this->avisBloc($this->_('Avis orphelins (%s)', $this->nb_orphans),
$this->list_orphan_reviews,
$this->page,
$this->nb_orphans,
2) .
- $this->avisBloc('Avis archivés ('.$this->nb_archived.')',
+ $this->avisBloc($this->_('Avis archivés (%s)', $this->nb_archived),
$this->list_archived_reviews,
$this->page,
$this->nb_archived,
diff --git a/library/ZendAfi/View/Helper/AvisBloc.php b/library/ZendAfi/View/Helper/AvisBloc.php
index 91dd9ccb86b..977caee4ed0 100644
--- a/library/ZendAfi/View/Helper/AvisBloc.php
+++ b/library/ZendAfi/View/Helper/AvisBloc.php
@@ -24,7 +24,7 @@ class ZendAfi_View_Helper_AvisBloc extends Zend_View_Helper_HtmlElement {
public function avisBloc($label, $list, $page = 0, $nb_items = 0, $index = 0) {
- $this->_label = $this->view->_($label);
+ $this->_label = $label;
$this->_list = $list;
$this->_page = $page;
$this->_nb_items = $nb_items;
@@ -43,8 +43,8 @@ class ZendAfi_View_Helper_AvisBloc extends Zend_View_Helper_HtmlElement {
protected function renderBlock() {
if(!count($this->_list))
return $this->view->tag('p',
- $this->view->_('Aucun avis ' . ($this->_label ? $this->_label . ' ' : '') . 'à modérer.'),
- ['class' => 'error']);
+ $this->view->_('Aucun avis %s à modérer.', ($this->_label ? $this->_label . ' ' : '')),
+ ['class' => 'error']);
return $this->injectPager($this->view->partialCycle('modo/_avis_partial.phtml',
'avis',
--
GitLab