aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-03-31 14:34:21 +0000
committerplegall <plg@piwigo.org>2010-03-31 14:34:21 +0000
commit9f0034807aad2b0e09f11c3579aa9458cfb142c7 (patch)
treec5d896a68b13fece6a405a9f3a41e028abdcbb9f
parent66144706f1468fdcfe0c8ad7e5d99ead7aa69fac (diff)
feature 1559: remove "standard deviation" in rating.
git-svn-id: http://piwigo.org/svn/trunk@5500 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/picture_rate.inc.php3
-rw-r--r--language/ar_SA/common.lang.php4
-rw-r--r--language/cs_CZ/common.lang.php2
-rw-r--r--language/da_DK/common.lang.php4
-rw-r--r--language/de_DE/common.lang.php4
-rw-r--r--language/en_UK/common.lang.php4
-rw-r--r--language/es_AR/common.lang.php4
-rw-r--r--language/es_ES/common.lang.php4
-rw-r--r--language/fr_FR/common.lang.php4
-rw-r--r--language/hr_HR/common.lang.php2
-rw-r--r--language/hu_HU/common.lang.php2
-rw-r--r--language/it_IT/common.lang.php4
-rw-r--r--language/ja_JP/common.lang.php4
-rw-r--r--language/nl_NL/common.lang.php4
-rw-r--r--language/pl_PL/common.lang.php2
-rw-r--r--language/pt_BR/common.lang.php2
-rw-r--r--language/pt_PT/common.lang.php2
-rw-r--r--language/ru_RU/common.lang.php2
-rw-r--r--language/sr_RS/common.lang.php4
-rw-r--r--language/vi_VN/common.lang.php4
-rw-r--r--language/zh_CN/common.lang.php2
-rw-r--r--themes/default/template/picture.tpl6
22 files changed, 36 insertions, 37 deletions
diff --git a/include/picture_rate.inc.php b/include/picture_rate.inc.php
index c6fe12e24..ccf3afe55 100644
--- a/include/picture_rate.inc.php
+++ b/include/picture_rate.inc.php
@@ -33,7 +33,6 @@ if ($conf['rate'])
$query = '
SELECT COUNT(rate) AS count
, ROUND(AVG(rate),2) AS average
- , ROUND(STD(rate),2) AS std
FROM '.RATE_TABLE.'
WHERE element_id = '.$picture['current']['id'].'
;';
@@ -41,7 +40,7 @@ SELECT COUNT(rate) AS count
}
else
{ // avg rate null -> no rate -> no need to query db
- $row = array( 'count'=>0, 'average'=>NULL, 'std'=>NULL );
+ $row = array( 'count'=>0, 'average'=>NULL );
}
$template->assign('rate_summary', $row);
diff --git a/language/ar_SA/common.lang.php b/language/ar_SA/common.lang.php
index e0c33a728..a4100621f 100644
--- a/language/ar_SA/common.lang.php
+++ b/language/ar_SA/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'rtl';
$lang_info['code'] = 'ar';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (قيمت %d مرة, standard deviation = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (قيمت %d مرة)';
$lang['%d Kb'] = '%d كيلوبايت';
$lang['%d category updated'] = '%d تصنيف محدث';
$lang['%d categories updated'] = '%d تصنيفات محدثة';
@@ -372,4 +372,4 @@ $lang['show tag cloud'] = 'عرض سحابة الكلمات';
$lang['cloud'] = 'سحابة';
$lang['Are you sure?'] = 'هل انت متأكد?';
$lang['delete this comment'] = 'حذف هذا التعليق';
-?> \ No newline at end of file
+?>
diff --git a/language/cs_CZ/common.lang.php b/language/cs_CZ/common.lang.php
index 88219f15c..8589aab42 100644
--- a/language/cs_CZ/common.lang.php
+++ b/language/cs_CZ/common.lang.php
@@ -32,7 +32,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'cz';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (hodnoceno %d krát, standardní odchylka = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (hodnoceno %d krát)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d kategorie aktualizována';
$lang['%d categories updated'] = '%d kategorie aktualizovány';
diff --git a/language/da_DK/common.lang.php b/language/da_DK/common.lang.php
index aaf39955b..fcf0069bf 100644
--- a/language/da_DK/common.lang.php
+++ b/language/da_DK/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'da';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (bedømt %d gange, standard afvigelse = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (bedømt %d gange)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d kategori opdateret';
$lang['%d categories updated'] = '%d kategorier opdateret';
@@ -387,4 +387,4 @@ $lang['This author modified following comment:'] = 'Denne forfatter har ændret
$lang['This author removed the comment with id %d'] = 'Denne forfatter har fjernet denne kommentar med id %d';
$lang['delete this comment'] = 'slet denne kommentar';
$lang['validate this comment'] = 'godkend denne kommentar';
-?> \ No newline at end of file
+?>
diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php
index 2e32a006d..6b44b5a0c 100644
--- a/language/de_DE/common.lang.php
+++ b/language/de_DE/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'de';
$lang_info['zero_plural'] = false;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (beachtet %d mal, Standardabweichung = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (beachtet %d mal)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d Kategorie wurde aktualisiert';
$lang['%d categories updated'] = '%d Kategorien wurden aktualisiert';
@@ -388,4 +388,4 @@ $lang['Manage this user comment: %s'] = 'Verwalte diesen Benutzerkommentar: %s';
$lang['This author modified following comment:'] = 'Dieser Autor veränderte folgenden Kommentar:';
$lang['This author removed the comment with id %d'] = 'Dieser Autor löschte den Kommentar mit der ID %d';
$lang['validate this comment'] = 'überprüfe diesen Kommentar';
-?> \ No newline at end of file
+?>
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 60959867a..bf2f4d9ab 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['code'] = "en";
$lang_info['zero_plural'] = "1";
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = "%.2f (rated %d times, standard deviation = %.2f)";
+$lang['%.2f (rated %d times)'] = "%.2f (rated %d times)";
$lang['%d Kb'] = "%d Kb";
$lang['%d category updated'] = "%d category updated";
$lang['%d categories updated'] = "%d categories updated";
@@ -386,4 +386,4 @@ $lang['This author modified following comment:'] = 'This author modified followi
$lang['This author removed the comment with id %d'] = 'This author removed the comment with id %d';
$lang['delete this comment'] = "delete this comment";
$lang['validate this comment'] = 'validate this comment';
-?> \ No newline at end of file
+?>
diff --git a/language/es_AR/common.lang.php b/language/es_AR/common.lang.php
index 30008e5b7..9348d5756 100644
--- a/language/es_AR/common.lang.php
+++ b/language/es_AR/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'es';
$lang_info['zero_plural'] = false;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (marcado %d veces, desviación tipo = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (marcado %d veces)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d categoría actualizada';
$lang['%d categories updated'] = '%d categorías actualizadas';
@@ -368,4 +368,4 @@ $lang['cloud'] = 'nube';
$lang['Reset to default values'] = 'Resetear a los valores por defecto';
$lang['delete all images from your favorites'] = 'borrar todas las imágenes de tus favoritos';
$lang['Sent by'] = 'Enviado por';
-?> \ No newline at end of file
+?>
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index 13917e3ac..8330ce9c3 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'es';
$lang_info['zero_plural'] = false;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (noté %d fois, écart type = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (noté %d fois)';
$lang['%d Kb'] = '%d Ko';
$lang['%d category updated'] = '%d Categoría actualizada';
$lang['%d categories updated'] = '%d Actualización categorías';
@@ -389,4 +389,4 @@ $lang['This author modified following comment:'] = 'Este autor modificó el come
$lang['This author removed the comment with id %d'] = 'Este autor suprimió el comentario sustentador al que él identificaba %d';
$lang['validate this comment'] = 'Validar este comentario';
-?> \ No newline at end of file
+?>
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index e99544ca9..1fdcffb3a 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'fr';
$lang_info['zero_plural'] = false;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (notée %d fois, écart-type = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (notée %d fois)';
$lang['%d Kb'] = '%d Ko';
$lang['%d category updated'] = '%d catégorie mise à jour';
$lang['%d categories updated'] = '%d catégories mises à jour';
@@ -388,4 +388,4 @@ $lang['This author modified following comment:'] = 'Cet auteur a modifié le com
$lang['This author removed the comment with id %d'] = 'Cet auteur a supprimé le commentaire portant l\'identifiant %d';
$lang['delete this comment'] = "supprimer ce commentaire";
$lang['validate this comment'] = 'valider ce commentaire';
-?> \ No newline at end of file
+?>
diff --git a/language/hr_HR/common.lang.php b/language/hr_HR/common.lang.php
index fed739469..c528da8bc 100644
--- a/language/hr_HR/common.lang.php
+++ b/language/hr_HR/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'hr';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (ocijenjeno %d puta, standardno odstupanje = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (ocijenjeno %d puta)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d skupina obnovljena';
$lang['%d categories updated'] = '%d skupine obnovljene';
diff --git a/language/hu_HU/common.lang.php b/language/hu_HU/common.lang.php
index b64c7524c..cef1056a7 100644
--- a/language/hu_HU/common.lang.php
+++ b/language/hu_HU/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'hu';
$lang_info['zero_plural'] = false;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (értékelve %d alkalommal, szórás = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (értékelve %d alkalommal)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d kategória frissítés';
$lang['%d categories updated'] = '%d kategória frissítve';
diff --git a/language/it_IT/common.lang.php b/language/it_IT/common.lang.php
index 508bd7ae9..ca15aa848 100644
--- a/language/it_IT/common.lang.php
+++ b/language/it_IT/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'it';
$lang_info['zero_plural'] = false;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (votata %d volte, media = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (votata %d volte)';
$lang['%d Kb'] = '%d Ko';
$lang['%d category updated'] = '%d categoria aggiornata';
$lang['%d categories updated'] = '%d categorie aggiornate';
@@ -388,4 +388,4 @@ $lang['This author modified following comment:'] = 'Questo autore a modificato i
$lang['This author removed the comment with id %d'] = 'Questo autore a cancellato il commento con l\'ID %d';
$lang['delete this comment'] = 'cancellare questo commento';
$lang['validate this comment'] = 'convalidare questo commento';
-?> \ No newline at end of file
+?>
diff --git a/language/ja_JP/common.lang.php b/language/ja_JP/common.lang.php
index d66261eed..c83e5441b 100644
--- a/language/ja_JP/common.lang.php
+++ b/language/ja_JP/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'ja';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (評価 %d 回、標準偏差 = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (評価 %d 回)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d 件のカテゴリが更新されました。';
$lang['%d categories updated'] = '%d 件のカテゴリが更新されました。';
@@ -387,4 +387,4 @@ $lang['Manage this user comment: %s'] = 'このユーザーのコメントを管
$lang['This author modified following comment:'] = 'このユーザーが次のコメントを書き直しました:';
$lang['This author removed the comment with id %d'] = 'このユーザーがコメントID %d を削除しました。';
$lang['validate this comment'] = 'このコメントを有効にする';
-?> \ No newline at end of file
+?>
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index e38e32782..4e056f110 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'nl';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (waardering %d aantal x, standaard deviation = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (waardering %d aantal x)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d categorie bijgewerkt';
$lang['%d categories updated'] = '%d categorieën bijgewerkt';
@@ -387,4 +387,4 @@ $lang['This author modified following comment:'] = 'Deze bewerker wijzigde het v
$lang['This author removed the comment with id %d'] = 'This author removed the comment with id %d';
$lang['validate this comment'] = 'Valideer dit commentaar';
-?> \ No newline at end of file
+?>
diff --git a/language/pl_PL/common.lang.php b/language/pl_PL/common.lang.php
index 867f2114a..07c498b55 100644
--- a/language/pl_PL/common.lang.php
+++ b/language/pl_PL/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['country'] = 'Polska';
$lang_info['direction'] = 'ltr';
$lang_info['code'] = 'pl';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (oceniane %d razy, standard deviation = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (oceniane %d razy)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d kategoria zaktualizowana';
$lang['%d categories updated'] = '%d zaktualizowanych kategorii';
diff --git a/language/pt_BR/common.lang.php b/language/pt_BR/common.lang.php
index f805397be..5f584e4f4 100644
--- a/language/pt_BR/common.lang.php
+++ b/language/pt_BR/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'pt';
$lang_info['zero_plural'] = false;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (avaliada %d vezes, margem de erro = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (avaliada %d vezes)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d categoria atualizada';
$lang['%d categories updated'] = '%d categorias atualizadas';
diff --git a/language/pt_PT/common.lang.php b/language/pt_PT/common.lang.php
index 101e0b1a3..8e125c1ed 100644
--- a/language/pt_PT/common.lang.php
+++ b/language/pt_PT/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'pt';
$lang_info['zero_plural'] = false;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (avaliada %d vezes, margem de erro = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (avaliada %d vezes)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d categoria atualizada';
$lang['%d categories updated'] = '%d categorias atualizadas';
diff --git a/language/ru_RU/common.lang.php b/language/ru_RU/common.lang.php
index 519c5cd23..3de1368b0 100644
--- a/language/ru_RU/common.lang.php
+++ b/language/ru_RU/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'ru';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (%d оценок, разброс = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (%d оценок)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d категория дополнена';
$lang['%d categories updated'] = 'категорий дополнено: %d';
diff --git a/language/sr_RS/common.lang.php b/language/sr_RS/common.lang.php
index 0dbcdec46..c6376ba0b 100644
--- a/language/sr_RS/common.lang.php
+++ b/language/sr_RS/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'sr';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (ocenjeno %d puta, standardno odstupanje = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (ocenjeno %d puta)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d kategorija obnovljena';
$lang['%d categories updated'] = '%d kategorije obnovljene';
@@ -387,4 +387,4 @@ $lang['This author modified following comment:'] = 'Ovaj autor je menjao tekući
$lang['This author removed the comment with id %d'] = 'Ovaj autor je uklonio komentar sa identifikacijom %d';
$lang['delete this comment'] = 'obriši ovaj komentar';
$lang['validate this comment'] = 'Overi ovaj komentar';
-?> \ No newline at end of file
+?>
diff --git a/language/vi_VN/common.lang.php b/language/vi_VN/common.lang.php
index 9e97562d0..73ba473a4 100644
--- a/language/vi_VN/common.lang.php
+++ b/language/vi_VN/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'vn';
$lang_info['zero_plural'] = true;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (rated %d times, standard deviation = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (rated %d times)';
$lang['%d Kb'] = '%d Kb';
$lang['%d category updated'] = '%d đề mục đã được cập nhật';
$lang['%d categories updated'] = '%d đề mục đã được cập nhật';
@@ -371,4 +371,4 @@ $lang['delete all images from your favorites'] = 'xoá tất cả hình từ dan
$lang['Sent by'] = 'Được gởi bởi';
$lang['Are you sure?'] = 'Bạn có chắc không?';
$lang['delete this comment'] = 'xóa bỏ lời bình này';
-?> \ No newline at end of file
+?>
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 46e774c6e..5aa18b9de 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -28,7 +28,7 @@ $lang_info['direction'] = 'ltr';
$lang_info['code'] = 'cn';
$lang_info['zero_plural'] = false;
-$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (标注 %d 次, 标准差 = %.2f)';
+$lang['%.2f (rated %d times)'] = '%.2f (标注 %d 次)';
$lang['%d Kb'] = '%d KB';
$lang['%d category updated'] = '%d 类已更新';
$lang['%d categories updated'] = '%d 等多类已更新';
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 1676d2eaa..9ac9b430b 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -186,8 +186,8 @@ y.callService(
<td class="label">{'Average rate'|@translate}</td>
<td class="value" id="ratingSummary">
{if $rate_summary.count}
- {assign var='rate_text' value='%.2f (rated %d times, standard deviation = %.2f)'|@translate }
- {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count, $rate_summary.std) }
+ {assign var='rate_text' value='%.2f (rated %d times)'|@translate }
+ {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count) }
{else}
{'no rate'|@translate}
{/if}
@@ -215,7 +215,7 @@ y.callService(
<script type="text/javascript">
makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id},
updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
- ratingSummaryText: "{'%.2f (rated %d times, standard deviation = %.2f)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary") {rdelim} );
+ ratingSummaryText: "{'%.2f (rated %d times)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary") {rdelim} );
</script>
</div>
</form>