aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-10-09 14:11:20 +0200
committerGitHub <noreply@github.com>2016-10-09 14:11:20 +0200
commite39aec3e38144f1a2ddb0027ec724e3dfd6f53f1 (patch)
tree06ae7911d88ce6d76dbfc635f9d8570dfd859003 /src
parentd451bcb3d0ef3183f9e3d4b0eb98828a23bab3ff (diff)
parent90c766b96b280b092d57fd35d7b9b89853a4e2a0 (diff)
downloadwallabag-e39aec3e38144f1a2ddb0027ec724e3dfd6f53f1.tar.gz
wallabag-e39aec3e38144f1a2ddb0027ec724e3dfd6f53f1.tar.zst
wallabag-e39aec3e38144f1a2ddb0027ec724e3dfd6f53f1.zip
Merge pull request #2406 from szafranek/bugfix-number-of-annotations
Show number of annotations instead of nbAnnotations placeholder
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig1
11 files changed, 10 insertions, 11 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 2652a102..bb23b5fe 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -195,7 +195,7 @@ entry:
195 description: 'Vises artiklen forkert?' 195 description: 'Vises artiklen forkert?'
196 edit_title: 'Rediger titel' 196 edit_title: 'Rediger titel'
197 original_article: 'original' 197 original_article: 'original'
198 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' 198 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
199 created_at: 'Oprettelsesdato' 199 created_at: 'Oprettelsesdato'
200 new: 200 new:
201 page_title: 'Gem ny artikel' 201 page_title: 'Gem ny artikel'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index e0f29b61..079cfece 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -195,7 +195,7 @@ entry:
195 description: 'Erscheint dieser Artikel falsch?' 195 description: 'Erscheint dieser Artikel falsch?'
196 edit_title: 'Titel ändern' 196 edit_title: 'Titel ändern'
197 original_article: 'original' 197 original_article: 'original'
198 annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %nbAnnotations% Anmerkungen' 198 annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen'
199 created_at: 'Erstellungsdatum' 199 created_at: 'Erstellungsdatum'
200 new: 200 new:
201 page_title: 'Neuen Artikel speichern' 201 page_title: 'Neuen Artikel speichern'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index b8e98112..34a6f74e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -195,7 +195,7 @@ entry:
195 description: 'Does this article appear wrong?' 195 description: 'Does this article appear wrong?'
196 edit_title: 'Edit title' 196 edit_title: 'Edit title'
197 original_article: 'original' 197 original_article: 'original'
198 annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' 198 annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
199 created_at: 'Creation date' 199 created_at: 'Creation date'
200 new: 200 new:
201 page_title: 'Save new entry' 201 page_title: 'Save new entry'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 70633bd7..29f0676e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -195,7 +195,7 @@ entry:
195 description: '¿Este artículo no se muestra bien?' 195 description: '¿Este artículo no se muestra bien?'
196 edit_title: 'Modificar el título' 196 edit_title: 'Modificar el título'
197 original_article: 'original' 197 original_article: 'original'
198 annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones' 198 annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %count% anotaciones'
199 created_at: 'Fecha de creación' 199 created_at: 'Fecha de creación'
200 new: 200 new:
201 page_title: 'Guardar un nuevo artículo' 201 page_title: 'Guardar un nuevo artículo'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 6d85a5ae..55453b6c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -195,7 +195,7 @@ entry:
195 description: "Est-ce que cet article s'affiche mal ?" 195 description: "Est-ce que cet article s'affiche mal ?"
196 edit_title: 'Modifier le titre' 196 edit_title: 'Modifier le titre'
197 original_article: 'original' 197 original_article: 'original'
198 annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations' 198 annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %count% annotations'
199 created_at: 'Date de création' 199 created_at: 'Date de création'
200 new: 200 new:
201 page_title: 'Sauvegarder un nouvel article' 201 page_title: 'Sauvegarder un nouvel article'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 15f7e774..67205c6d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -195,7 +195,7 @@ entry:
195 description: 'Questo contenuto viene visualizzato male?' 195 description: 'Questo contenuto viene visualizzato male?'
196 edit_title: 'Modifica titolo' 196 edit_title: 'Modifica titolo'
197 original_article: 'originale' 197 original_article: 'originale'
198 annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni' 198 annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %count% annotazioni'
199 created_at: 'Data di creazione' 199 created_at: 'Data di creazione'
200 new: 200 new:
201 page_title: 'Salva un nuovo contenuto' 201 page_title: 'Salva un nuovo contenuto'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 1d10be2a..25e5f05a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -195,7 +195,7 @@ entry:
195 description: "Marca mal la presentacion d'aqueste article ?" 195 description: "Marca mal la presentacion d'aqueste article ?"
196 edit_title: 'Modificar lo títol' 196 edit_title: 'Modificar lo títol'
197 original_article: 'original' 197 original_article: 'original'
198 annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %nbAnnotations% anotacions" 198 annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %count% anotacions"
199 created_at: 'Data de creacion' 199 created_at: 'Data de creacion'
200 new: 200 new:
201 page_title: 'Enregistrar un novèl article' 201 page_title: 'Enregistrar un novèl article'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 547e9c8b..392f9c19 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -195,7 +195,7 @@ entry:
195 description: 'Czy ten artykuł wygląda źle?' 195 description: 'Czy ten artykuł wygląda źle?'
196 edit_title: 'Edytuj tytuł' 196 edit_title: 'Edytuj tytuł'
197 original_article: 'oryginalny' 197 original_article: 'oryginalny'
198 annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %nbAnnotations% adnotacji' 198 annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji'
199 created_at: 'Czas stworzenia' 199 created_at: 'Czas stworzenia'
200 new: 200 new:
201 page_title: 'Zapisz nowy wpis' 201 page_title: 'Zapisz nowy wpis'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 2b1d4f6d..152d5020 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -195,7 +195,7 @@ entry:
195 description: 'Îți pare ciudat articolul?' 195 description: 'Îți pare ciudat articolul?'
196 edit_title: 'Editează titlul' 196 edit_title: 'Editează titlul'
197 original_article: 'original' 197 original_article: 'original'
198 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' 198 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
199 created_at: 'Data creării' 199 created_at: 'Data creării'
200 new: 200 new:
201 page_title: 'Salvează un nou articol' 201 page_title: 'Salvează un nou articol'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 8cfc245a..a2eca59b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -194,7 +194,7 @@ entry:
194 description: 'Bu makalede herhangi bir yanlışlık mı var?' 194 description: 'Bu makalede herhangi bir yanlışlık mı var?'
195 edit_title: 'Başlığı düzenle' 195 edit_title: 'Başlığı düzenle'
196 original_article: 'orijinal' 196 original_article: 'orijinal'
197 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' 197 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
198 created_at: 'Oluşturulma tarihi' 198 created_at: 'Oluşturulma tarihi'
199 new: 199 new:
200 page_title: 'Yeni makaleyi kaydet' 200 page_title: 'Yeni makaleyi kaydet'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index b1aabf9b..3689159b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -54,7 +54,6 @@
54 {% endif %} 54 {% endif %}
55 </i> 55 </i>
56 56
57 {% set nbAnnotations = entry.annotations | length %}
58 <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> 57 <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
59 <aside class="tags"> 58 <aside class="tags">
60 <div class="card-entry-tags"> 59 <div class="card-entry-tags">