From daa2b7e7c3e7315d9ebab9d86ee8f158bc17d4b1 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 12 Feb 2016 16:58:30 +0100
Subject: More translations

---
 .../views/themes/baggy/Entry/new_form.html.twig         | 17 ++++++++---------
 .../Resources/views/themes/baggy/Static/howto.html.twig |  2 +-
 .../Resources/views/themes/baggy/Tag/new_form.html.twig | 17 ++++++++---------
 3 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig
index d182d552..fa0a9f53 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig
@@ -1,15 +1,14 @@
 <form name="entry" method="post" action="{{ path('new_entry')}}">
+    {% if form_errors(form) %}
+        <span class="black-text">{{ form_errors(form) }}</span>
+    {% endif %}
 
-        {% if form_errors(form) %}
-            <span class="black-text">{{ form_errors(form) }}</span>
-        {% endif %}
+    {% if form_errors(form.url) %}
+        <span class="black-text">{{ form_errors(form.url) }}</span>
+    {% endif %}
 
-        {% if form_errors(form.url) %}
-            <span class="black-text">{{ form_errors(form.url) }}</span>
-        {% endif %}
-
-        {{ form_label(form.url) }}
-        {{ form_widget(form.url) }}
+    {{ form_label(form.url) }}
+    {{ form_widget(form.url) }}
 
     <div class="hidden">{{ form_rest(form) }}</div>
 </form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
index 6a320692..e32264f3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
@@ -16,7 +16,7 @@
     </ul>
     <h3>{% trans %}Mobile Apps{% endtrans %}</h3>
     <ul>
-        <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via F-Droid{% endtrans %}</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via Google Play{% endtrans %}</a></li>
+        <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">via F-Droid</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">via Google Play</a></li>
         <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
         <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
     </ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig
index 0b5a530d..ade7f56d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig
@@ -1,15 +1,14 @@
 <form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}">
+    {% if form_errors(form) %}
+        <span class="black-text">{{ form_errors(form) }}</span>
+    {% endif %}
 
-        {% if form_errors(form) %}
-            <span class="black-text">{{ form_errors(form) }}</span>
-        {% endif %}
+    {% if form_errors(form.label) %}
+        <span class="black-text">{{ form_errors(form.label) }}</span>
+    {% endif %}
 
-        {% if form_errors(form.label) %}
-            <span class="black-text">{{ form_errors(form.label) }}</span>
-        {% endif %}
-
-        {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
-        {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
+    {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
+    {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
 
     <div class="hidden">{{ form_rest(form) }}</div>
 </form>
-- 
cgit v1.2.3


From 9e33bc9dfd9752f95cd335bb18bbf07734096554 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 15 Feb 2016 17:43:11 +0100
Subject: Typos

---
 .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy')

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 27a88287..13443029 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
@@ -7,7 +7,7 @@
         <ul class="links">
             <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li>
             <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
-            <li><a title="{% trans %}Reload content{% endtrans %}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{% trans %}Reload content{% endtrans %}</span></a></li>
+            <li><a title="{% trans %}Re-fetch content{% endtrans %}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{% trans %}Re-fetch content{% endtrans %}</span></a></li>
             <li><a title="{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}</span></a></li>
             <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li>
             <li><a title="{% trans %}Delete{% endtrans %}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}Delete{% endtrans %}</span></a></li>
-- 
cgit v1.2.3