From 560bb699426afaceead5670f91dad6056406e1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= Date: Sat, 20 Apr 2013 15:41:32 +0200 Subject: [PATCH] Modify some locale handling to better handle plurals. Based on a patch by Tobias. re #37 --- author.php | 2 +- book.php | 2 +- customcolumn.php | 2 +- lang/Localization_ca.json | 16 ++++++++-------- lang/Localization_de.json | 16 ++++++++-------- lang/Localization_en.json | 16 ++++++++-------- lang/Localization_es.json | 16 ++++++++-------- lang/Localization_fr.json | 16 ++++++++-------- lang/Localization_it.json | 16 ++++++++-------- lang/Localization_nl.json | 16 ++++++++-------- lang/Localization_ru.json | 16 ++++++++-------- serie.php | 2 +- tag.php | 2 +- 13 files changed, 69 insertions(+), 69 deletions(-) diff --git a/author.php b/author.php index d41bb84..9b9bcee 100644 --- a/author.php +++ b/author.php @@ -39,7 +39,7 @@ class Author extends Base { public static function getCount() { $nAuthors = parent::getDb ()->query('select count(*) from authors')->fetchColumn(); $entry = new Entry (localize("authors.title"), self::ALL_AUTHORS_ID, - str_format (localize("authors.alphabetical"), $nAuthors), "text", + str_format (localize("authors.alphabetical", $nAuthors), $nAuthors), "text", array ( new LinkNavigation ("?page=".parent::PAGE_ALL_AUTHORS))); return $entry; } diff --git a/book.php b/book.php index 275abdd..8b10b68 100644 --- a/book.php +++ b/book.php @@ -369,7 +369,7 @@ class Book extends Base { $result = array(); $entry = new Entry (localize ("allbooks.title"), self::ALL_BOOKS_ID, - str_format (localize ("allbooks.alphabetical"), $nBooks), "text", + str_format (localize ("allbooks.alphabetical", $nBooks), $nBooks), "text", array ( new LinkNavigation ("?page=".parent::PAGE_ALL_BOOKS))); array_push ($result, $entry); $entry = new Entry (localize ("recent.title"), diff --git a/customcolumn.php b/customcolumn.php index f4f207d..72a5501 100644 --- a/customcolumn.php +++ b/customcolumn.php @@ -68,7 +68,7 @@ class CustomColumn extends Base { public static function getCount($customId) { $nCustoms = parent::getDb ()->query('select count(*) from ' . self::getTableName ($customId))->fetchColumn(); $entry = new Entry (self::getAllTitle ($customId), self::getAllCustomsId ($customId), - str_format (localize("tags.alphabetical"), $nCustoms), "text", + str_format (localize("tags.alphabetical", $nCustoms), $nCustoms), "text", array ( new LinkNavigation (self::getUriAllCustoms ($customId)))); return $entry; } diff --git a/lang/Localization_ca.json b/lang/Localization_ca.json index 76f63fb..7efca88 100644 --- a/lang/Localization_ca.json +++ b/lang/Localization_ca.json @@ -50,17 +50,17 @@ "tags.title":"Etiquetes", "tags.categorized":"Llistat per categories de les {0} etiquetes", "tags.categorized.single":"Llistat per categories de la única etiqueta - molt útil ;)", -"tags.alphabetical":"{0} etiquetes ordenades alfabèticament", -"tags.alphabetical.single":"Llistat alfabètic de la única etiqueta ;)", +"tags.alphabetical.many":"{0} etiquetes ordenades alfabèticament", +"tags.alphabetical.one":"Llistat alfabètic de la única etiqueta ;)", "splitByLetter.tag.other":"Altres etiquetes", "authors.series.title":"Sèries", "authors.title":"Autors", -"authors.alphabetical":"{0} autors ordenats alfabèticament", -"authors.alphabetical.single":"Índex s'un sol autor", +"authors.alphabetical.many":"{0} autors ordenats alfabèticament", +"authors.alphabetical.one":"Índex s'un sol autor", "splitByLetter.author.other":"Altres autors", "series.title":"Sèries", -"series.alphabetical":"{0} sèries ordenades alfabèticament", -"series.alphabetical.single":"Índex alfabètic d'una sola sèrie", +"series.alphabetical.many":"{0} sèries ordenades alfabèticament", +"series.alphabetical.one":"Índex alfabètic d'una sola sèrie", "splitByLetter.series.other":"Altres sèries", "recent.title":"Els més recents", "recent.list":"{0} darrers títols incorporats", @@ -68,8 +68,8 @@ "rating.title":"Valoració", "rating.summary":"{0}, agrupats per valoració", "allbooks.title":"Tots els llibres", -"allbooks.alphabetical":"{0} llibres ordenats alfabèticament", -"allbooks.alphabetical.single":"Índex d'un sol llibre", +"allbooks.alphabetical.many":"{0} llibres ordenats alfabèticament", +"allbooks.alphabetical.one":"Índex d'un sol llibre", "splitByLetter.book.other":"Altres llibres", "main.title":"Biblioteca generada per Calibre", "main.summary":"{0} ha catalogat {1}", diff --git a/lang/Localization_de.json b/lang/Localization_de.json index 25d7ac9..18235d0 100644 --- a/lang/Localization_de.json +++ b/lang/Localization_de.json @@ -54,17 +54,17 @@ "tags.title":"Schlagwörter", "tags.categorized":"Index der {0} Schlagwörter nach Kategorien", "tags.categorized.single":"Index des Schlagworts nach Kategorien - sehr nützlich ;)", -"tags.alphabetical":"Alphabetischer Index der {0} Schlagwörter", -"tags.alphabetical.single":"Alphabetischer Index des Schlagworts ;)", +"tags.alphabetical.many":"Alphabetischer Index der {0} Schlagwörter", +"tags.alphabetical.one":"Alphabetischer Index des Schlagworts ;)", "splitByLetter.tag.other":"Andere Schlagwörter", "authors.series.title":"Serien: {0}", "authors.title":"Autoren", -"authors.alphabetical":"Alphabetischer Index der {0} Autoren", -"authors.alphabetical.single":"Alphabetischer Index des Autors - unglaublich nützlich ;)", +"authors.alphabetical.many":"Alphabetischer Index der {0} Autoren", +"authors.alphabetical.one":"Alphabetischer Index des Autors - unglaublich nützlich ;)", "splitByLetter.author.other":"Andere Autoren", "series.title":"Serien", -"series.alphabetical":"Alphabetischer Index der {0} Serien", -"series.alphabetical.single":"Alphabetischer Index der Serie - äußerst nützlich ;)", +"series.alphabetical.many":"Alphabetischer Index der {0} Serien", +"series.alphabetical.one":"Alphabetischer Index der Serie - äußerst nützlich ;)", "splitByLetter.series.other":"Andere Serien", "recent.title":"Neuzugänge", "recent.list":"{0} neue Bücher", @@ -72,8 +72,8 @@ "rating.title":"Bewertung", "rating.summary":"{0}, gruppiert nach Bewertung", "allbooks.title":"Alle Bücher", -"allbooks.alphabetical":"Alphabetischer Index der {0} Bücher", -"allbooks.alphabetical.single":"Alphabetischer Index des einzigen Buchs - unverzichtbar ;)", +"allbooks.alphabetical.many":"Alphabetischer Index der {0} Bücher", +"allbooks.alphabetical.one":"Alphabetischer Index des einzigen Buchs - unverzichtbar ;)", "splitByLetter.book.other":"Andere Bücher", "main.title":"Calibre Bibliothek", "main.summary":"{0} hat {1} katalogisierte Bücher", diff --git a/lang/Localization_en.json b/lang/Localization_en.json index b62517e..df358f3 100644 --- a/lang/Localization_en.json +++ b/lang/Localization_en.json @@ -57,17 +57,17 @@ "tags.title":"Tags", "tags.categorized":"Categorized index of the {0} tags", "tags.categorized.single":"Categorized index of the single tag - very useful indeed ;)", -"tags.alphabetical":"Alphabetical index of the {0} tags", -"tags.alphabetical.single":"Alphabetical index of the single tag ;)", +"tags.alphabetical.many":"Alphabetical index of the {0} tags", +"tags.alphabetical.one":"Alphabetical index of the single tag ;)", "splitByLetter.tag.other":"Other tags", "authors.series.title":"Series: {0}", "authors.title":"Authors", -"authors.alphabetical":"Alphabetical index of the {0} authors", -"authors.alphabetical.single":"Alphabetical index of the single author - very useful indeed ;)", +"authors.alphabetical.many":"Alphabetical index of the {0} authors", +"authors.alphabetical.one":"Alphabetical index of the single author - very useful indeed ;)", "splitByLetter.author.other":"Other authors", "series.title":"Series", -"series.alphabetical":"Alphabetical index of the {0} series", -"series.alphabetical.single":"Alphabetical index of the single series - very useful indeed ;)", +"series.alphabetical.many":"Alphabetical index of the {0} series", +"series.alphabetical.one":"Alphabetical index of the single series - very useful indeed ;)", "splitByLetter.series.other":"Other series", "recent.title":"Recent additions", "recent.list":"{0} most recent books", @@ -75,8 +75,8 @@ "rating.title":"Rating", "rating.summary":"{0}, grouped by rating", "allbooks.title":"All books", -"allbooks.alphabetical":"Alphabetical index of the {0} books", -"allbooks.alphabetical.single":"Alphabetical index of the single book - very useful indeed ;)", +"allbooks.alphabetical.many":"Alphabetical index of the {0} books", +"allbooks.alphabetical.one":"Alphabetical index of the single book - very useful indeed ;)", "splitByLetter.book.other":"Other books", "main.title":"Calibre library", "main.summary":"{0} has catalogued {1}", diff --git a/lang/Localization_es.json b/lang/Localization_es.json index 92045b7..6c37a36 100644 --- a/lang/Localization_es.json +++ b/lang/Localization_es.json @@ -50,17 +50,17 @@ "tags.title":"etiquetas", "tags.categorized":"Listado por categorias de las {0} etiquetas", "tags.categorized.single":"Listado por categorias de la unica etiqueta - muy util ;)", -"tags.alphabetical":"Listado alfabético de las {0} etiquetas", -"tags.alphabetical.single":"Listado Alfabético de la unica etiqueta ;)", +"tags.alphabetical.many":"Listado alfabético de las {0} etiquetas", +"tags.alphabetical.one":"Listado Alfabético de la unica etiqueta ;)", "splitByLetter.tag.other":"Otras etiquetas", "authors.series.title":"Series", "authors.title":"Autores", -"authors.alphabetical":"Indice alfabético de {0}", -"authors.alphabetical.single":"Indice de un solo autor", +"authors.alphabetical.many":"Indice alfabético de {0}", +"authors.alphabetical.one":"Indice de un solo autor", "splitByLetter.author.other":"Otros Autores", "series.title":"Series:", -"series.alphabetical":"Indice alfabético de {0}", -"series.alphabetical.single":"Indice de una sola serie", +"series.alphabetical.many":"Indice alfabético de {0}", +"series.alphabetical.one":"Indice de una sola serie", "splitByLetter.series.other":"Otras series", "recent.title":"Añadidos recientemente", "recent.list":"{0} libros más recientes", @@ -68,8 +68,8 @@ "rating.title":"Valoración", "rating.summary":"{0}, agrupados por valoración", "allbooks.title":"Todos los libros", -"allbooks.alphabetical":"Indice alfabético de {0} libros", -"allbooks.alphabetical.single":"Indice de un solo ", +"allbooks.alphabetical.many":"Indice alfabético de {0} libros", +"allbooks.alphabetical.one":"Indice de un solo ", "splitByLetter.book.other":"Otros libros", "main.title":"Biblioteca generada de calibre", "main.summary":"{0} ha catalogado {1}", diff --git a/lang/Localization_fr.json b/lang/Localization_fr.json index c88f7d3..543c9e6 100644 --- a/lang/Localization_fr.json +++ b/lang/Localization_fr.json @@ -55,17 +55,17 @@ "tags.title":"Étiquettes", "tags.categorized":"Index ordonné des {0} étiquettes", "tags.categorized.single":"Index ordonné de la seule étiquette disponible", -"tags.alphabetical":"Index alphabétique des {0} étiquettes", -"tags.alphabetical.single":"Index alphabétique de la seule étiquette ;)", +"tags.alphabetical.many":"Index alphabétique des {0} étiquettes", +"tags.alphabetical.one":"Index alphabétique de la seule étiquette ;)", "splitByLetter.tag.other":"Autres étiquettes", "authors.series.title":"Collection: {0}", "authors.title":"Auteurs", -"authors.alphabetical":"Index alphabétique des {0} auteurs", -"authors.alphabetical.single":"Index alphabétique du seul auteur ;)", +"authors.alphabetical.many":"Index alphabétique des {0} auteurs", +"authors.alphabetical.one":"Index alphabétique du seul auteur ;)", "splitByLetter.author.other":"Autres auteurs", "series.title":"Collections", -"series.alphabetical":"Index alphabétique de {0} collections", -"series.alphabetical.single":"Index alphabétique de la seule collection ;)", +"series.alphabetical.many":"Index alphabétique de {0} collections", +"series.alphabetical.one":"Index alphabétique de la seule collection ;)", "splitByLetter.series.other":"Autres collections", "recent.title":"Ajouts récents", "recent.list":"{0} livres les plus récents", @@ -73,8 +73,8 @@ "rating.title":"Appréciations", "rating.summary":"{0}, par appréciation", "allbooks.title":"Tous les livres", -"allbooks.alphabetical":"Index alphabétique des {0} livres", -"allbooks.alphabetical.single":"Index alphabétique du seul livre ;)", +"allbooks.alphabetical.many":"Index alphabétique des {0} livres", +"allbooks.alphabetical.one":"Index alphabétique du seul livre ;)", "splitByLetter.book.other":"Autres livres", "main.title":"Bibliothèque gérée par Calibre", "main.summary":"{0} a catalogué {1}", diff --git a/lang/Localization_it.json b/lang/Localization_it.json index 414687f..5e8c1f1 100644 --- a/lang/Localization_it.json +++ b/lang/Localization_it.json @@ -51,17 +51,17 @@ "tags.title":"Argomenti", "tags.categorized":"Indice ordinato di {0} argomenti", "tags.categorized.single":"Indice ordinato del solo argomento disponibile", -"tags.alphabetical":"Indice alfabetico di {0} argomenti", -"tags.alphabetical.single":"Indice alfabetico del solo argomento ;)", +"tags.alphabetical.many":"Indice alfabetico di {0} argomenti", +"tags.alphabetical.one":"Indice alfabetico del solo argomento ;)", "splitByLetter.tag.other":"Altri argomenti", "authors.series.title":"Collane: {0}", "authors.title":"Autori", -"authors.alphabetical":"Indice alfabetico di {0} autori", -"authors.alphabetical.single":"Indice alfabetico di un solo autore ;)", +"authors.alphabetical.many":"Indice alfabetico di {0} autori", +"authors.alphabetical.one":"Indice alfabetico di un solo autore ;)", "splitByLetter.author.other":"Altri autori", "series.title":"Collane", -"series.alphabetical":"Indice alfabetico di {0} collane", -"series.alphabetical.single":"Indice alfabetico di una sola collana ;)", +"series.alphabetical.many":"Indice alfabetico di {0} collane", +"series.alphabetical.one":"Indice alfabetico di una sola collana ;)", "splitByLetter.series.other":"Altre collane", "recent.title":"Ultime aggiunte", "recent.list":" I {0} libri più recenti", @@ -69,8 +69,8 @@ "rating.title":"Valutazioni", "rating.summary":"{0}, per valutazioni", "allbooks.title":"Tutti i libri", -"allbooks.alphabetical":"Indice alfabetico di {0} libri", -"allbooks.alphabetical.single":"Indice alfabetico di un solo libro ;)", +"allbooks.alphabetical.many":"Indice alfabetico di {0} libri", +"allbooks.alphabetical.one":"Indice alfabetico di un solo libro ;)", "splitByLetter.book.other":"Altri libri", "main.title":"Biblioteca generata da Calibre", "main.summary":"{0} ha catalogato {1}", diff --git a/lang/Localization_nl.json b/lang/Localization_nl.json index 96a821b..28516cc 100644 --- a/lang/Localization_nl.json +++ b/lang/Localization_nl.json @@ -56,17 +56,17 @@ "tags.title":"Tags", "tags.categorized":"Gecategorizeerde index van {0} tags", "tags.categorized.single":"Gecategorizeerde index van 1 tag - Erg handig ;)", -"tags.alphabetical":"Alfabetische index van {0} tags", -"tags.alphabetical.single":"Alfabetische index van 1 tag ;)", +"tags.alphabetical.many":"Alfabetische index van {0} tags", +"tags.alphabetical.one":"Alfabetische index van 1 tag ;)", "splitByLetter.tag.other":"Andere tags", "authors.series.title":"Series: {0}", "authors.title":"Auteurs", -"authors.alphabetical":"Alfabetische index van {0} auteurs", -"authors.alphabetical.single":"Alfabetische index van 1 auteur - Erg handig ;)", +"authors.alphabetical.many":"Alfabetische index van {0} auteurs", +"authors.alphabetical.one":"Alfabetische index van 1 auteur - Erg handig ;)", "splitByLetter.author.other":"Andere auteurs", "series.title":"Series", -"series.alphabetical":"Alfabetische index van {0} series", -"series.alphabetical.single":"Alfabetische index van 1 serie - Erg handig ;)", +"series.alphabetical.many":"Alfabetische index van {0} series", +"series.alphabetical.one":"Alfabetische index van 1 serie - Erg handig ;)", "splitByLetter.series.other":"Andere series", "recent.title":"Recent toegevoegd", "recent.list":"{0} meest recente boeken", @@ -74,8 +74,8 @@ "rating.title":"Rating", "rating.summary":"{0}, gegroepeerd per rating", "allbooks.title":"Alle boeken", -"allbooks.alphabetical":"Alfabetische index van {0} boeken", -"allbooks.alphabetical.single":"Alfabetische index van 1 boek", +"allbooks.alphabetical.many":"Alfabetische index van {0} boeken", +"allbooks.alphabetical.one":"Alfabetische index van 1 boek", "splitByLetter.book.other":"Andere boeken", "main.title":"Calibre bibliotheek", "main.summary":"{0} heeft gecatalogiseerd {1}", diff --git a/lang/Localization_ru.json b/lang/Localization_ru.json index dc35b32..ab4f589 100644 --- a/lang/Localization_ru.json +++ b/lang/Localization_ru.json @@ -53,17 +53,17 @@ "tags.title":"Тэги", "tags.categorized":"Категорированный указатель для {0} тэгов", "tags.categorized.single":"Категорированный указатель для одного тэга - действительно очень полезно ;)", -"tags.alphabetical":"Алфавитный указатель для {0} тэгов", -"tags.alphabetical.single":"Алфавитный указатель для одного тэга ;)", +"tags.alphabetical.many":"Алфавитный указатель для {0} тэгов", +"tags.alphabetical.one":"Алфавитный указатель для одного тэга ;)", "splitByLetter.tag.other":"Другие тэги", "authors.series.title":"Серии: {0}", "authors.title":"Авторы", -"authors.alphabetical":"Алфавитный указатель для {0} авторов", -"authors.alphabetical.single":"Алфавитный указатель для одного автора - действительно очень полезно ;)", +"authors.alphabetical.many":"Алфавитный указатель для {0} авторов", +"authors.alphabetical.one":"Алфавитный указатель для одного автора - действительно очень полезно ;)", "splitByLetter.author.other":"Другие авторы", "series.title":"Серии", -"series.alphabetical":"Алфавитный указатель для {0} серий", -"series.alphabetical.single":"Алфавитный указатель для одной серии - действительно очень полезно ;)", +"series.alphabetical.many":"Алфавитный указатель для {0} серий", +"series.alphabetical.one":"Алфавитный указатель для одной серии - действительно очень полезно ;)", "splitByLetter.series.other":"Другие серии", "recent.title":"Недавние поступления", "recent.list":"{0} недавно поступивших(ие) книг(и)", @@ -71,8 +71,8 @@ "rating.title":"Рейтинг", "rating.summary":"{0}, сгруппировано по рейтингу", "allbooks.title":"Все книги", -"allbooks.alphabetical":"Алфавитный указатель всех {0} книг", -"allbooks.alphabetical.single":"Алфавитный указатель одной книги - действительно очень полезно ;)", +"allbooks.alphabetical.many":"Алфавитный указатель всех {0} книг", +"allbooks.alphabetical.one":"Алфавитный указатель одной книги - действительно очень полезно ;)", "splitByLetter.book.other":"Другие книги", "main.title":"Библиотека Calibre", "main.summary":"{0} каталогизировано {1}", diff --git a/serie.php b/serie.php index 33287f8..ec74416 100644 --- a/serie.php +++ b/serie.php @@ -30,7 +30,7 @@ class Serie extends Base { public static function getCount() { $nSeries = parent::getDb ()->query('select count(*) from series')->fetchColumn(); $entry = new Entry (localize("series.title"), self::ALL_SERIES_ID, - str_format (localize("series.alphabetical"), $nSeries), "text", + str_format (localize("series.alphabetical", $nSeries), $nSeries), "text", array ( new LinkNavigation ("?page=".parent::PAGE_ALL_SERIES))); return $entry; } diff --git a/tag.php b/tag.php index c45df25..fe37cce 100644 --- a/tag.php +++ b/tag.php @@ -30,7 +30,7 @@ class tag extends Base { public static function getCount() { $nTags = parent::getDb ()->query('select count(*) from tags')->fetchColumn(); $entry = new Entry (localize("tags.title"), self::ALL_TAGS_ID, - str_format (localize("tags.alphabetical"), $nTags), "text", + str_format (localize("tags.alphabetical", $nTags), $nTags), "text", array ( new LinkNavigation ("?page=".parent::PAGE_ALL_TAGS))); return $entry; }