diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-03-21 12:47:57 +0100 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-03-21 12:47:57 +0100 |
commit | 439b36323e37f669b056cc5228c44bb91196256c (patch) | |
tree | ecd84477adf3e12819b26aff2a6d2e644e45ea72 /src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config | |
parent | bd46de6b25f982e1a0d3f975971fe8014db13833 (diff) | |
parent | 4083887afe4dd3f568b2dfea3392506b554c79b8 (diff) | |
download | wallabag-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/CoreBundle/Resources/views/themes/baggy/Config')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 58 |
1 files changed, 34 insertions, 24 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 54faa788..89e6e076 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -1,9 +1,9 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{% trans %}Config{% endtrans %}{% endblock %} | 3 | {% block title %}{{ 'config.page_title'|trans }}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | <h2>{% trans %}Wallabag configuration{% endtrans %}</h2> | 6 | <h2>{{ 'config.tab_menu.settings'|trans }}</h2> |
7 | 7 | ||
8 | {{ form_start(form.config) }} | 8 | {{ form_start(form.config) }} |
9 | {{ form_errors(form.config) }} | 9 | {{ form_errors(form.config) }} |
@@ -29,7 +29,10 @@ | |||
29 | {{ form_label(form.config.reading_speed) }} | 29 | {{ form_label(form.config.reading_speed) }} |
30 | {{ form_errors(form.config.reading_speed) }} | 30 | {{ form_errors(form.config.reading_speed) }} |
31 | {{ form_widget(form.config.reading_speed) }} | 31 | {{ form_widget(form.config.reading_speed) }} |
32 | <p>{% trans %}You can use online tools to estimate your reading speed{% endtrans %} (<a href="http://www.myreadspeed.com/calculate/">{% trans %}like this one{%endtrans%}</a>).</p> | 32 | <p> |
33 | {{ 'config.form_settings.reading_speed.help_message'|trans }} | ||
34 | <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> | ||
35 | </p> | ||
33 | </div> | 36 | </div> |
34 | </fieldset> | 37 | </fieldset> |
35 | 38 | ||
@@ -44,13 +47,13 @@ | |||
44 | {{ form_rest(form.config) }} | 47 | {{ form_rest(form.config) }} |
45 | </form> | 48 | </form> |
46 | 49 | ||
47 | <h2>{% trans %}RSS configuration{% endtrans %}</h2> | 50 | <h2>{{ 'config.tab_menu.rss'|trans }}</h2> |
48 | 51 | ||
49 | {{ form_start(form.rss) }} | 52 | {{ form_start(form.rss) }} |
50 | {{ form_errors(form.rss) }} | 53 | {{ form_errors(form.rss) }} |
51 | 54 | ||
52 | <div class="row"> | 55 | <div class="row"> |
53 | {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader.{% endtrans %} | 56 | {{ 'config.form_rss.description'|trans }} |
54 | </div> | 57 | </div> |
55 | 58 | ||
56 | <fieldset class="w500p inline"> | 59 | <fieldset class="w500p inline"> |
@@ -59,27 +62,31 @@ | |||
59 | {% if rss.token %} | 62 | {% if rss.token %} |
60 | {{ rss.token }} | 63 | {{ rss.token }} |
61 | {% else %} | 64 | {% else %} |
62 | <em>No token</em> | 65 | <em>{{ 'config.form_rss.no_token'|trans }}</em> |
63 | {% endif %} | 66 | {% endif %} |
64 | – | 67 | – |
65 | <a href="{{ path('generate_token') }}">Regenerate ?</a> | 68 | <a href="{{ path('generate_token') }}"> |
69 | {% if rss.token %} | ||
70 | {{ 'config.form_rss.token_reset'|trans }} | ||
71 | {% else %} | ||
72 | {{ 'config.form_rss.token_create'|trans }} | ||
73 | {% endif %} | ||
74 | </a> | ||
66 | </div> | 75 | </div> |
67 | </fieldset> | 76 | </fieldset> |
68 | 77 | ||
78 | {% if rss.token %} | ||
69 | <fieldset class="w500p inline"> | 79 | <fieldset class="w500p inline"> |
70 | <div class="row"> | 80 | <div class="row"> |
71 | <label>Rss links:</label> | 81 | <label>{{ 'config.form_rss.rss_links'|trans }}</label> |
72 | {% if rss.token %} | 82 | <ul> |
73 | <ul> | 83 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li> |
74 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li> | 84 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li> |
75 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li> | 85 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li> |
76 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li> | 86 | </ul> |
77 | </ul> | ||
78 | {% else %} | ||
79 | <strong>You need to generate a token first.</strong> | ||
80 | {% endif %} | ||
81 | </div> | 87 | </div> |
82 | </fieldset> | 88 | </fieldset> |
89 | {% endif %} | ||
83 | 90 | ||
84 | <fieldset class="w500p inline"> | 91 | <fieldset class="w500p inline"> |
85 | <div class="row"> | 92 | <div class="row"> |
@@ -92,7 +99,7 @@ | |||
92 | {{ form_rest(form.rss) }} | 99 | {{ form_rest(form.rss) }} |
93 | </form> | 100 | </form> |
94 | 101 | ||
95 | <h2>{% trans %}User information{% endtrans %}</h2> | 102 | <h2>{{ 'config.tab_menu.user_info'|trans }}</h2> |
96 | 103 | ||
97 | {{ form_start(form.user) }} | 104 | {{ form_start(form.user) }} |
98 | {{ form_errors(form.user) }} | 105 | {{ form_errors(form.user) }} |
@@ -115,7 +122,7 @@ | |||
115 | 122 | ||
116 | {% if twofactor_auth %} | 123 | {% if twofactor_auth %} |
117 | <div class="row"> | 124 | <div class="row"> |
118 | {% trans %}Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion{% endtrans %} | 125 | {{ 'config.form_user.two_factor_description'|trans }} |
119 | </div> | 126 | </div> |
120 | 127 | ||
121 | <fieldset class="w500p inline"> | 128 | <fieldset class="w500p inline"> |
@@ -130,7 +137,7 @@ | |||
130 | {{ form_rest(form.user) }} | 137 | {{ form_rest(form.user) }} |
131 | </form> | 138 | </form> |
132 | 139 | ||
133 | <h2>{% trans %}Change your password{% endtrans %}</h2> | 140 | <h2>{{ 'config.tab_menu.password'|trans }}</h2> |
134 | 141 | ||
135 | {{ form_start(form.pwd) }} | 142 | {{ form_start(form.pwd) }} |
136 | {{ form_errors(form.pwd) }} | 143 | {{ form_errors(form.pwd) }} |
@@ -162,13 +169,16 @@ | |||
162 | {{ form_rest(form.pwd) }} | 169 | {{ form_rest(form.pwd) }} |
163 | </form> | 170 | </form> |
164 | 171 | ||
165 | <h2>{% trans %}Tagging rules{% endtrans %}</h2> | 172 | <h2>{{ 'config.tab_menu.rules'|trans }}}</h2> |
166 | 173 | ||
167 | <ul> | 174 | <ul> |
168 | {% for tagging_rule in app.user.config.taggingRules %} | 175 | {% for tagging_rule in app.user.config.taggingRules %} |
169 | <li> | 176 | <li> |
170 | if « {{ tagging_rule.rule }} » then tag as « {{ tagging_rule.tags|join(', ') }} » | 177 | {{ 'config.form_rules.if_label'|trans }} |
171 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{% trans %}Delete{% endtrans %}" class="tool delete icon-trash icon"></a> | 178 | « {{ tagging_rule.rule }} » |
179 | {{ 'config.form_rules.then_tag_as_label'|trans }} | ||
180 | « {{ tagging_rule.tags|join(', ') }} » | ||
181 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="tool delete icon-trash icon"></a> | ||
172 | </li> | 182 | </li> |
173 | {% endfor %} | 183 | {% endfor %} |
174 | </ul> | 184 | </ul> |
@@ -196,7 +206,7 @@ | |||
196 | </form> | 206 | </form> |
197 | 207 | ||
198 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 208 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
199 | <h2>{% trans %}Add a user{% endtrans %}</h2> | 209 | <h2>{{ 'config.tab_menu.new_user'|trans }}</h2> |
200 | 210 | ||
201 | {{ form_start(form.new_user) }} | 211 | {{ form_start(form.new_user) }} |
202 | {{ form_errors(form.new_user) }} | 212 | {{ form_errors(form.new_user) }} |