9 files changed, 81 insertions, 46 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index b66ef538..16e8fe09 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -27,6 +27,7 @@ Search: 'Rechercher'
 Filter entries: 'Filtrer les articles'
 Enter your search here: 'Saisissez votre terme de recherche'
 Save new entry: 'Sauvegarder un nouvel article'
+Export: Exporter
 # Config screen
 Settings: 'Paramètres'
@@ -52,6 +53,7 @@ Old password: 'Mot de passe actuel'
 New password: 'Nouveau mot de passe'
 Repeat new password: 'Confirmez votre nouveau mot de passe'
 Username: "Nom d'utilisateur"
+Two factor authentication: Double authentification
 # Tagging rules
 Tagging rules: "Règles de tag automatiques"
@@ -83,6 +85,7 @@ One rule and another: "Une règle et l'autre"
 The domain name of the entry: "Le nom de domaine de l'article"
 "Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches \"football\"</code>": "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>"
 Rule: "Règle"
+FAQ: "FAQ"
 # Entries
 'estimated reading time': 'durée de lecture'
@@ -98,6 +101,10 @@ Edit an entry: "Éditer un article"
 Title: "Titre"
 Is public: "Public"
+# tag
+Tags: Tags
+"{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.": "{0} Il n'y a pas de tag.|{1} IL y a un tag.|]1,Inf[ Il y a %count% tags."
 # Filters
 Filters: 'Filtres'
 Status: 'Statut'
@@ -177,6 +184,8 @@ Download: 'Télécharger'
 Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?"
 Problems?: 'Un problème ?'
 Edit title: "Modifier le titre"
+Reload content: Recharger le contenu
+Tag added: Tag ajouté
 # Import
 Welcome on wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer."
@@ -193,8 +202,12 @@ Please select your wallabag export and click on the below button to upload and i
 File: "Fichier"
 Upload file: "Importer le fichier"
 Import contents: "Importer les contenus"
+Import: "Importer"
+Import > Wallabag v1: "Importer > Wallabag v1"
+Import > Wallabag v2: "Importer > Wallabag v2"
 # Quickstart
+Quickstart: Pour bien débuter
 Welcome on wallabag!: "Bienvenue sur wallabag !"
 We'll accompany you to visit wallabag and show you some features which can interess you.: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil."
 Follow us!: "Suivez-nous !"
diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
index c8fb5612..966a84db 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
@@ -1 +1 @@
-<a id="bookmarklet" ondragend="this.click();" href="javascript:var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');wllbg.close();void(0);">{% trans %}bag it!{% endtrans %}</a>
+<a id="bookmarklet" ondragend="this.click();" href="javascript:var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');wllbg.close();void(0);">bag it!</a>
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) %}
+    {% if form_errors(form.url) %}
-            <span class="black-text">{{ form_errors(form) }}</span>
+        <span class="black-text">{{ form_errors(form.url) }}</span>
-        {% endif %}
+    {% endif %}
-        {% if form_errors(form.url) %}
+    {{ form_label(form.url) }}
-            <span class="black-text">{{ form_errors(form.url) }}</span>
+    {{ form_widget(form.url) }}
-        {% endif %}
-        {{ 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) %}
+    {% if form_errors(form.label) %}
-            <span class="black-text">{{ form_errors(form) }}</span>
+        <span class="black-text">{{ form_errors(form.label) }}</span>
-        {% endif %}
+    {% endif %}
-        {% if form_errors(form.label) %}
+    {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
-            <span class="black-text">{{ form_errors(form.label) }}</span>
+    {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
-        {% endif %}
-        {{ 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>
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 6f8c3674..7dea1b7f 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
@@ -97,11 +97,41 @@
            </a>
            <div class="collapsible-body">
                <ul>
-                    {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans %}twitter{% endtrans %}"><span>{% trans %}twitter{% endtrans %}</span></a></li>{% endif %}
+                    {% if craue_setting('share_twitter') %}
-                    {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans %}shaarli{% endtrans %}"><span>{% trans %}shaarli{% endtrans %}</span></a></li>{% endif %}
+                        <li>
-                    {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="{% trans %}diaspora*{% endtrans %}"><span>{% trans %}diaspora*{% endtrans %}</span></a></li>{% endif %}
+                            <a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="twitter">
-                    {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans %}carrot{% endtrans %}"><span>Carrot</span></a></li>{% endif %}
+                                <span>twitter</span>
-                    {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}"><span>{% trans %}Email{% endtrans %}</span></a></li>{% endif %}
+                            </a>
+                        </li>
+                    {% endif %}
+                    {% if craue_setting('share_shaarli') %}
+                        <li>
+                            <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli">
+                                <span>shaarli</span>
+                            </a>
+                        </li>
+                    {% endif %}
+                    {% if craue_setting('share_diaspora') %}
+                        <li>
+                            <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora}">
+                                <span>diaspora}</span>
+                            </a>
+                        </li>
+                    {% endif %}
+                    {% if craue_setting('carrot') %}
+                        <li>
+                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot">
+                                <span>Carrot</span>
+                            </a>
+                        </li>
+                    {% endif %}
+                    {% if craue_setting('share_mail') %}
+                        <li>
+                            <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}">
+                                <span>{% trans %}Email{% endtrans %}</span>
+                            </a>
+                        </li>
+                    {% endif %}
                </ul>
            </div>
        </li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
index 2de53106..f1e56412 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
@@ -1,14 +1,13 @@
 <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) %}
+    {% if form_errors(form.url) %}
-            <span class="black-text">{{ form_errors(form) }}</span>
+        <span class="black-text">{{ form_errors(form.url) }}</span>
-        {% endif %}
+    {% endif %}
-        {% if form_errors(form.url) %}
+    {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }}
-            <span class="black-text">{{ form_errors(form.url) }}</span>
-        {% endif %}
-        {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website' | trans} }) }}
    <div class="hidden">{{ form_rest(form) }}</div>
 </form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
index 63b51aaa..e2795409 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
@@ -18,12 +18,10 @@
                        </ul>
                    </div>
                    <div id="set1" class="col s12">
                        <a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a>
                    </div>
                    <div id="set2" class="col s12">
                        <ul>
                            <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans %}Standard Firefox Add-On{% endtrans %}</a></li>
@@ -31,16 +29,14 @@
                        </ul>
                    </div>
                    <div id="set3" class="col s12">
                        <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>
                    </div>
                    <div id="set4" class="col s12">
                        {% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %}
                        {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
index 0534a4cc..79310307 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
@@ -1,14 +1,13 @@
 <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) %}
+    {% if form_errors(form.label) %}
-            <span class="black-text">{{ form_errors(form) }}</span>
+        <span class="black-text">{{ form_errors(form.label) }}</span>
-        {% endif %}
+    {% endif %}
-        {% if form_errors(form.label) %}
+    {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
-            <span class="black-text">{{ form_errors(form.label) }}</span>
-        {% endif %}
-        {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
    <div class="hidden">{{ form_rest(form) }}</div>
 </form>