Personal/cops
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Didier Corbière 2013-09-25 08:31:32 +02:00
parent 1acce6509c a42cda521d
commit 8d17ef3563
15 changed files with 74 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base.php
View file

@ -470,7 +470,7 @@ class Page
$currentUrl = $_SERVER['QUERY_STRING']; $currentUrl = $_SERVER['QUERY_STRING'];
$currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . $_SERVER['QUERY_STRING']); $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . $_SERVER['QUERY_STRING']);
if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) { if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", "Page suivante"); return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
} }
return NULL; return NULL;
} }
@ -481,7 +481,7 @@ class Page
$currentUrl = $_SERVER['QUERY_STRING']; $currentUrl = $_SERVER['QUERY_STRING'];
$currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . $_SERVER['QUERY_STRING']); $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . $_SERVER['QUERY_STRING']);
if ($this->n > 1) { if ($this->n > 1) {
return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", "Page precedente"); return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
} }
return NULL; return NULL;
} }

1
book.php
View file

@ -619,6 +619,7 @@ function getJson ($complete = false) {
"searchAlt" => localize ("search.alternate"), "searchAlt" => localize ("search.alternate"),
"sortAlt" => localize ("sort.alternate"), "sortAlt" => localize ("sort.alternate"),
"homeAlt" => localize ("home.alternate"), "homeAlt" => localize ("home.alternate"),
"cogAlt" => localize ("cog.alternate"),
"permalinkAlt" => localize ("permalink.alternate"), "permalinkAlt" => localize ("permalink.alternate"),
"pubdateTitle" => localize("pubdate.title"), "pubdateTitle" => localize("pubdate.title"),
"languagesTitle" => localize("language.title"), "languagesTitle" => localize("language.title"),

2
index.php
View file

@ -54,7 +54,7 @@
<script type="text/javascript" src="<?php echo getUrlWithVersion("util.js") ?>"></script> <script type="text/javascript" src="<?php echo getUrlWithVersion("util.js") ?>"></script>
<link rel="related" href="<?php echo $config['cops_full_url'] ?>feed.php" type="application/atom+xml;profile=opds-catalog" title="<?php echo $config['cops_title_default']; ?>" /> <link rel="related" href="<?php echo $config['cops_full_url'] ?>feed.php" type="application/atom+xml;profile=opds-catalog" title="<?php echo $config['cops_title_default']; ?>" />
<link rel="icon" type="image/vnd.microsoft.icon" href="<?php echo $config['cops_icon']; ?>" /> <link rel="icon" type="image/vnd.microsoft.icon" href="<?php echo $config['cops_icon']; ?>" />
<link rel='stylesheet' type='text/css' href='https://fonts.googleapis.com/css?family=Open+Sans:400,300italic,800,300,400italic,600,600italic,700,700italic,800italic' /> <link rel='stylesheet' type='text/css' href='https://fonts.googleapis.com/css?family=Open+Sans:400,300italic,800,300,400italic,600,600italic,700,700italic,800italic&subset=latin,cyrillic' />
<link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion("resources/normalize/normalize.css") ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion("resources/normalize/normalize.css") ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion("styles/font-awesome.css") ?>" media="screen" /> <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion("styles/font-awesome.css") ?>" media="screen" />
<link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss ()) ?>" media="screen" /> <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss ()) ?>" media="screen" />

1
lang/Localization_ca.json
View file

@ -16,6 +16,7 @@
"bookword.none":"Cap llibre", "bookword.none":"Cap llibre",
"bookword.one":"1 llibre", "bookword.one":"1 llibre",
"bookword.title":"Llibres", "bookword.title":"Llibres",
"##TODO##cog.alternate":"Search, sort and filters",
"##TODO##content.series":"Series:", "##TODO##content.series":"Series:",
"content.series.data":"Llibre {0} de la sèrie {1}", "content.series.data":"Llibre {0} de la sèrie {1}",
"content.summary":"Sinopsi:", "content.summary":"Sinopsi:",

1
lang/Localization_de.json
View file

@ -16,6 +16,7 @@
"bookword.none":"Kein Buch", "bookword.none":"Kein Buch",
"bookword.one":"1 Buch", "bookword.one":"1 Buch",
"bookword.title":"Bücher", "bookword.title":"Bücher",
"##TODO##cog.alternate":"Search, sort and filters",
"content.series":"Serien: ", "content.series":"Serien: ",
"content.series.data":"Buch {0} der {1} - Reihe", "content.series.data":"Buch {0} der {1} - Reihe",
"content.summary":"Inhalt: ", "content.summary":"Inhalt: ",

1
lang/Localization_en.json
View file

@ -16,6 +16,7 @@
"bookword.none":"No book", "bookword.none":"No book",
"bookword.one":"1 book", "bookword.one":"1 book",
"bookword.title":"Books", "bookword.title":"Books",
"cog.alternate":"Search, sort and filters",
"content.series":"Series:", "content.series":"Series:",
"content.series.data":"Book {0} in the {1} series", "content.series.data":"Book {0} in the {1} series",
"content.summary":"Summary", "content.summary":"Summary",

1
lang/Localization_es.json
View file

@ -16,6 +16,7 @@
"bookword.none":"Sin libros", "bookword.none":"Sin libros",
"bookword.one":"1 libro", "bookword.one":"1 libro",
"bookword.title":"Libros", "bookword.title":"Libros",
"##TODO##cog.alternate":"Search, sort and filters",
"##TODO##content.series":"Series:", "##TODO##content.series":"Series:",
"content.series.data":"Libro {0} en la {1} serie", "content.series.data":"Libro {0} en la {1} serie",
"content.summary":"Sumario:", "content.summary":"Sumario:",

5
lang/Localization_fr.json
View file

@ -1,11 +1,11 @@
{ {
"about.title":"A propos de COPS", "about.title":"A propos de COPS",
"allbooks.alphabetical.many":"Index alphabétique des {0} livres", "allbooks.alphabetical.many":"Index alphabétique des {0} livres",
"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book", "allbooks.alphabetical.none":"Index alphabétique d'aucun livre",
"allbooks.alphabetical.one":"Index alphabétique du seul livre", "allbooks.alphabetical.one":"Index alphabétique du seul livre",
"allbooks.title":"Tous les livres", "allbooks.title":"Tous les livres",
"authors.alphabetical.many":"Index alphabétique des {0} auteurs", "authors.alphabetical.many":"Index alphabétique des {0} auteurs",
"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author", "authors.alphabetical.none":"Index alphabétique d'aucun auteur",
"authors.alphabetical.one":"Index alphabétique du seul auteur", "authors.alphabetical.one":"Index alphabétique du seul auteur",
"authors.title":"Auteurs", "authors.title":"Auteurs",
"authorword.many":"{0} auteurs", "authorword.many":"{0} auteurs",
@ -16,6 +16,7 @@
"bookword.none":"Aucun livre", "bookword.none":"Aucun livre",
"bookword.one":"1 livre", "bookword.one":"1 livre",
"bookword.title":"Livres", "bookword.title":"Livres",
"cog.alternate":"Recherche, tri et filtres",
"content.series":"Collection:", "content.series":"Collection:",
"content.series.data":"Livre {0} dans la collection {1}", "content.series.data":"Livre {0} dans la collection {1}",
"content.summary":"Résumé:", "content.summary":"Résumé:",

57
lang/Localization_it.json
View file

@ -1,11 +1,11 @@
{ {
"##TODO##about.title":"About COPS", "about.title":"A proposito di COPS",
"allbooks.alphabetical.many":"Indice alfabetico di {0} libri", "allbooks.alphabetical.many":"Indice alfabetico di {0} libri",
"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book", "allbooks.alphabetical.none":"Indice alfabetico indipendente dal libro",
"allbooks.alphabetical.one":"Indice alfabetico di un solo libro", "allbooks.alphabetical.one":"Indice alfabetico di un solo libro",
"allbooks.title":"Tutti i libri", "allbooks.title":"Tutti i libri",
"authors.alphabetical.many":"Indice alfabetico di {0} autori", "authors.alphabetical.many":"Indice alfabetico di {0} autori",
"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author", "authors.alphabetical.none":"Indice alfabetico indipendente dall'autore",
"authors.alphabetical.one":"Indice alfabetico di un solo autore", "authors.alphabetical.one":"Indice alfabetico di un solo autore",
"authors.title":"Autori", "authors.title":"Autori",
"authorword.many":"{0} autori", "authorword.many":"{0} autori",
@ -16,43 +16,44 @@
"bookword.none":"Nessun libro", "bookword.none":"Nessun libro",
"bookword.one":"1 libro", "bookword.one":"1 libro",
"bookword.title":"Libri", "bookword.title":"Libri",
"##TODO##cog.alternate":"Search, sort and filters",
"content.series":"Collana:", "content.series":"Collana:",
"content.series.data":"Libro {0} nella collana {1}", "content.series.data":"Libro {0} nella collana {1}",
"content.summary":"Riassunto:", "content.summary":"Riassunto:",
"##TODO##customize.email":"Set your email (to allow book emailing)", "customize.email":"Imposta la tua email (per permettere l'invio di email)",
"##TODO##customize.fancybox":"Use a Lightbox", "customize.fancybox":"Usa una Lightbox",
"##TODO##customize.filter":"Enable tag filtering", "customize.filter":"Abilita il filtro per argomento",
"##TODO##customize.paging":"Max number of books per page (-1 to disable)", "customize.paging":"Numero massimo di libri per pagina (-1 per disabilitare)",
"##TODO##customize.style":"Theme", "customize.style":"Tema",
"##TODO##customize.title":"Customize COPS UI", "customize.title":"Personalizza l'interfaccia di COPS",
"##TODO##home.alternate":"Home", "home.alternate":"Home",
"##TODO##i18n.coversection":"Cover", "i18n.coversection":"Copertina",
"language.title":"Lingua", "language.title":"Lingua",
"##TODO##languages.alphabetical.many":"Alphabetical index of the {0} languages", "languages.alphabetical.many":"Indice alfabetico delle {0} lingue",
"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language", "languages.alphabetical.none":"Indice alfabetico indipendente dalla lingua",
"##TODO##languages.alphabetical.one":"Alphabetical index of the single language", "languages.alphabetical.one":"Indice alfabetico della singola lingua",
"##TODO##languages.title":"Languages", "languages.title":"Lingue",
"##TODO##mail.messagenotsent":"Message could not be sent.", "mail.messagenotsent":"L'e-mail non può essere spedita.",
"##TODO##mail.messagesent":"Message has been sent", "mail.messagesent":"L'e-mail è stata spedita",
"##TODO##paging.next.alternate":"Next", "paging.next.alternate":"Prossimo",
"##TODO##paging.previous.alternate":"Previous", "paging.previous.alternate":"Precedente",
"##TODO##permalink.alternate":"Permalink", "permalink.alternate":"Permalink",
"##TODO##pubdate.title":"Publication year", "pubdate.title":"Anno di publicazione",
"recent.list":" I {0} libri più recenti", "recent.list":" I {0} libri più recenti",
"recent.title":"Ultime aggiunte", "recent.title":"Ultime aggiunte",
"##TODO##search.alternate":"Search", "search.alternate":"Cerca",
"##TODO##search.result":"Search result for *{0}*", "search.result":"Risultati per *{0}*",
"##TODO##search.sortorder.asc":"Asc", "search.sortorder.asc":"Asc",
"##TODO##search.sortorder.desc":"Desc", "search.sortorder.desc":"Disc",
"series.alphabetical.many":"Indice alfabetico di {0} collane", "series.alphabetical.many":"Indice alfabetico di {0} collane",
"##TODO##series.alphabetical.none":"Alphabetical index of absolutely no series", "series.alphabetical.none":"Indice alfabetico indipendente dalla collana",
"series.alphabetical.one":"Indice alfabetico di una sola collana", "series.alphabetical.one":"Indice alfabetico di una sola collana",
"series.title":"Collane", "series.title":"Collane",
"##TODO##sort.alternate":"Sort", "sort.alternate":"Ordina",
"splitByLetter.book.other":"Altri libri", "splitByLetter.book.other":"Altri libri",
"splitByLetter.letter":"{0} che iniziano per {1}", "splitByLetter.letter":"{0} che iniziano per {1}",
"tags.alphabetical.many":"Indice alfabetico di {0} argomenti", "tags.alphabetical.many":"Indice alfabetico di {0} argomenti",
"##TODO##tags.alphabetical.none":"Alphabetical index of absolutely no tag", "tags.alphabetical.none":"Indice alfabetico indipendente dall'argomento",
"tags.alphabetical.one":"Indice alfabetico del solo argomento", "tags.alphabetical.one":"Indice alfabetico del solo argomento",
"tags.title":"Argomenti", "tags.title":"Argomenti",
"tagword.title":"Argomenti", "tagword.title":"Argomenti",

1
lang/Localization_nb.json
View file

@ -16,6 +16,7 @@
"bookword.none":"Ingen bøker", "bookword.none":"Ingen bøker",
"bookword.one":"1 bok", "bookword.one":"1 bok",
"bookword.title":"Bøker", "bookword.title":"Bøker",
"##TODO##cog.alternate":"Search, sort and filters",
"content.series":"Serier:", "content.series":"Serier:",
"content.series.data":"Bok {0} i serien {1}", "content.series.data":"Bok {0} i serien {1}",
"content.summary":"Sammendrag", "content.summary":"Sammendrag",

57
lang/Localization_nl.json
View file

@ -1,11 +1,11 @@
{ {
"##TODO##about.title":"About COPS", "about.title":"Over COPS",
"allbooks.alphabetical.many":"Alfabetische index van {0} boeken", "allbooks.alphabetical.many":"Alfabetische index van {0} boeken",
"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book", "allbooks.alphabetical.none":"Alfabetische index van absoluut geen enkel boek",
"allbooks.alphabetical.one":"Alfabetische index van 1 boek", "allbooks.alphabetical.one":"Alfabetische index van 1 boek",
"allbooks.title":"Alle boeken", "allbooks.title":"Alle boeken",
"authors.alphabetical.many":"Alfabetische index van {0} auteurs", "authors.alphabetical.many":"Alfabetische index van {0} auteurs",
"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author", "authors.alphabetical.none":"Alfabetische index van absoluut geen enkele auteur",
"authors.alphabetical.one":"Alfabetische index van 1 auteur", "authors.alphabetical.one":"Alfabetische index van 1 auteur",
"authors.title":"Auteurs", "authors.title":"Auteurs",
"authorword.many":"{0} auteurs", "authorword.many":"{0} auteurs",
@ -16,43 +16,44 @@
"bookword.none":"Geen boek", "bookword.none":"Geen boek",
"bookword.one":"1 boek", "bookword.one":"1 boek",
"bookword.title":"Boeken", "bookword.title":"Boeken",
"cog.alternate":"Zoeken, sorteren en filters",
"content.series":"Series:", "content.series":"Series:",
"content.series.data":"Boek {0} in de {1} serie", "content.series.data":"Boek {0} in de {1} serie",
"content.summary":"Samenvatting", "content.summary":"Samenvatting",
"##TODO##customize.email":"Set your email (to allow book emailing)", "customize.email":"Email-adres ontvanger (om boeken te versturen per elektronische post)",
"##TODO##customize.fancybox":"Use a Lightbox", "customize.fancybox":"Gebruik een Lightbox",
"##TODO##customize.filter":"Enable tag filtering", "customize.filter":"Zet filteren op tag aan",
"##TODO##customize.paging":"Max number of books per page (-1 to disable)", "customize.paging":"Maximaal aantal boeken per pagina (-1 voor oneindig aantal)",
"##TODO##customize.style":"Theme", "customize.style":"Opmaak COPS gebruikersomgeving",
"##TODO##customize.title":"Customize COPS UI", "customize.title":"Aanpassen COPS gebruikersomgeving",
"##TODO##home.alternate":"Home", "home.alternate":"Terug (home)",
"i18n.coversection":"Omslag", "i18n.coversection":"Omslag",
"language.title":"Taal", "language.title":"Taal",
"##TODO##languages.alphabetical.many":"Alphabetical index of the {0} languages", "languages.alphabetical.many":"Alfabetische index van {0} talen",
"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language", "languages.alphabetical.none":"Alfabetische index van absoluut geen enkele taal",
"##TODO##languages.alphabetical.one":"Alphabetical index of the single language", "languages.alphabetical.one":"Alfabetische index van taal",
"##TODO##languages.title":"Languages", "languages.title":"Talen",
"##TODO##mail.messagenotsent":"Message could not be sent.", "mail.messagenotsent":"Bericht kon niet verzonden worden.",
"##TODO##mail.messagesent":"Message has been sent", "mail.messagesent":"Bericht is verzonden",
"##TODO##paging.next.alternate":"Next", "paging.next.alternate":"Volgende",
"##TODO##paging.previous.alternate":"Previous", "paging.previous.alternate":"Vorige",
"##TODO##permalink.alternate":"Permalink", "permalink.alternate":"Permalink",
"##TODO##pubdate.title":"Publication year", "pubdate.title":"Jaar van publicatie",
"recent.list":"{0} meest recente boeken", "recent.list":"{0} meest recente boeken",
"recent.title":"Recent toegevoegd", "recent.title":"Recent toegevoegde boeken",
"##TODO##search.alternate":"Search", "search.alternate":"Zoeken",
"##TODO##search.result":"Search result for *{0}*", "search.result":"Zoekresultaat voor *{0}*",
"##TODO##search.sortorder.asc":"Asc", "search.sortorder.asc":"A-Z",
"##TODO##search.sortorder.desc":"Desc", "search.sortorder.desc":"Z-A",
"series.alphabetical.many":"Alfabetische index van {0} series", "series.alphabetical.many":"Alfabetische index van {0} series",
"##TODO##series.alphabetical.none":"Alphabetical index of absolutely no series", "series.alphabetical.none":"Alfabetische index van absoluut geen ekele serie",
"series.alphabetical.one":"Alfabetische index van 1 serie", "series.alphabetical.one":"Alfabetische index van 1 serie",
"series.title":"Series", "series.title":"Series",
"##TODO##sort.alternate":"Sort", "sort.alternate":"Sorteren",
"splitByLetter.book.other":"Andere boeken", "splitByLetter.book.other":"Andere boeken",
"splitByLetter.letter":"{0} beginnend met {1}", "splitByLetter.letter":"{0} beginnend met {1}",
"tags.alphabetical.many":"Alfabetische index van {0} tags", "tags.alphabetical.many":"Alfabetische index van {0} tags",
"##TODO##tags.alphabetical.none":"Alphabetical index of absolutely no tag", "tags.alphabetical.none":"Alfabetische index van absoluut geen enkele tag",
"tags.alphabetical.one":"Alfabetische index van 1 tag", "tags.alphabetical.one":"Alfabetische index van 1 tag",
"tags.title":"Tags", "tags.title":"Tags",
"tagword.title":"Tags", "tagword.title":"Tags",

1
lang/Localization_pt.json
View file

@ -16,6 +16,7 @@
"bookword.none":"Sem livros", "bookword.none":"Sem livros",
"bookword.one":"1 livro", "bookword.one":"1 livro",
"bookword.title":"Livros", "bookword.title":"Livros",
"##TODO##cog.alternate":"Search, sort and filters",
"content.series":"Séries:", "content.series":"Séries:",
"content.series.data":"Livro {0} da série {1}", "content.series.data":"Livro {0} da série {1}",
"content.summary":"Sumário", "content.summary":"Sumário",

1
lang/Localization_ru.json
View file

@ -16,6 +16,7 @@
"bookword.none":"Нет книг", "bookword.none":"Нет книг",
"bookword.one":"1 книга", "bookword.one":"1 книга",
"bookword.title":"Книги", "bookword.title":"Книги",
"##TODO##cog.alternate":"Search, sort and filters",
"content.series":"Серии:", "content.series":"Серии:",
"content.series.data":"Книга {0} в {1} серии", "content.series.data":"Книга {0} в {1} серии",
"content.summary":"Краткое содержание:", "content.summary":"Краткое содержание:",

1
lang/Localization_zh.json
View file

@ -16,6 +16,7 @@
"bookword.none":"没有书籍", "bookword.none":"没有书籍",
"bookword.one":"1 本书籍", "bookword.one":"1 本书籍",
"bookword.title":"书名", "bookword.title":"书名",
"##TODO##cog.alternate":"Search, sort and filters",
"content.series":"系列:", "content.series":"系列:",
"content.series.data":"{0} 系列的第 {0} 本", "content.series.data":"{0} 系列的第 {0} 本",
"content.summary":"概要", "content.summary":"概要",

2
templates/default/header.html
View file

@ -3,7 +3,7 @@
<div title="{{=it.c.i18n.homeAlt}}" class="hicon hicon64"><i class="icon-home"></i></div> <div title="{{=it.c.i18n.homeAlt}}" class="hicon hicon64"><i class="icon-home"></i></div>
</a> </a>
{{? it.c.config.server_side_rendering == 0}} {{? it.c.config.server_side_rendering == 0}}
<div title="Settings and menu" class="hicon hicon64 headright"><i class="icon-cog" id="searchImage"></i></div> <div title="{{=it.c.i18n.cogAlt}}" class="hicon hicon64 headright"><i class="icon-cog" id="searchImage"></i></div>
{{?}} {{?}}
<div class="headcenter"> <div class="headcenter">
<h1>{{=it.title}}</h1> <h1>{{=it.title}}</h1>