aboutsummaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2013-06-23 18:39:31 +0000
committerrvelices <rv-github@modusoptimus.com>2013-06-23 18:39:31 +0000
commitb93085c7fbd1ee625354f612b3af62d2dcb90402 (patch)
tree42b33391f9ef7f36836934fb4afa44c6555b91d6 /themes
parent67d736e3fd0399399e554c53503a2b24f50e5a70 (diff)
Smarty3 added 'translate_dec' compilermodifier (generated code is a lot better than $pwg->l10n_dec)
git-svn-id: http://piwigo.org/svn/trunk@23476 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--themes/default/template/menubar_categories.tpl2
-rw-r--r--themes/default/template/menubar_tags.tpl2
-rw-r--r--themes/default/template/month_calendar.tpl4
-rw-r--r--themes/default/template/picture.tpl9
-rw-r--r--themes/default/template/tags.tpl4
5 files changed, 8 insertions, 13 deletions
diff --git a/themes/default/template/menubar_categories.tpl b/themes/default/template/menubar_categories.tpl
index 3307bdc1e..c3c5b1c02 100644
--- a/themes/default/template/menubar_categories.tpl
+++ b/themes/default/template/menubar_categories.tpl
@@ -28,5 +28,5 @@
{/foreach}
{'</li></ul>'|@str_repeat:$ref_level}
- <p class="totalImages">{$pwg->l10n_dec('%d photo', '%d photos', $block->data.NB_PICTURE)}</p>
+ <p class="totalImages">{$block->data.NB_PICTURE|@translate_dec:'%d photo':'%d photos'}</p>
</dd>
diff --git a/themes/default/template/menubar_tags.tpl b/themes/default/template/menubar_tags.tpl
index 975d7eb09..d1a672837 100644
--- a/themes/default/template/menubar_tags.tpl
+++ b/themes/default/template/menubar_tags.tpl
@@ -5,7 +5,7 @@
<span>{strip}
<a class="tagLevel{$tag.level}" href=
{if isset($tag.U_ADD)}
- "{$tag.U_ADD}" title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}" rel="nofollow">+
+ "{$tag.U_ADD}" title="{$tag.counter|@translate_dec:'%d photo is also linked to current tags':'%d photos are also linked to current tags'}" rel="nofollow">+
{else}
"{$tag.URL}" title="{'display photos linked to this tag'|@translate}">
{/if}
diff --git a/themes/default/template/month_calendar.tpl b/themes/default/template/month_calendar.tpl
index 904570a10..e2713346c 100644
--- a/themes/default/template/month_calendar.tpl
+++ b/themes/default/template/month_calendar.tpl
@@ -12,7 +12,7 @@
&nbsp;
{else}
{foreach from=$bar.items item=item}
- <span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d photo', '%d photos', $item.NB_IMAGES)}"{/if}>
+ <span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$item.NB_IMAGES|@translate_dec:'%d photo':'%d photos'}"{/if}>
{if isset($item.URL)}
<a href="{$item.URL}">{$item.LABEL}</a>
{else}
@@ -68,7 +68,7 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
<div class="calImg">
<a href="{$day.U_IMG_LINK}">
- <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d photo','%d photos', $day.NB_ELEMENTS)}">
+ <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$day.NB_ELEMENTS|@translate_dec:'%d photo':'%d photos'}">
</a>
</div>
{else}
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 5cede3071..44220bf8d 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -212,12 +212,7 @@ y.callService(
<dt>{'Rating score'|@translate}</dt>
<dd>
{if $rate_summary.count}
- {if $rate_summary.count == 1}
- {assign var='rate_text' value='%d rate'|@translate}
- {else}
- {assign var='rate_text' value='%d rates'|@translate}
- {/if}
- <span id="ratingScore">{$rate_summary.score}</span> <span id="ratingCount">({$pwg->sprintf($rate_text, $rate_summary.count)})</span>
+ <span id="ratingScore">{$rate_summary.score}</span> <span id="ratingCount">({$rate_summary.count|@translate_dec:'%d rate':'%d rates'})</span>
{else}
<span id="ratingScore">{'no rate'|@translate}</span> <span id="ratingCount"></span>
{/if}
@@ -335,7 +330,7 @@ function togglePrivacyLevelBox()
{if isset($COMMENT_COUNT)}
<div id="comments" {if (!isset($comment_add) && ($COMMENT_COUNT == 0))}class="noCommentContent"{else}class="commentContent"{/if}><div id="commentsSwitcher"></div>
- <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
+ <h3>{$COMMENT_COUNT|@translate_dec:'%d comment':'%d comments'}</h3>
<div id="pictureComments">
{if isset($comment_add)}
diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl
index c4327289a..ddba69b67 100644
--- a/themes/default/template/tags.tpl
+++ b/themes/default/template/tags.tpl
@@ -23,7 +23,7 @@
{if $display_mode == 'cloud' and isset($tags)}
<div id="fullTagCloud">
{foreach from=$tags item=tag}
- <span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}">{$tag.name}</a></span>
+ <span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$tag.counter|@translate_dec:'%d photo':'%d photos'}">{$tag.name}</a></span>
{/foreach}
</div>
{/if}
@@ -39,7 +39,7 @@
{foreach from=$letter.tags item=tag}
<tr class="tagLine">
<td><a href="{$tag.URL}" title="{$tag.name}">{$tag.name}</a></td>
- <td class="nbEntries">{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}</td>
+ <td class="nbEntries">{$tag.counter|@translate_dec:'%d photo':'%d photos'}</td>
</tr>
{/foreach}
</table>