aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-08-21 22:22:34 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-08-21 22:22:34 +0200
commitd35ba2c3d6c822b293e7d04baa934845d44bec99 (patch)
tree85427762c195898e005a9f9a3279541fcce06ca3 /src
parente7732deb1f7614523905634e23a8717f9ca526bf (diff)
downloadwallabag-d35ba2c3d6c822b293e7d04baa934845d44bec99.tar.gz
wallabag-d35ba2c3d6c822b293e7d04baa934845d44bec99.tar.zst
wallabag-d35ba2c3d6c822b293e7d04baa934845d44bec99.zip
Display text on baggy
Instead of using icons (which aren't available) display real text for reading time & creation date
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig12
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig2
13 files changed, 20 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 5e7d8949..0dcf7caa 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'Rediger titel' 193 edit_title: 'Rediger titel'
194 original_article: 'original' 194 original_article: 'original'
195 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' 195 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
196 created_at: 'Oprettelsesdato'
196 new: 197 new:
197 page_title: 'Gem ny artikel' 198 page_title: 'Gem ny artikel'
198 placeholder: 'http://website.com' 199 placeholder: 'http://website.com'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index cb1644de..533078db 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'Titel ändern' 193 edit_title: 'Titel ändern'
194 original_article: 'original' 194 original_article: 'original'
195 annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %nbAnnotations% Anmerkungen' 195 annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %nbAnnotations% Anmerkungen'
196 created_at: 'Erstellungsdatum'
196 new: 197 new:
197 page_title: 'Neuen Artikel speichern' 198 page_title: 'Neuen Artikel speichern'
198 placeholder: 'https://website.de' 199 placeholder: 'https://website.de'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 734f8533..19b592e0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'Edit title' 193 edit_title: 'Edit title'
194 original_article: 'original' 194 original_article: 'original'
195 annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' 195 annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
196 created_at: 'Creation date'
196 new: 197 new:
197 page_title: 'Save new entry' 198 page_title: 'Save new entry'
198 placeholder: 'http://website.com' 199 placeholder: 'http://website.com'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 582526ef..21f26d9e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'Modificar el título' 193 edit_title: 'Modificar el título'
194 original_article: 'original' 194 original_article: 'original'
195 annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones' 195 annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones'
196 created_at: 'Fecha de creación'
196 new: 197 new:
197 page_title: 'Guardar un nuevo artículo' 198 page_title: 'Guardar un nuevo artículo'
198 placeholder: 'http://website.com' 199 placeholder: 'http://website.com'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 52b50ce9..6dedd984 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'ویرایش عنوان' 193 edit_title: 'ویرایش عنوان'
194 original_article: 'اصلی' 194 original_article: 'اصلی'
195 annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' 195 annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations'
196 created_at: 'زمان ساخت'
196 new: 197 new:
197 page_title: 'ذخیرهٔ مقالهٔ تازه' 198 page_title: 'ذخیرهٔ مقالهٔ تازه'
198 placeholder: 'http://website.com' 199 placeholder: 'http://website.com'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index cc460477..829df809 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'Modifier le titre' 193 edit_title: 'Modifier le titre'
194 original_article: 'original' 194 original_article: 'original'
195 annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations' 195 annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations'
196 created_at: 'Date de création'
196 new: 197 new:
197 page_title: 'Sauvegarder un nouvel article' 198 page_title: 'Sauvegarder un nouvel article'
198 placeholder: 'http://website.com' 199 placeholder: 'http://website.com'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 6d638e58..a7291a1b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -192,6 +192,7 @@ entry:
192 edit_title: 'Modifica titolo' 192 edit_title: 'Modifica titolo'
193 original_article: 'originale' 193 original_article: 'originale'
194 annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni' 194 annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni'
195 created_at: 'Data di creazione'
195 new: 196 new:
196 page_title: 'Salva un nuovo contenuto' 197 page_title: 'Salva un nuovo contenuto'
197 placeholder: 'http://website.com' 198 placeholder: 'http://website.com'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 6fe2c4df..8531f7ee 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'Modificar lo títol' 193 edit_title: 'Modificar lo títol'
194 original_article: 'original' 194 original_article: 'original'
195 annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %nbAnnotations% anotacions" 195 annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %nbAnnotations% anotacions"
196 created_at: 'Data de creacion'
196 new: 197 new:
197 page_title: 'Enregistrar un novèl article' 198 page_title: 'Enregistrar un novèl article'
198 placeholder: 'http://website.com' 199 placeholder: 'http://website.com'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 35108f22..bd45767d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'Edytuj tytuł' 193 edit_title: 'Edytuj tytuł'
194 original_article: 'oryginalny' 194 original_article: 'oryginalny'
195 annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %nbAnnotations% adnotacji' 195 annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %nbAnnotations% adnotacji'
196 created_at: 'Czas stworzenia'
196 new: 197 new:
197 page_title: 'Zapisz nowy wpis' 198 page_title: 'Zapisz nowy wpis'
198 placeholder: 'http://website.com' 199 placeholder: 'http://website.com'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 2210d9e6..8455a6bd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'Editează titlul' 193 edit_title: 'Editează titlul'
194 original_article: 'original' 194 original_article: 'original'
195 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' 195 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
196 created_at: 'Data creării'
196 new: 197 new:
197 page_title: 'Salvează un nou articol' 198 page_title: 'Salvează un nou articol'
198 placeholder: 'http://website.com' 199 placeholder: 'http://website.com'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 39f08ea3..8d3d4524 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -193,6 +193,7 @@ entry:
193 edit_title: 'Başlığı düzenle' 193 edit_title: 'Başlığı düzenle'
194 original_article: 'orijinal' 194 original_article: 'orijinal'
195 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' 195 # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
196 created_at: 'Oluşturulma tarihi'
196 new: 197 new:
197 page_title: 'Yeni makaleyi kaydet' 198 page_title: 'Yeni makaleyi kaydet'
198 placeholder: 'http://website.com' 199 placeholder: 'http://website.com'
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 87b4424c..6bf85725 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
@@ -29,15 +29,19 @@
29 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li> 29 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li>
30 </ul> 30 </ul>
31 </div> 31 </div>
32 <div class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</div> 32 <div class="link mdi-action-today">
33 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} 33 {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }}
34 </div>
35
34 <div class="link mdi-action-query-builder"> 36 <div class="link mdi-action-query-builder">
37 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
35 {% if readingTime > 0 %} 38 {% if readingTime > 0 %}
36 {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} 39 {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }}
37 {% else %} 40 {% else %}
38 {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} 41 {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
39 {% endif %} 42 {% endif %}
40 </div> 43 </div>
44
41 {% set nbAnnotations = entry.annotations | length %} 45 {% set nbAnnotations = entry.annotations | length %}
42 <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> 46 <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
43 <aside class="tags"> 47 <aside class="tags">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 94a5dc31..4f58b692 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -193,7 +193,7 @@
193 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> 193 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
194 </header> 194 </header>
195 <aside> 195 <aside>
196 <span class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</span> 196 <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ entry.createdAt|date('Y-m-d') }}</span>
197 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} 197 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
198 <span class="link mdi-action-query-builder"> 198 <span class="link mdi-action-query-builder">
199 {% if readingTime > 0 %} 199 {% if readingTime > 0 %}