From 03a2eece52f6b3199aae89b927da337a45f17380 Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 14 May 2012 22:28:45 +0000 Subject: bug fixed: move $lang['%d rate'] from admin.lang.php to common.inc.php to display "1 rate" on picture.php when relevant adapt picture.tpl to display "1 rate" if only 1 rate, instead of "1 rates". git-svn-id: http://piwigo.org/svn/trunk@14978 68402e56-0260-453c-a942-63ccdbb3a9ee --- language/af_ZA/admin.lang.php | 1 - language/af_ZA/common.lang.php | 1 + language/ca_ES/admin.lang.php | 1 - language/ca_ES/common.lang.php | 1 + language/en_UK/admin.lang.php | 1 - language/en_UK/common.lang.php | 1 + language/es_ES/admin.lang.php | 1 - language/es_ES/common.lang.php | 1 + language/fr_CA/admin.lang.php | 1 - language/fr_CA/common.lang.php | 1 + language/fr_FR/admin.lang.php | 1 - language/fr_FR/common.lang.php | 1 + language/hu_HU/admin.lang.php | 1 - language/hu_HU/common.lang.php | 1 + language/lv_LV/admin.lang.php | 1 - language/lv_LV/common.lang.php | 1 + language/pt_PT/admin.lang.php | 1 - language/pt_PT/common.lang.php | 1 + themes/default/template/picture.tpl | 16 ++++++++++++++-- 19 files changed, 23 insertions(+), 11 deletions(-) diff --git a/language/af_ZA/admin.lang.php b/language/af_ZA/admin.lang.php index cff7a94e1..31325e7e4 100644 --- a/language/af_ZA/admin.lang.php +++ b/language/af_ZA/admin.lang.php @@ -588,5 +588,4 @@ $lang['randomly represented'] = 'lukraak album duimnael'; $lang['remove tags'] = 'verwyder etikette'; $lang['remove this filter'] = 'verwyder hierdie filter'; $lang['remove title'] = 'verwyder titel'; -$lang['%d rate'] = '%d gradering'; ?> \ No newline at end of file diff --git a/language/af_ZA/common.lang.php b/language/af_ZA/common.lang.php index 567268368..f04dab520 100644 --- a/language/af_ZA/common.lang.php +++ b/language/af_ZA/common.lang.php @@ -403,4 +403,5 @@ $lang['View in'] = 'Bekyk in'; $lang['Visits, high → low'] = 'Besoeke, hoog → laag'; $lang['Visits, low → high'] = 'Besoeke, laag → hoog'; $lang['xsmall'] = 'XS - baie klein'; +$lang['%d rate'] = '%d gradering'; ?> \ No newline at end of file diff --git a/language/ca_ES/admin.lang.php b/language/ca_ES/admin.lang.php index 3987e1dce..dd15bd217 100644 --- a/language/ca_ES/admin.lang.php +++ b/language/ca_ES/admin.lang.php @@ -929,5 +929,4 @@ $lang['Rated %d times, score : %.2f'] = 'Valorada %d vegades. Resultat: %.2f'; $lang['Sharpen'] = 'Enfocament'; $lang['Visited %d times'] = 'Visitada %d vegades'; $lang['Watermark'] = 'Marca d\'aigua'; -$lang['%d rate'] = '%d valoracion'; ?> \ No newline at end of file diff --git a/language/ca_ES/common.lang.php b/language/ca_ES/common.lang.php index 4b5639a44..1b97a7fa1 100644 --- a/language/ca_ES/common.lang.php +++ b/language/ca_ES/common.lang.php @@ -403,4 +403,5 @@ $lang['Search by date'] = 'Cercar per data'; $lang['Search for any term'] = 'Cerca per qualsevol terme'; $lang['Visits, high → low'] = 'Visites, alt → baix'; $lang['Visits, low → high'] = 'Visites, baix → alt'; +$lang['%d rate'] = '%d valoracion'; ?> \ No newline at end of file diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 12cc0ce07..0f0f6b0dd 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -918,5 +918,4 @@ $lang['%d minutes'] = '%d minutes'; $lang['%d second'] = '%d second'; $lang['%d seconds'] = '%d seconds'; $lang['Sharpen'] = 'Sharpen'; -$lang['%d rate'] = "%d rate"; ?> \ No newline at end of file diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php index c05f9c424..4b684df09 100644 --- a/language/en_UK/common.lang.php +++ b/language/en_UK/common.lang.php @@ -403,4 +403,5 @@ $lang['Visits, low → high'] = 'Visits, low → high'; $lang['Numeric identifier, 1 → 9'] = 'Numeric identifier, 1 → 9'; $lang['Numeric identifier, 9 → 1'] = 'Numeric identifier, 9 → 1'; $lang['Manual sort order'] = 'Manual sort order'; +$lang['%d rate'] = '%d rate'; ?> \ No newline at end of file diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php index 766a0c8ee..d00271026 100644 --- a/language/es_ES/admin.lang.php +++ b/language/es_ES/admin.lang.php @@ -916,5 +916,4 @@ $lang['Rated %d times, score : %.2f'] = 'Puntuado %d veces, puntuación: %.2f'; $lang['Sharpen'] = 'Enfocar'; $lang['Visited %d times'] = 'Visto %d veces'; $lang['Watermark'] = 'Marca de agua'; -$lang['%d rate'] = '%d Nota'; ?> \ No newline at end of file diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php index 1e5d506da..32153b58c 100644 --- a/language/es_ES/common.lang.php +++ b/language/es_ES/common.lang.php @@ -404,4 +404,5 @@ $lang['Rating score, low → high'] = 'Puntuación, más baja → más alt $lang['Visits, high → low'] = 'Visitas, más → menos'; $lang['Visits, low → high'] = 'Visitas, menos → más'; $lang['xsmall'] = 'XS - muy pequeño'; +$lang['%d rate'] = '%d Nota'; ?> \ No newline at end of file diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php index 8e8e96050..76b3185dd 100644 --- a/language/fr_CA/admin.lang.php +++ b/language/fr_CA/admin.lang.php @@ -927,6 +927,5 @@ $lang['%d minutes'] = '%d minutes'; $lang['%d second'] = '%d seconde'; $lang['%d seconds'] = '%d secondes'; $lang['Sharpen'] = 'Renforcer la netteté'; -$lang['%d rate'] = '%d note'; ?> \ No newline at end of file diff --git a/language/fr_CA/common.lang.php b/language/fr_CA/common.lang.php index 1c042c44b..0d8ea5cb8 100644 --- a/language/fr_CA/common.lang.php +++ b/language/fr_CA/common.lang.php @@ -407,4 +407,5 @@ $lang['Visits, low → high'] = 'Nombre de visites, bas → haut'; $lang['Numeric identifier, 1 → 9'] = 'Identifiant, 1 → 9'; $lang['Numeric identifier, 9 → 1'] = 'Identifiant, 9 → 1'; $lang['Manual sort order'] = 'Ordre manuel'; +$lang['%d rate'] = '%d note'; ?> \ No newline at end of file diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index fd38bd597..278689b0c 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -919,5 +919,4 @@ $lang['%d minutes'] = '%d minutes'; $lang['%d second'] = '%d seconde'; $lang['%d seconds'] = '%d secondes'; $lang['Sharpen'] = 'Renforcer la netteté'; -$lang['%d rate'] = '%d note'; ?> \ No newline at end of file diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php index 5c68b5fce..f3f2753a5 100644 --- a/language/fr_FR/common.lang.php +++ b/language/fr_FR/common.lang.php @@ -403,4 +403,5 @@ $lang['Rating score, high → low'] = 'Note, haute → basse'; $lang['Rating score, low → high'] = 'Note, basse → haute'; $lang['Visits, high → low'] = 'Nombre de visites, élevé → faible'; $lang['Visits, low → high'] = 'Nombre de visites, faible → élevé'; +$lang['%d rate'] = '%d note'; ?> diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php index 315c43937..a3d82c304 100644 --- a/language/hu_HU/admin.lang.php +++ b/language/hu_HU/admin.lang.php @@ -918,5 +918,4 @@ $lang['Rated %d times, score : %.2f'] = 'Értékelve %d alkalommal, pontszám : $lang['Sharpen'] = 'Élesítés'; $lang['Visited %d times'] = 'Megtekintve %d alkalommal'; $lang['Watermark'] = 'Vízjel'; -$lang['%d rate'] = '%d értékelé'; ?> \ No newline at end of file diff --git a/language/hu_HU/common.lang.php b/language/hu_HU/common.lang.php index 751ba3eb9..04311ae38 100644 --- a/language/hu_HU/common.lang.php +++ b/language/hu_HU/common.lang.php @@ -408,4 +408,5 @@ $lang['Numeric identifier, 1 → 9'] = 'Azonosító (ID), növekvő'; $lang['Numeric identifier, 9 → 1'] = 'Azonosító (ID), csökkenő'; $lang['2small'] = 'XXS - legkissebb'; $lang['xsmall'] = 'XS - kissebb'; +$lang['%d rate'] = '%d értékelé'; ?> \ No newline at end of file diff --git a/language/lv_LV/admin.lang.php b/language/lv_LV/admin.lang.php index b2e0e608e..0bb7cc140 100644 --- a/language/lv_LV/admin.lang.php +++ b/language/lv_LV/admin.lang.php @@ -912,5 +912,4 @@ $lang['%d minutes'] = '%d minūtes'; $lang['%d second'] = '%d sekunde'; $lang['%d seconds'] = '%d sekundes'; $lang['Sharpen'] = 'Uzspicēts'; -$lang['%d rate'] = '%d vērtējum'; ?> \ No newline at end of file diff --git a/language/lv_LV/common.lang.php b/language/lv_LV/common.lang.php index 49fa7c29b..321755f94 100644 --- a/language/lv_LV/common.lang.php +++ b/language/lv_LV/common.lang.php @@ -403,5 +403,6 @@ $lang['Visits, low → high'] = 'Apmeklējums, zems → augsts'; $lang['Numeric identifier, 1 → 9'] = 'Ciparu identifikators, 1 → 9'; $lang['Numeric identifier, 9 → 1'] = 'Ciparu identifikators, 9 → 1'; $lang['Manual sort order'] = 'Lietotāja izvēlētais kārtojums'; +$lang['%d rate'] = '%d vērtējum'; ?> \ No newline at end of file diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php index 994166165..3889817c5 100644 --- a/language/pt_PT/admin.lang.php +++ b/language/pt_PT/admin.lang.php @@ -916,5 +916,4 @@ $lang['Rated %d times, score : %.2f'] = 'Avakiada %d vezes, contagem: %.2f'; $lang['Sharpen'] = 'Refinar'; $lang['Visited %d times'] = 'Visitada %d vezes'; $lang['Watermark'] = 'Marca de água'; -$lang['%d rate'] = '%d avaliaçõe'; ?> \ No newline at end of file diff --git a/language/pt_PT/common.lang.php b/language/pt_PT/common.lang.php index feff7166d..5847d2197 100644 --- a/language/pt_PT/common.lang.php +++ b/language/pt_PT/common.lang.php @@ -404,4 +404,5 @@ $lang['Rating score, low → high'] = 'Nível de avaliação, baixo → el $lang['Visits, high → low'] = 'Visitas, elevadas → parcas'; $lang['Visits, low → high'] = 'Visitas, parcas → elevadas'; $lang['xsmall'] = 'XS - extra pequeno'; +$lang['%d rate'] = '%d avaliaçõe'; ?> \ No newline at end of file diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index cddabf26e..8795d0bc1 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -217,7 +217,12 @@ y.callService(
{'Rating score'|@translate}
{if $rate_summary.count} - {$rate_summary.score} ({assign var='rate_text' value='%d rates'|@translate}{$pwg->sprintf($rate_text, $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} + {$rate_summary.score} ({$pwg->sprintf($rate_text, $rate_summary.count)}) {else} {'no rate'|@translate} {/if} @@ -251,7 +256,14 @@ y.callService( e = document.getElementById("ratingScore"); if (e) e.innerHTML = rating.score; e = document.getElementById("ratingCount"); - if (e) e.innerHTML = "({'%d rates'|@translate|@escape:'javascript'})".replace( "%d", rating.count); + if (e) {ldelim} + if (rating.count == 1) {ldelim} + e.innerHTML = "({'%d rate'|@translate|@escape:'javascript'})".replace( "%d", rating.count); + {rdelim} + else {ldelim} + e.innerHTML = "({'%d rates'|@translate|@escape:'javascript'})".replace( "%d", rating.count); + {rdelim} + {rdelim} {rdelim}{rdelim} ); {/footer_script} {/strip} -- cgit v1.2.3