Merge pull request #1774 from wallabag/v2-key-translation

Switch to keys in translated files

4 files changed, 32 insertions, 25 deletions

diff --git a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
index 8c300624..aebbfa20 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
@@ -1,17 +1,18 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{% trans %}Import{% endtrans %}{% endblock %}
+
+{% block title %}{{ 'import.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% trans %}Welcome to wallabag importer. Please select your previous service that you want to migrate.{% endtrans %}
+            {{ 'import.page_description'|trans }}
             <ul>
                 {% for import in imports %}
                     <li>
                         <h5>{{ import.name }}</h5>
                         <blockquote>{{ import.description|trans }}</blockquote>
-                        <p><a class="waves-effect waves-light btn" href="{{ path(import.url) }}">{% trans %}Import contents{% endtrans %}</a></p>
+                        <p><a class="waves-effect waves-light btn" href="{{ path(import.url) }}">{{ 'import.action.import_contents'|trans }}</a></p>
                     </li>
                 {% endfor %}
             </ul>
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index 3365fc6a..401dbd33 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -1,5 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{% trans %}Import > Pocket{% endtrans %}{% endblock %}
+
+{% block title %}{{ 'import.pocket.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
@@ -7,27 +8,29 @@
         <div class="card-panel settings">
             {% if not has_consumer_key %}
                 <div class="card-panel red darken-1">
-                    {% trans %}Pocket import isn't configured.{% endtrans %}
+                    {{ 'import.pocket.config_missing.description'|trans }}
+
                     {% if is_granted('ROLE_SUPER_ADMIN') %}
-                        {% trans with {'%keyurls%': '<a href="' ~ path('craue_config_settings_modify') ~ '#set-import">', '%keyurle%':'</a>'} %}You need to define %keyurls% a pocket_consumer_key %keyurle%.{% endtrans %}
+                        {{ 'import.pocket.config_missing.admin_message'|trans({'%keyurls%': '<a href="' ~ path('craue_config_settings_modify') ~ '#set-import">', '%keyurle%':'</a>'})|raw }}
                     {% else %}
-                        {% trans %}Your server admin needs to define an API Key for Pocket.{% endtrans %}
+                        {{ 'import.pocket.config_missing.user_message'|trans }}
                     {% endif %}
                 </div>
             {% endif %}
 
             <blockquote>{{ import.description|trans }}</blockquote>
-            <p>{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}</p>
+            <p>{{ 'import.pocket.authorize_message'|trans }}</p>
+
             <form method="post" action="{{ path('import_pocket_auth') }}">
-            <div class="row">
-                <div class="input-field col s6 with-checkbox">
-                    <h6>{% trans %}Mark all as read ?{% endtrans %}</h6>
-                        {{ form_widget(form.read) }}
-                    <label for="form_read">{% trans %}Mark all imported entries as read{% endtrans %}</label>
+                <div class="row">
+                    <div class="input-field col s6 with-checkbox">
+                        <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                        {{ form_widget(form.mark_as_read) }}
+                        {{ form_label(form.mark_as_read) }}
+                    </div>
                 </div>
-            </div>
                 <button class="btn waves-effect waves-light" type="submit" name="action">
-                    {% trans %}Connect to Pocket and import data{% endtrans %}
+                    {{ 'import.pocket.connect_to_pocket'|trans }}
                 </button>
             </form>
         </div>
diff --git a/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig
index a418ed1c..13e24c8c 100644
--- a/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig
@@ -1,5 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{% trans %}Import > Wallabag v1{% endtrans %}{% endblock %}
+
+{% block title %}{{ 'import.wallabag_v1.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
@@ -7,7 +8,8 @@
         <div class="card-panel settings">
             <div class="row">
                 <blockquote>{{ import.description|trans }}</blockquote>
-                <p>{% trans %}Please select your wallabag export and click on the below button to upload and import it.{% endtrans %}</p>
+                <p>{{ 'import.wallabag_v1.how_to'|trans }}</p>
+
                 <div class="col s12">
                     {{ form_start(form, {'method': 'POST'}) }}
                         {{ form_errors(form) }}
@@ -15,7 +17,7 @@
                             <div class="file-field input-field col s12">
                                 {{ form_errors(form.file) }}
                                 <div class="btn">
-                                    <span>{% trans %}File{% endtrans %}</span>
+                                    <span>{{ form.file.vars.label|trans }}</span>
                                     {{ form_widget(form.file) }}
                                 </div>
                                 <div class="file-path-wrapper">
@@ -23,15 +25,15 @@
                                 </div>
                             </div>
                             <div class="input-field col s6 with-checkbox">
-                                <h6>{% trans %}Mark all as read ?{% endtrans %}</h6>
+                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
                                 {{ form_widget(form.mark_as_read) }}
-                                <label for="upload_import_file_mark_as_read">{% trans %}Mark all imported entries as read{% endtrans %}</label>
+                                {{ form_label(form.mark_as_read) }}
                             </div>
                         </div>
-                        <div class="hidden">{{ form_rest(form) }}</div>
-                        <button class="btn waves-effect waves-light" type="submit" name="action">
-                            {% trans %}Upload file{% endtrans %}
-                        </button>
+
+                        {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'} }) }}
+
+                        {{ form_rest(form) }}
                     </form>
                 </div>
             </div>
diff --git a/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig
index 78fe67e4..c2905fc6 100644
--- a/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig
@@ -1,2 +1,3 @@
 {% extends "WallabagImportBundle:WallabagV1:index.html.twig" %}
-{% block title %}{% trans %}Import > Wallabag v2{% endtrans %}{% endblock %}
+
+{% block title %}{{ 'import.wallabag_v2.page_title'|trans }}{% endblock %}