aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources/views
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-02-12 16:58:30 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-02-12 16:59:15 +0100
commitdaa2b7e7c3e7315d9ebab9d86ee8f158bc17d4b1 (patch)
tree7787d3666a21abd4b7e1285c29e3a5aea435bac0 /src/Wallabag/CoreBundle/Resources/views
parent9856805540843e32b65e2893ea870b6b2e2ba6d0 (diff)
downloadwallabag-daa2b7e7c3e7315d9ebab9d86ee8f158bc17d4b1.tar.gz
wallabag-daa2b7e7c3e7315d9ebab9d86ee8f158bc17d4b1.tar.zst
wallabag-daa2b7e7c3e7315d9ebab9d86ee8f158bc17d4b1.zip
More translations
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig17
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig17
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig40
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig15
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig15
8 files changed, 68 insertions, 46 deletions
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 @@
1<form name="entry" method="post" action="{{ path('new_entry')}}"> 1<form name="entry" method="post" action="{{ path('new_entry')}}">
2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %}
2 5
3 {% if form_errors(form) %} 6 {% if form_errors(form.url) %}
4 <span class="black-text">{{ form_errors(form) }}</span> 7 <span class="black-text">{{ form_errors(form.url) }}</span>
5 {% endif %} 8 {% endif %}
6 9
7 {% if form_errors(form.url) %} 10 {{ form_label(form.url) }}
8 <span class="black-text">{{ form_errors(form.url) }}</span> 11 {{ form_widget(form.url) }}
9 {% endif %}
10
11 {{ form_label(form.url) }}
12 {{ form_widget(form.url) }}
13 12
14 <div class="hidden">{{ form_rest(form) }}</div> 13 <div class="hidden">{{ form_rest(form) }}</div>
15</form> 14</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 @@
16 </ul> 16 </ul>
17 <h3>{% trans %}Mobile Apps{% endtrans %}</h3> 17 <h3>{% trans %}Mobile Apps{% endtrans %}</h3>
18 <ul> 18 <ul>
19 <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> 19 <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>
20 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li> 20 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
21 <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> 21 <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>
22 </ul> 22 </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 @@
1<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}"> 1<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}">
2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %}
2 5
3 {% if form_errors(form) %} 6 {% if form_errors(form.label) %}
4 <span class="black-text">{{ form_errors(form) }}</span> 7 <span class="black-text">{{ form_errors(form.label) }}</span>
5 {% endif %} 8 {% endif %}
6 9
7 {% if form_errors(form.label) %} 10 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
8 <span class="black-text">{{ form_errors(form.label) }}</span> 11 {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
9 {% endif %}
10
11 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
12 {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
13 12
14 <div class="hidden">{{ form_rest(form) }}</div> 13 <div class="hidden">{{ form_rest(form) }}</div>
15</form> 14</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 @@
97 </a> 97 </a>
98 <div class="collapsible-body"> 98 <div class="collapsible-body">
99 <ul> 99 <ul>
100 {% 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 %} 100 {% if craue_setting('share_twitter') %}
101 {% 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 %} 101 <li>
102 {% 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 %} 102 <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">
103 {% 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 %} 103 <span>twitter</span>
104 {% 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 %} 104 </a>
105 </li>
106 {% endif %}
107 {% if craue_setting('share_shaarli') %}
108 <li>
109 <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">
110 <span>shaarli</span>
111 </a>
112 </li>
113 {% endif %}
114 {% if craue_setting('share_diaspora') %}
115 <li>
116 <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}">
117 <span>diaspora}</span>
118 </a>
119 </li>
120 {% endif %}
121 {% if craue_setting('carrot') %}
122 <li>
123 <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">
124 <span>Carrot</span>
125 </a>
126 </li>
127 {% endif %}
128 {% if craue_setting('share_mail') %}
129 <li>
130 <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 %}">
131 <span>{% trans %}Email{% endtrans %}</span>
132 </a>
133 </li>
134 {% endif %}
105 </ul> 135 </ul>
106 </div> 136 </div>
107 </li> 137 </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 @@
1<form name="entry" method="post" action="{{ path('new_entry')}}"> 1<form name="entry" method="post" action="{{ path('new_entry')}}">
2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %}
2 5
3 {% if form_errors(form) %} 6 {% if form_errors(form.url) %}
4 <span class="black-text">{{ form_errors(form) }}</span> 7 <span class="black-text">{{ form_errors(form.url) }}</span>
5 {% endif %} 8 {% endif %}
6 9
7 {% if form_errors(form.url) %} 10 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }}
8 <span class="black-text">{{ form_errors(form.url) }}</span>
9 {% endif %}
10
11 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website' | trans} }) }}
12 11
13 <div class="hidden">{{ form_rest(form) }}</div> 12 <div class="hidden">{{ form_rest(form) }}</div>
14</form> 13</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 @@
18 </ul> 18 </ul>
19 </div> 19 </div>
20 20
21
22 <div id="set1" class="col s12"> 21 <div id="set1" class="col s12">
23 <a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a> 22 <a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a>
24 </div> 23 </div>
25 24
26
27 <div id="set2" class="col s12"> 25 <div id="set2" class="col s12">
28 <ul> 26 <ul>
29 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans %}Standard Firefox Add-On{% endtrans %}</a></li> 27 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans %}Standard Firefox Add-On{% endtrans %}</a></li>
@@ -31,16 +29,14 @@
31 </ul> 29 </ul>
32 </div> 30 </div>
33 31
34
35 <div id="set3" class="col s12"> 32 <div id="set3" class="col s12">
36 <ul> 33 <ul>
37 <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> 34 <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>
38 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li> 35 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
39 <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> 36 <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>
40 </ul> 37 </ul>
41 </div> 38 </div>
42 39
43
44 <div id="set4" class="col s12"> 40 <div id="set4" class="col s12">
45 {% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %} 41 {% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %}
46 {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} 42 {% 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 @@
1<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}"> 1<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}">
2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %}
2 5
3 {% if form_errors(form) %} 6 {% if form_errors(form.label) %}
4 <span class="black-text">{{ form_errors(form) }}</span> 7 <span class="black-text">{{ form_errors(form.label) }}</span>
5 {% endif %} 8 {% endif %}
6 9
7 {% if form_errors(form.label) %} 10 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
8 <span class="black-text">{{ form_errors(form.label) }}</span>
9 {% endif %}
10
11 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
12 11
13 <div class="hidden">{{ form_rest(form) }}</div> 12 <div class="hidden">{{ form_rest(form) }}</div>
14</form> 13</form>