diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-11 16:48:46 +0100 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-11 16:48:46 +0100 |
commit | 5db084e05b84ac87179336b96b5db9579fa78c67 (patch) | |
tree | c028058ea37c012e898dbdbfe11e84427aac1a39 /src/Wallabag/CoreBundle/Resources/views/themes | |
parent | 6896ae1dda1e399ce39111b28f8f6fbc1d71e14f (diff) | |
parent | d7807ff5f61ca4de175c20f36ff735d40a993faf (diff) | |
download | wallabag-5db084e05b84ac87179336b96b5db9579fa78c67.tar.gz wallabag-5db084e05b84ac87179336b96b5db9579fa78c67.tar.zst wallabag-5db084e05b84ac87179336b96b5db9579fa78c67.zip |
Merge pull request #1665 from wallabag/v2-translations
lots of diverse translation stuff & some typos
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes')
4 files changed, 7 insertions, 15 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 1cae90a4..e388f2c8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -238,21 +238,14 @@ | |||
238 | <h5>{% trans %}What does « tagging rules » mean?{% endtrans %}</h5> | 238 | <h5>{% trans %}What does « tagging rules » mean?{% endtrans %}</h5> |
239 | <p class="help"> | 239 | <p class="help"> |
240 | {% trans %} | 240 | {% trans %} |
241 | They are rules used by Wallabag to automatically tag new entries.<br /> | 241 | They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries. |
242 | Each time a new entry is added, all the tagging rules will be used to add | ||
243 | the tags you configured, thus saving you the trouble to manually classify | ||
244 | your entries. | ||
245 | {% endtrans %} | 242 | {% endtrans %} |
246 | </p> | 243 | </p> |
247 | 244 | ||
248 | <h5>{% trans %}How do I use them?{% endtrans %}</h5> | 245 | <h5>{% trans %}How do I use them?{% endtrans %}</h5> |
249 | <p class="help"> | 246 | <p class="help"> |
250 | {% trans %} | 247 | {% trans %} |
251 | Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br /> | 248 | Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime <= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime >= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> » |
252 | In that case, you should put « readingTime <= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> | ||
253 | field.<br /> | ||
254 | Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br /> | ||
255 | Complex rules can be written by using predefined operators: if « <i>readingTime >= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> » | ||
256 | {% endtrans %} | 249 | {% endtrans %} |
257 | </p> | 250 | </p> |
258 | 251 | ||
@@ -290,7 +283,7 @@ | |||
290 | <td>{% trans %}Greater than…{% endtrans %}</td> | 283 | <td>{% trans %}Greater than…{% endtrans %}</td> |
291 | </tr> | 284 | </tr> |
292 | <tr> | 285 | <tr> |
293 | <td>isStared</td> | 286 | <td>isStarred</td> |
294 | <td>{% trans %}Whether the entry is starred or not{% endtrans %}</td> | 287 | <td>{% trans %}Whether the entry is starred or not{% endtrans %}</td> |
295 | <td>></td> | 288 | <td>></td> |
296 | <td>{% trans %}Strictly greater than…{% endtrans %}</td> | 289 | <td>{% trans %}Strictly greater than…{% endtrans %}</td> |
@@ -325,8 +318,7 @@ | |||
325 | <td>matches</td> | 318 | <td>matches</td> |
326 | <td> | 319 | <td> |
327 | {% trans %} | 320 | {% trans %} |
328 | Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br /> | 321 | Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code> |
329 | Example: <code>title matches "football"</code> | ||
330 | {% endtrans %} | 322 | {% endtrans %} |
331 | </td> | 323 | </td> |
332 | </tr> | 324 | </tr> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 3b7698f3..ac17ccee 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -162,7 +162,7 @@ | |||
162 | </div> | 162 | </div> |
163 | 163 | ||
164 | <div class="input-field col s12"> | 164 | <div class="input-field col s12"> |
165 | {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }} | 165 | {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com' | trans} }) }} |
166 | <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label> | 166 | <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label> |
167 | </div> | 167 | </div> |
168 | 168 | ||
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 47e3bc78..2de53106 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 | |||
@@ -8,7 +8,7 @@ | |||
8 | <span class="black-text">{{ form_errors(form.url) }}</span> | 8 | <span class="black-text">{{ form_errors(form.url) }}</span> |
9 | {% endif %} | 9 | {% endif %} |
10 | 10 | ||
11 | {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }} | 11 | {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website' | trans} }) }} |
12 | 12 | ||
13 | <div class="hidden">{{ form_rest(form) }}</div> | 13 | <div class="hidden">{{ form_rest(form) }}</div> |
14 | </form> | 14 | </form> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index dff9e612..d7bfa7ae 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -115,7 +115,7 @@ | |||
115 | <div class="footer-copyright"> | 115 | <div class="footer-copyright"> |
116 | <div class="container"> | 116 | <div class="container"> |
117 | <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> | 117 | <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> |
118 | <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}about{% endtrans %}</a> | 118 | <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a> |
119 | </div> | 119 | </div> |
120 | </div> | 120 | </div> |
121 | </footer> | 121 | </footer> |