diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-01 11:49:13 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-01 11:49:13 +0200 |
commit | 0e8f77819951bf8c6fa47fba7c0e004bdb7e7a41 (patch) | |
tree | e85fc355c5d45cf962de60c3f793bda6cf26294f /src/Wallabag/CoreBundle | |
parent | 7c99da0c958687033468098a92913619bef17f03 (diff) | |
parent | 4e9f656ecbfb89449e44a56d82ca36812a61fc73 (diff) | |
download | wallabag-0e8f77819951bf8c6fa47fba7c0e004bdb7e7a41.tar.gz wallabag-0e8f77819951bf8c6fa47fba7c0e004bdb7e7a41.tar.zst wallabag-0e8f77819951bf8c6fa47fba7c0e004bdb7e7a41.zip |
Merge pull request #1441 from wallabag/v2-french-translation
Add french translation
Diffstat (limited to 'src/Wallabag/CoreBundle')
12 files changed, 172 insertions, 40 deletions
diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index f40c1c2d..2e6d6ff7 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php | |||
@@ -15,7 +15,7 @@ class EntryFilterType extends AbstractType | |||
15 | private $repository; | 15 | private $repository; |
16 | 16 | ||
17 | /** | 17 | /** |
18 | * Repository & user are used to get a list of language entries for this user | 18 | * Repository & user are used to get a list of language entries for this user. |
19 | * | 19 | * |
20 | * @param EntityRepository $entryRepository | 20 | * @param EntityRepository $entryRepository |
21 | * @param User $user | 21 | * @param User $user |
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 2286317c..57bf8024 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
@@ -163,9 +163,9 @@ class EntryRepository extends EntityRepository | |||
163 | } | 163 | } |
164 | 164 | ||
165 | /** | 165 | /** |
166 | * Used only in test case to get the right entry associated to the right user | 166 | * Used only in test case to get the right entry associated to the right user. |
167 | * | 167 | * |
168 | * @param string $username | 168 | * @param string $username |
169 | * | 169 | * |
170 | * @return Entry | 170 | * @return Entry |
171 | */ | 171 | */ |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml new file mode 100644 index 00000000..aced4d83 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -0,0 +1,130 @@ | |||
1 | #Login | ||
2 | Keep me logged in: 'Rester connecté' | ||
3 | Forgot your password?: 'Mot de passe oublié ?' | ||
4 | Login: 'Se connecter' | ||
5 | Back to login: 'Revenir au formulaire de connexion' | ||
6 | Send: 'Envoyer' | ||
7 | "Enter your email address below and we'll send you password reset instructions.": "Saisissez votre adresse e-mail ci-dessous, nous vous enverrons les instructions pour réinitialiser votre mot de passe." | ||
8 | |||
9 | # Menu | ||
10 | unread: 'Non lus' | ||
11 | starred: 'Favoris' | ||
12 | archive: 'Lus' | ||
13 | all: 'Tous les articles' | ||
14 | tags: 'Tags' | ||
15 | config: 'Configuration' | ||
16 | howto: 'Aide' | ||
17 | logout: 'Déconnexion' | ||
18 | Filtered: 'Articles filtrés' | ||
19 | About: 'À propos' | ||
20 | |||
21 | # Header | ||
22 | Back to unread articles: 'Retour aux articles non lus' | ||
23 | Add a new entry: 'Sauvegarder un nouvel article' | ||
24 | Search: 'Rechercher' | ||
25 | Filter entries: 'Filtrer les articles' | ||
26 | Enter your search here: 'Saisissez votre terme de recherche' | ||
27 | Save new entry: 'Sauvegarder un nouvel article' | ||
28 | |||
29 | # Config screen | ||
30 | Settings: 'Paramètres' | ||
31 | User information: 'Mon compte' | ||
32 | Password: 'Mot de passe' | ||
33 | RSS: 'RSS' | ||
34 | Add a user: 'Créer un compte' | ||
35 | Theme: 'Thème' | ||
36 | Items per page: "Nombre d'articles par page" | ||
37 | Language: 'Langue' | ||
38 | Save: 'Enregistrer' | ||
39 | RSS token: 'Jeton RSS' | ||
40 | Name: 'Nom' | ||
41 | Email: 'Adresse e-mail' | ||
42 | No token: 'Aucun jeton généré' | ||
43 | Reset your token: 'Réinitialisez votre jeton' | ||
44 | Create your token: 'Créez votre jeton' | ||
45 | Rss limit: "Nombre d'articles dans un flux RSS" | ||
46 | RSS links: 'URL de vos flux RSS' | ||
47 | "RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.": "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d'abord créer un jeton." | ||
48 | Old password: 'Mot de passe actuel' | ||
49 | New password: 'Nouveau mot de passe' | ||
50 | Repeat new password: 'Confirmez votre nouveau mot de passe' | ||
51 | Username: "Nom d'utilisateur" | ||
52 | |||
53 | # Entries | ||
54 | 'estimated reading time': 'durée de lecture' | ||
55 | original: original | ||
56 | Toggle mark as read: 'Marquer comme lu/non lu' | ||
57 | Toggle favorite: 'Marquer comme favori' | ||
58 | Delete: 'Supprimer' | ||
59 | |||
60 | # Filters | ||
61 | Filters: 'Filtres' | ||
62 | Status: 'Statut' | ||
63 | Archived: 'Lu' | ||
64 | Starred: 'Favori' | ||
65 | Preview picture: 'Photo' | ||
66 | Has a preview picture: 'A une photo' | ||
67 | Reading time in minutes: 'Durée de lecture en minutes' | ||
68 | from: 'de' | ||
69 | to: 'à' | ||
70 | website.com: 'website.com' | ||
71 | Domain name: 'Nom de domaine' | ||
72 | Creation date: 'Date de création' | ||
73 | dd/mm/yyyy: 'dd/mm/aaaa' | ||
74 | Clear: 'Effacer' | ||
75 | Filter: 'Filtrer' | ||
76 | |||
77 | # About | ||
78 | Who is behind wallabag: "L'équipe derrière wallabag" | ||
79 | Getting help: "Besoin d'aide" | ||
80 | Helping wallabag: "Aider wallabag" | ||
81 | Developed by: "Développé par" | ||
82 | website: "Site web" | ||
83 | And many others contributors ♥: "Et plein de contributeurs ♥" | ||
84 | on GitHub: "sur GitHub" | ||
85 | Project website: "Site web du projet" | ||
86 | License: "Licence" | ||
87 | Version: "Version" | ||
88 | Documentation: "Documentation" | ||
89 | Bug reports: "Rapport de bugs" | ||
90 | On our support website: "Sur notre site de support" | ||
91 | or: "ou" | ||
92 | "wallabag is free and opensource. You can help us:": "wallabag est gratuit et opensource. Vous pouvez nous aider :" | ||
93 | "by contributing to the project:": "en contribuant au projet :" | ||
94 | an issue lists all our needs: "un ticket recense tous nos besoins" | ||
95 | via Paypal: "via Paypal" | ||
96 | via Flattr: "via Flattr" | ||
97 | |||
98 | # Howto | ||
99 | Form: Formulaire | ||
100 | Thanks to this form: "Grâce à ce formulaire" | ||
101 | Browser addons: "Extensions de navigateur" | ||
102 | Mobile apps: "Applications smartphone" | ||
103 | Bookmarklet: "Bookmarklet" | ||
104 | Standard Firefox Add-On: "Extension Firefox" | ||
105 | Chrome Extension: "Extension Chrome" | ||
106 | download the application: "téléchargez l'application" | ||
107 | "Drag & drop this link to your bookmarks bar:": "Glissez et déposez ce lien dans votre barre de favoris :" | ||
108 | |||
109 | # Flash messages | ||
110 | Information updated: "Vos informations personnelles ont bien été mises à jour" | ||
111 | Config saved: "Les paramètres de wallabag ont bien été mis à jour" | ||
112 | RSS information updated: "La configuration des flux RSS a bien été mise à jour" | ||
113 | Password updated: "Votre mot de passe a bien été mis à jour" | ||
114 | Entry starred: "Article ajouté dans les favoris" | ||
115 | Entry unstarred: "Article retiré des favoris" | ||
116 | Entry archived: "Article marqué comme lu" | ||
117 | Entry unarchived: "Article marqué comme non lu" | ||
118 | Entry deleted: "Article supprimé" | ||
119 | |||
120 | # Entry | ||
121 | Mark as read: 'Marquer comme lu' | ||
122 | Favorite: 'Mettre en favori' | ||
123 | back: 'Retour' | ||
124 | original article: 'Article original' | ||
125 | Add a tag: 'Ajouter un tag' | ||
126 | Share: 'Partager' | ||
127 | Download: 'Télécharger' | ||
128 | Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?" | ||
129 | Problems?: 'Un problème ?' | ||
130 | Edit title: "Modifier le titre" | ||
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 3ec31a02..0ff21f22 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{% trans %}Config{% endtrans %}{% endblock %} | 3 | {% block title %}{% trans %}config{% endtrans %}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | 6 | ||
@@ -11,7 +11,7 @@ | |||
11 | <div class="row"> | 11 | <div class="row"> |
12 | <div class="div_tabs col s12"> | 12 | <div class="div_tabs col s12"> |
13 | <ul class="tabs"> | 13 | <ul class="tabs"> |
14 | <li class="tab col s3"><a class="active" href="#set1">{% trans %}Wallabag{% endtrans %}</a></li> | 14 | <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li> |
15 | <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> | 15 | <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> |
16 | <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> | 16 | <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> |
17 | <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> | 17 | <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> |
@@ -62,33 +62,36 @@ | |||
62 | 62 | ||
63 | <div class="row"> | 63 | <div class="row"> |
64 | <div class="input-field col s12"> | 64 | <div class="input-field col s12"> |
65 | <label>Rss token</label> | 65 | {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.{% endtrans %} |
66 | </div> | ||
67 | </div> | ||
68 | |||
69 | <div class="row"> | ||
70 | <div class="input-field col s12"> | ||
71 | <label>{% trans %}RSS token{% endtrans %}</label> | ||
66 | <div> | 72 | <div> |
67 | {% if rss.token %} | 73 | {% if rss.token %} |
68 | {{ rss.token }} | 74 | {{ rss.token }} |
69 | {% else %} | 75 | {% else %} |
70 | <em>No token</em> | 76 | <em>{% trans %}No token{% endtrans %}</em> |
71 | {% endif %} | 77 | {% endif %} |
72 | – | 78 | – <a href="{{ path('generate_token') }}">{% if rss.token %}{% trans %}Reset your token{% endtrans %}{% else %}{% trans %}Create your token{% endtrans %}{% endif %}</a> |
73 | <a href="{{ path('generate_token') }}">Regenerate ?</a> | ||
74 | </div> | 79 | </div> |
75 | </div> | 80 | </div> |
76 | </div> | 81 | </div> |
77 | 82 | {% if rss.token %} | |
78 | <div class="row"> | 83 | <div class="row"> |
79 | <div class="input-field col s12"> | 84 | <div class="input-field col s12"> |
80 | <label>Rss links:</label> | 85 | <label>{% trans %}RSS links{% endtrans %}</label> |
81 | {% if rss.token %} | ||
82 | <ul> | 86 | <ul> |
83 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li> | 87 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}unread{% endtrans %}</a></li> |
84 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li> | 88 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}starred{% endtrans %}</a></li> |
85 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li> | 89 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}archive{% endtrans %}</a></li> |
86 | </ul> | 90 | </ul> |
87 | {% else %} | 91 | |
88 | <strong>You need to generate a token first.</strong> | ||
89 | {% endif %} | ||
90 | </div> | 92 | </div> |
91 | </div> | 93 | </div> |
94 | {% endif %} | ||
92 | 95 | ||
93 | <div class="row"> | 96 | <div class="row"> |
94 | <div class="input-field col s12"> | 97 | <div class="input-field col s12"> |
@@ -166,7 +169,7 @@ | |||
166 | 169 | ||
167 | <div class="hidden">{{ form_rest(form.pwd) }}</div> | 170 | <div class="hidden">{{ form_rest(form.pwd) }}</div> |
168 | <button class="btn waves-effect waves-light" type="submit" name="action"> | 171 | <button class="btn waves-effect waves-light" type="submit" name="action"> |
169 | {% trans %}Update{% endtrans %} | 172 | {% trans %}Save{% endtrans %} |
170 | </button> | 173 | </button> |
171 | 174 | ||
172 | </form> | 175 | </form> |
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 ff69e821..a1d4746e 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 | |||
@@ -4,13 +4,13 @@ | |||
4 | {% set currentRoute = app.request.attributes.get('_route') %} | 4 | {% set currentRoute = app.request.attributes.get('_route') %} |
5 | 5 | ||
6 | {% if currentRoute == 'starred' %} | 6 | {% if currentRoute == 'starred' %} |
7 | {% trans %}Starred{% endtrans %} | 7 | {% trans %}starred{% endtrans %} |
8 | {% elseif currentRoute == 'archive' %} | 8 | {% elseif currentRoute == 'archive' %} |
9 | {% trans %}Archive{% endtrans %} | 9 | {% trans %}archive{% endtrans %} |
10 | {% elseif currentRoute == 'all' %} | 10 | {% elseif currentRoute == 'all' %} |
11 | {% trans %}Filtered{% endtrans %} | 11 | {% trans %}Filtered{% endtrans %} |
12 | {% else %} | 12 | {% else %} |
13 | {% trans %}Unread{% endtrans %} | 13 | {% trans %}unread{% endtrans %} |
14 | {% endif %} | 14 | {% endif %} |
15 | 15 | ||
16 | {% endblock %} | 16 | {% endblock %} |
@@ -49,9 +49,9 @@ | |||
49 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw|striptags|slice(0, 42) }}</a></span> | 49 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw|striptags|slice(0, 42) }}</a></span> |
50 | 50 | ||
51 | {% if entry.readingTime > 0 %} | 51 | {% if entry.readingTime > 0 %} |
52 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} {{ entry.readingTime }} min</span></div> | 52 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min</span></div> |
53 | {% else %} | 53 | {% else %} |
54 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} <small class="inferieur"><</small> 1 min</span></div> | 54 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: <small class="inferieur"><</small> 1 min</span></div> |
55 | {% endif %} | 55 | {% endif %} |
56 | 56 | ||
57 | {% if entry.previewPicture is null %} | 57 | {% if entry.previewPicture is null %} |
@@ -66,9 +66,9 @@ | |||
66 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span> | 66 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span> |
67 | 67 | ||
68 | {% if entry.readingTime > 0 %} | 68 | {% if entry.readingTime > 0 %} |
69 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} {{ entry.readingTime }} min</span></div> | 69 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min</span></div> |
70 | {% else %} | 70 | {% else %} |
71 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} <small class="inferieur"><</small> 1 min</span></div> | 71 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: <small class="inferieur"><</small> 1 min</span></div> |
72 | {% endif %} | 72 | {% endif %} |
73 | 73 | ||
74 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> | 74 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> |
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 3b4c7053..d3cef895 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 | |||
@@ -54,7 +54,7 @@ | |||
54 | <li class="bold hide-on-med-and-down"> | 54 | <li class="bold hide-on-med-and-down"> |
55 | <a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> | 55 | <a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> |
56 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> | 56 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> |
57 | <span>{% trans %}Toggle mark as read{% endtrans %}</span> | 57 | <span>{% trans %}Mark as read{% endtrans %}</span> |
58 | </a> | 58 | </a> |
59 | <div class="collapsible-body"></div> | 59 | <div class="collapsible-body"></div> |
60 | </li> | 60 | </li> |
@@ -62,7 +62,7 @@ | |||
62 | <li class="bold hide-on-med-and-down"> | 62 | <li class="bold hide-on-med-and-down"> |
63 | <a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 63 | <a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
64 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> | 64 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> |
65 | <span>{% trans %}Toggle favorite{% endtrans %}</span> | 65 | <span>{% trans %}Favorite{% endtrans %}</span> |
66 | </a> | 66 | </a> |
67 | <div class="collapsible-body"></div> | 67 | <div class="collapsible-body"></div> |
68 | </li> | 68 | </li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig index 9750f8ba..7d916237 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig | |||
@@ -9,12 +9,11 @@ | |||
9 | {% block content %} | 9 | {% block content %} |
10 | <main class="valign-wrapper"> | 10 | <main class="valign-wrapper"> |
11 | <div class="valign row"> | 11 | <div class="valign row"> |
12 | <h1>{% trans %}Forgot password{% endtrans %}</h1> | ||
13 | <div class="card sw"> | 12 | <div class="card sw"> |
13 | <div class="center"><img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" /></div> | ||
14 | <form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform"> | 14 | <form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform"> |
15 | <div class="card-content"> | 15 | <div class="card-content"> |
16 | 16 | <span class="black-text"><p>{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}</p></span> | |
17 | <span class="card-title black-text"><p>{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}</p></span> | ||
18 | 17 | ||
19 | {% if form_errors(form) %} | 18 | {% if form_errors(form) %} |
20 | <span class="black-text">{{ form_errors(form) }}</span> | 19 | <span class="black-text">{{ form_errors(form) }}</span> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig index 5de71d77..ef1fe916 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig | |||
@@ -22,7 +22,7 @@ | |||
22 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans %}website{% endtrans %}</a></dd> | 22 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans %}website{% endtrans %}</a></dd> |
23 | <dd>Thomas Citharel — <a href="https://tcit.fr">{% trans %}website{% endtrans %}</a></dd> | 23 | <dd>Thomas Citharel — <a href="https://tcit.fr">{% trans %}website{% endtrans %}</a></dd> |
24 | <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{% trans %}website{% endtrans %}</a></dd> | 24 | <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{% trans %}website{% endtrans %}</a></dd> |
25 | <dt>{% trans %}And many others contributors ♥{% endtrans %} <a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}on Github{% endtrans %}</a></dt> | 25 | <dt>{% trans %}And many others contributors ♥{% endtrans %} <a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}on GitHub{% endtrans %}</a></dt> |
26 | <dt>{% trans %}Project website{% endtrans %}</dt> | 26 | <dt>{% trans %}Project website{% endtrans %}</dt> |
27 | <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd> | 27 | <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd> |
28 | <dt>{% trans %}License{% endtrans %}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt> | 28 | <dt>{% trans %}License{% endtrans %}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt> |
@@ -37,14 +37,14 @@ | |||
37 | <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd> | 37 | <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd> |
38 | 38 | ||
39 | <dt>{% trans %}Bug reports{% endtrans %}</dt> | 39 | <dt>{% trans %}Bug reports{% endtrans %}</dt> |
40 | <dd><a href="https://support.wallabag.org">{% trans %}On our support website{% endtrans %}</a> {% trans %}or{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues">{% trans %}on Github{% endtrans %}</a></dd> | 40 | <dd><a href="https://support.wallabag.org">{% trans %}On our support website{% endtrans %}</a> {% trans %}or{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues">{% trans %}on GitHub{% endtrans %}</a></dd> |
41 | </dl> | 41 | </dl> |
42 | </div> | 42 | </div> |
43 | 43 | ||
44 | <div id="set3" class="col s12"> | 44 | <div id="set3" class="col s12"> |
45 | <dl> | 45 | <dl> |
46 | <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt> | 46 | <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt> |
47 | <dd>by contributing to the project: <a href="https://github.com/wallabag/wallabag/issues/1254">an issue lists all our needs</a></dd> | 47 | <dd>{% trans %}by contributing to the project:{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues/1254">{% trans %}an issue lists all our needs{% endtrans %}</a></dd> |
48 | <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd> | 48 | <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd> |
49 | 49 | ||
50 | <dd><a href="{{ flattr_url }}">{% trans %}via Flattr{% endtrans %}</a></dd> | 50 | <dd><a href="{{ flattr_url }}">{% trans %}via Flattr{% endtrans %}</a></dd> |
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 6f98ba99..78591172 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{% trans %}Howto{% endtrans %}{% endblock %} | 3 | {% block title %}{% trans %}howto{% endtrans %}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | 6 | ||
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 a4b1d030..10dede8a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -21,7 +21,7 @@ | |||
21 | {% block messages %} | 21 | {% block messages %} |
22 | {% for flashMessage in app.session.flashbag.get('notice') %} | 22 | {% for flashMessage in app.session.flashbag.get('notice') %} |
23 | <script> | 23 | <script> |
24 | Materialize.toast('{{ flashMessage }}', 4000); | 24 | Materialize.toast('{{ flashMessage|trans }}', 4000); |
25 | </script> | 25 | </script> |
26 | {% endfor %} | 26 | {% endfor %} |
27 | {% endblock %} | 27 | {% endblock %} |
@@ -42,10 +42,11 @@ | |||
42 | <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> | 42 | <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> |
43 | <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li> | 43 | <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li> |
44 | <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li> | 44 | <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li> |
45 | <li class="bold {% if currentRoute == 'all' %}active{% endif %}"><a class="waves-effect" href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li> | 45 | <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"><a class="waves-effect" href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li> |
46 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> | 46 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> |
47 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> | 47 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> |
48 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li> | 48 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li> |
49 | <li class="bold border-bottom {% if currentRoute == 'about' %}active{% endif %}"><a class="waves-effect" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a></li> | ||
49 | <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> | 50 | <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> |
50 | </ul> | 51 | </ul> |
51 | <div class="nav-wrapper nav-panels"> | 52 | <div class="nav-wrapper nav-panels"> |
@@ -93,7 +94,7 @@ | |||
93 | {% trans %}and{% endtrans %} | 94 | {% trans %}and{% endtrans %} |
94 | <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm">chrome</a>. | 95 | <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm">chrome</a>. |
95 | </p> | 96 | </p> |
96 | </div> | 97 | </div> |
97 | <div class="col l4 offset-l2 s12"> | 98 | <div class="col l4 offset-l2 s12"> |
98 | <h5 class="white-text">{% trans %}Social{% endtrans %}</h5> | 99 | <h5 class="white-text">{% trans %}Social{% endtrans %}</h5> |
99 | <ul> | 100 | <ul> |
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php index e9c85a17..2862417e 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php | |||
@@ -3,7 +3,6 @@ | |||
3 | namespace Wallabag\CoreBundle\Tests\Controller; | 3 | namespace Wallabag\CoreBundle\Tests\Controller; |
4 | 4 | ||
5 | use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; | 5 | use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; |
6 | use Doctrine\ORM\AbstractQuery; | ||
7 | 6 | ||
8 | class EntryControllerTest extends WallabagCoreTestCase | 7 | class EntryControllerTest extends WallabagCoreTestCase |
9 | { | 8 | { |
diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php index f8328860..6b860c96 100644 --- a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php +++ b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php | |||
@@ -13,7 +13,7 @@ class WallabagExtension extends \Twig_Extension | |||
13 | 13 | ||
14 | public function removeWww($url) | 14 | public function removeWww($url) |
15 | { | 15 | { |
16 | return preg_replace('/^www\./i', '',$url); | 16 | return preg_replace('/^www\./i', '', $url); |
17 | } | 17 | } |
18 | 18 | ||
19 | public function getName() | 19 | public function getName() |