]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Display text on baggy 2222/head
authorJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 21 Aug 2016 20:22:34 +0000 (22:22 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 21 Aug 2016 20:22:34 +0000 (22:22 +0200)
Instead of using icons (which aren't available) display real text for reading time & creation date

13 files changed:
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig

index 5e7d89494c8b6a5b901951be61cd2c70a85a5580..0dcf7caa7b0801a6b66111dce6625e0f09f4734d 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'Rediger titel'
         original_article: 'original'
         # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
+        created_at: 'Oprettelsesdato'
     new:
         page_title: 'Gem ny artikel'
         placeholder: 'http://website.com'
index cb1644dec2a90e4d2bbf4bd1d526fc5cdae4f0dc..533078dbcb6e9dd78c809cd2e5fffa6681a188e4 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'Titel ändern'
         original_article: 'original'
         annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %nbAnnotations% Anmerkungen'
+        created_at: 'Erstellungsdatum'
     new:
         page_title: 'Neuen Artikel speichern'
         placeholder: 'https://website.de'
index 734f8533557128602c81dba267411adc5b223363..19b592e031f9cb1c81d2d8e62c29c81614fb3cbb 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'Edit title'
         original_article: 'original'
         annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
+        created_at: 'Creation date'
     new:
         page_title: 'Save new entry'
         placeholder: 'http://website.com'
index 582526efd749802c1e0754991768dd84541866f4..21f26d9e65de83111e357d2acf94cde1a6f812e9 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'Modificar el título'
         original_article: 'original'
         annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones'
+        created_at: 'Fecha de creación'
     new:
         page_title: 'Guardar un nuevo artículo'
         placeholder: 'http://website.com'
index 52b50ce96c2c8b91160e7edf1a1304382ef4a64e..6dedd984a0edd6904c8e07ed88afbe290f5d1f58 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'ویرایش عنوان'
         original_article: 'اصلی'
         annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations'
+        created_at: 'زمان ساخت'
     new:
         page_title: 'ذخیرهٔ مقالهٔ تازه'
         placeholder: 'http://website.com'
index cc46047776ca4458696e9ad289baff8df408b4fd..829df809762aa1d373459d6653671f178ab90986 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'Modifier le titre'
         original_article: 'original'
         annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations'
+        created_at: 'Date de création'
     new:
         page_title: 'Sauvegarder un nouvel article'
         placeholder: 'http://website.com'
index 6d638e58a46552c1a3262d8410ad397fbccf8eaa..a7291a1b704025b0bb7a60c570445ee35f1c74dc 100644 (file)
@@ -192,6 +192,7 @@ entry:
         edit_title: 'Modifica titolo'
         original_article: 'originale'
         annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni'
+        created_at: 'Data di creazione'
     new:
         page_title: 'Salva un nuovo contenuto'
         placeholder: 'http://website.com'
index 6fe2c4df2ea3b58789152f72528ab6e65636d254..8531f7ee4c52cccf78d7e45433a2a3f42fd810b4 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'Modificar lo títol'
         original_article: 'original'
         annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %nbAnnotations% anotacions"
+        created_at: 'Data de creacion'
     new:
         page_title: 'Enregistrar un novèl article'
         placeholder: 'http://website.com'
index 35108f226e77840714671303ae671f4747be6e6f..bd45767d74f17c6a9914c9522986062333f8ebfe 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'Edytuj tytuł'
         original_article: 'oryginalny'
         annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %nbAnnotations% adnotacji'
+        created_at: 'Czas stworzenia'
     new:
         page_title: 'Zapisz nowy wpis'
         placeholder: 'http://website.com'
index 2210d9e686ec2dc3755b1b07747ae14a1f240b66..8455a6bda4199ed6735bf9dadb40b372ad67a6e1 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'Editează titlul'
         original_article: 'original'
         # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
+        created_at: 'Data creării'
     new:
         page_title: 'Salvează un nou articol'
         placeholder: 'http://website.com'
index 39f08ea35079e370603a5f0b9d869911746015ff..8d3d4524eff811460d4d08f7f088509c70ce337c 100644 (file)
@@ -193,6 +193,7 @@ entry:
         edit_title: 'Başlığı düzenle'
         original_article: 'orijinal'
         # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
+        created_at: 'Oluşturulma tarihi'
     new:
         page_title: 'Yeni makaleyi kaydet'
         placeholder: 'http://website.com'
index 87b4424c239856f1170c57183a8c50e739b10a88..6bf8572546941959e3c04d9beabf49db8c8d07fd 100644 (file)
             <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>
         </ul>
     </div>
-        <div class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</div>
-        {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
+        <div class="link mdi-action-today">
+            {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }}
+        </div>
+
         <div class="link mdi-action-query-builder">
+            {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
             {% if readingTime > 0 %}
-                {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
+                {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }}
             {% else %}
-                {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
+                {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
             {% endif %}
         </div>
+
         {% set nbAnnotations = entry.annotations | length %}
         <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
         <aside class="tags">
index 94a5dc3152310441ec369eed91026f3f8f92dc9b..4f58b692a7f808030c086f257b88b49f5a7103bb 100644 (file)
             <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
         </header>
         <aside>
-            <span class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</span>
+            <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ entry.createdAt|date('Y-m-d') }}</span>
             {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
             <span class="link mdi-action-query-builder">
                 {% if readingTime > 0 %}