aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml13
-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
9 files changed, 81 insertions, 46 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index b66ef538..16e8fe09 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -27,6 +27,7 @@ Search: 'Rechercher'
27Filter entries: 'Filtrer les articles' 27Filter entries: 'Filtrer les articles'
28Enter your search here: 'Saisissez votre terme de recherche' 28Enter your search here: 'Saisissez votre terme de recherche'
29Save new entry: 'Sauvegarder un nouvel article' 29Save new entry: 'Sauvegarder un nouvel article'
30Export: Exporter
30 31
31# Config screen 32# Config screen
32Settings: 'Paramètres' 33Settings: 'Paramètres'
@@ -52,6 +53,7 @@ Old password: 'Mot de passe actuel'
52New password: 'Nouveau mot de passe' 53New password: 'Nouveau mot de passe'
53Repeat new password: 'Confirmez votre nouveau mot de passe' 54Repeat new password: 'Confirmez votre nouveau mot de passe'
54Username: "Nom d'utilisateur" 55Username: "Nom d'utilisateur"
56Two factor authentication: Double authentification
55 57
56# Tagging rules 58# Tagging rules
57Tagging rules: "Règles de tag automatiques" 59Tagging rules: "Règles de tag automatiques"
@@ -83,6 +85,7 @@ One rule and another: "Une règle et l'autre"
83The domain name of the entry: "Le nom de domaine de l'article" 85The domain name of the entry: "Le nom de domaine de l'article"
84"Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches \"football\"</code>": "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>" 86"Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches \"football\"</code>": "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>"
85Rule: "Règle" 87Rule: "Règle"
88FAQ: "FAQ"
86 89
87# Entries 90# Entries
88'estimated reading time': 'durée de lecture' 91'estimated reading time': 'durée de lecture'
@@ -98,6 +101,10 @@ Edit an entry: "Éditer un article"
98Title: "Titre" 101Title: "Titre"
99Is public: "Public" 102Is public: "Public"
100 103
104# tag
105Tags: Tags
106"{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.": "{0} Il n'y a pas de tag.|{1} IL y a un tag.|]1,Inf[ Il y a %count% tags."
107
101# Filters 108# Filters
102Filters: 'Filtres' 109Filters: 'Filtres'
103Status: 'Statut' 110Status: 'Statut'
@@ -177,6 +184,8 @@ Download: 'Télécharger'
177Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?" 184Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?"
178Problems?: 'Un problème ?' 185Problems?: 'Un problème ?'
179Edit title: "Modifier le titre" 186Edit title: "Modifier le titre"
187Reload content: Recharger le contenu
188Tag added: Tag ajouté
180 189
181# Import 190# Import
182Welcome on wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer." 191Welcome on wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer."
@@ -193,8 +202,12 @@ Please select your wallabag export and click on the below button to upload and i
193File: "Fichier" 202File: "Fichier"
194Upload file: "Importer le fichier" 203Upload file: "Importer le fichier"
195Import contents: "Importer les contenus" 204Import contents: "Importer les contenus"
205Import: "Importer"
206Import > Wallabag v1: "Importer > Wallabag v1"
207Import > Wallabag v2: "Importer > Wallabag v2"
196 208
197# Quickstart 209# Quickstart
210Quickstart: Pour bien débuter
198Welcome on wallabag!: "Bienvenue sur wallabag !" 211Welcome on wallabag!: "Bienvenue sur wallabag !"
199We'll accompany you to visit wallabag and show you some features which can interess you.: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil." 212We'll accompany you to visit wallabag and show you some features which can interess you.: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil."
200Follow us!: "Suivez-nous !" 213Follow us!: "Suivez-nous !"
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:38:15 +0000