aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/ImportBundle/Resources
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-03-21 12:47:57 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-03-21 12:47:57 +0100
commit439b36323e37f669b056cc5228c44bb91196256c (patch)
treeecd84477adf3e12819b26aff2a6d2e644e45ea72 /src/Wallabag/ImportBundle/Resources
parentbd46de6b25f982e1a0d3f975971fe8014db13833 (diff)
parent4083887afe4dd3f568b2dfea3392506b554c79b8 (diff)
downloadwallabag-439b36323e37f669b056cc5228c44bb91196256c.tar.gz
wallabag-439b36323e37f669b056cc5228c44bb91196256c.tar.zst
wallabag-439b36323e37f669b056cc5228c44bb91196256c.zip
Merge pull request #1774 from wallabag/v2-key-translation
Switch to keys in translated files
Diffstat (limited to 'src/Wallabag/ImportBundle/Resources')
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig7
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig27
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig20
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig3
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 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2{% block title %}{% trans %}Import{% endtrans %}{% endblock %} 2
3{% block title %}{{ 'import.page_title'|trans }}{% endblock %}
3 4
4{% block content %} 5{% block content %}
5<div class="row"> 6<div class="row">
6 <div class="col s12"> 7 <div class="col s12">
7 <div class="card-panel settings"> 8 <div class="card-panel settings">
8 {% trans %}Welcome to wallabag importer. Please select your previous service that you want to migrate.{% endtrans %} 9 {{ 'import.page_description'|trans }}
9 <ul> 10 <ul>
10 {% for import in imports %} 11 {% for import in imports %}
11 <li> 12 <li>
12 <h5>{{ import.name }}</h5> 13 <h5>{{ import.name }}</h5>
13 <blockquote>{{ import.description|trans }}</blockquote> 14 <blockquote>{{ import.description|trans }}</blockquote>
14 <p><a class="waves-effect waves-light btn" href="{{ path(import.url) }}">{% trans %}Import contents{% endtrans %}</a></p> 15 <p><a class="waves-effect waves-light btn" href="{{ path(import.url) }}">{{ 'import.action.import_contents'|trans }}</a></p>
15 </li> 16 </li>
16 {% endfor %} 17 {% endfor %}
17 </ul> 18 </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 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2{% block title %}{% trans %}Import > Pocket{% endtrans %}{% endblock %} 2
3{% block title %}{{ 'import.pocket.page_title'|trans }}{% endblock %}
3 4
4{% block content %} 5{% block content %}
5<div class="row"> 6<div class="row">
@@ -7,27 +8,29 @@
7 <div class="card-panel settings"> 8 <div class="card-panel settings">
8 {% if not has_consumer_key %} 9 {% if not has_consumer_key %}
9 <div class="card-panel red darken-1"> 10 <div class="card-panel red darken-1">
10 {% trans %}Pocket import isn't configured.{% endtrans %} 11 {{ 'import.pocket.config_missing.description'|trans }}
12
11 {% if is_granted('ROLE_SUPER_ADMIN') %} 13 {% if is_granted('ROLE_SUPER_ADMIN') %}
12 {% 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 %} 14 {{ 'import.pocket.config_missing.admin_message'|trans({'%keyurls%': '<a href="' ~ path('craue_config_settings_modify') ~ '#set-import">', '%keyurle%':'</a>'})|raw }}
13 {% else %} 15 {% else %}
14 {% trans %}Your server admin needs to define an API Key for Pocket.{% endtrans %} 16 {{ 'import.pocket.config_missing.user_message'|trans }}
15 {% endif %} 17 {% endif %}
16 </div> 18 </div>
17 {% endif %} 19 {% endif %}
18 20
19 <blockquote>{{ import.description|trans }}</blockquote> 21 <blockquote>{{ import.description|trans }}</blockquote>
20 <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> 22 <p>{{ 'import.pocket.authorize_message'|trans }}</p>
23
21 <form method="post" action="{{ path('import_pocket_auth') }}"> 24 <form method="post" action="{{ path('import_pocket_auth') }}">
22 <div class="row"> 25 <div class="row">
23 <div class="input-field col s6 with-checkbox"> 26 <div class="input-field col s6 with-checkbox">
24 <h6>{% trans %}Mark all as read ?{% endtrans %}</h6> 27 <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
25 {{ form_widget(form.read) }} 28 {{ form_widget(form.mark_as_read) }}
26 <label for="form_read">{% trans %}Mark all imported entries as read{% endtrans %}</label> 29 {{ form_label(form.mark_as_read) }}
30 </div>
27 </div> 31 </div>
28 </div>
29 <button class="btn waves-effect waves-light" type="submit" name="action"> 32 <button class="btn waves-effect waves-light" type="submit" name="action">
30 {% trans %}Connect to Pocket and import data{% endtrans %} 33 {{ 'import.pocket.connect_to_pocket'|trans }}
31 </button> 34 </button>
32 </form> 35 </form>
33 </div> 36 </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 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2{% block title %}{% trans %}Import > Wallabag v1{% endtrans %}{% endblock %} 2
3{% block title %}{{ 'import.wallabag_v1.page_title'|trans }}{% endblock %}
3 4
4{% block content %} 5{% block content %}
5<div class="row"> 6<div class="row">
@@ -7,7 +8,8 @@
7 <div class="card-panel settings"> 8 <div class="card-panel settings">
8 <div class="row"> 9 <div class="row">
9 <blockquote>{{ import.description|trans }}</blockquote> 10 <blockquote>{{ import.description|trans }}</blockquote>
10 <p>{% trans %}Please select your wallabag export and click on the below button to upload and import it.{% endtrans %}</p> 11 <p>{{ 'import.wallabag_v1.how_to'|trans }}</p>
12
11 <div class="col s12"> 13 <div class="col s12">
12 {{ form_start(form, {'method': 'POST'}) }} 14 {{ form_start(form, {'method': 'POST'}) }}
13 {{ form_errors(form) }} 15 {{ form_errors(form) }}
@@ -15,7 +17,7 @@
15 <div class="file-field input-field col s12"> 17 <div class="file-field input-field col s12">
16 {{ form_errors(form.file) }} 18 {{ form_errors(form.file) }}
17 <div class="btn"> 19 <div class="btn">
18 <span>{% trans %}File{% endtrans %}</span> 20 <span>{{ form.file.vars.label|trans }}</span>
19 {{ form_widget(form.file) }} 21 {{ form_widget(form.file) }}
20 </div> 22 </div>
21 <div class="file-path-wrapper"> 23 <div class="file-path-wrapper">
@@ -23,15 +25,15 @@
23 </div> 25 </div>
24 </div> 26 </div>
25 <div class="input-field col s6 with-checkbox"> 27 <div class="input-field col s6 with-checkbox">
26 <h6>{% trans %}Mark all as read ?{% endtrans %}</h6> 28 <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
27 {{ form_widget(form.mark_as_read) }} 29 {{ form_widget(form.mark_as_read) }}
28 <label for="upload_import_file_mark_as_read">{% trans %}Mark all imported entries as read{% endtrans %}</label> 30 {{ form_label(form.mark_as_read) }}
29 </div> 31 </div>
30 </div> 32 </div>
31 <div class="hidden">{{ form_rest(form) }}</div> 33
32 <button class="btn waves-effect waves-light" type="submit" name="action"> 34 {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'} }) }}
33 {% trans %}Upload file{% endtrans %} 35
34 </button> 36 {{ form_rest(form) }}
35 </form> 37 </form>
36 </div> 38 </div>
37 </div> 39 </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 @@
1{% extends "WallabagImportBundle:WallabagV1:index.html.twig" %} 1{% extends "WallabagImportBundle:WallabagV1:index.html.twig" %}
2{% block title %}{% trans %}Import > Wallabag v2{% endtrans %}{% endblock %} 2
3{% block title %}{{ 'import.wallabag_v2.page_title'|trans }}{% endblock %}