diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-07 11:05:14 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-07 11:05:14 +0100 |
commit | d11eb2e461a3ea2b74e5a1c686c9fa9bbcb9e103 (patch) | |
tree | 4a6abd104d96d5df8fecedd446387d4c1a79a39c | |
parent | f17281417c481c85761552b7dad48a9a0d49248c (diff) | |
download | wallabag-d11eb2e461a3ea2b74e5a1c686c9fa9bbcb9e103.tar.gz wallabag-d11eb2e461a3ea2b74e5a1c686c9fa9bbcb9e103.tar.zst wallabag-d11eb2e461a3ea2b74e5a1c686c9fa9bbcb9e103.zip |
Fix translations mistake
In Material template, move the developer link in the left menu (like in baggy)
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | 10 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index c4035859..1de8d20f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -259,17 +259,17 @@ Remove this client: "Supprimer ce client" | |||
259 | New client: "Nouveau client" | 259 | New client: "Nouveau client" |
260 | You are about to create a new client. Please fill the field below for the redirect URI of your application.: "Vous allez créer un nouveau client. Merci de remplir l'url de redirection vers votre application." | 260 | You are about to create a new client. Please fill the field below for the redirect URI of your application.: "Vous allez créer un nouveau client. Merci de remplir l'url de redirection vers votre application." |
261 | Back: "Retour" | 261 | Back: "Retour" |
262 | Client parameters: "Les parameters de votre client" | 262 | Client parameters: "Les paramètres de votre client" |
263 | New client created.: "Nouveau client créé." | 263 | New client created.: "Nouveau client créé." |
264 | Here are your client parameters.: "Voilà les paramètres de votre client" | 264 | Here are your client parameters.: "Voilà les paramètres de votre client" |
265 | Read the howto "Create my first application": "Lire \"comment créer ma première application\"" | 265 | Read the howto "Create my first application": "Lire \"comment créer ma première application\"" |
266 | Client deleted: "Client supprimé" | 266 | Client deleted: "Client supprimé" |
267 | No client yet.: "Aucun client pour le moment" | 267 | No client yet.: "Aucun client pour le moment" |
268 | "The following commands make use of the <a href=\"https://github.com/jkbrzt/httpie\">HTTPie library</a>. Make sure it is installed on your system before using it.": "Les commandes suivantes utilisent la <a href=\"https://github.com/jkbrzt/httpie\">librarie HTTPie</a>. Assurez-vous qu'elle soit installée avant de l'utiliser." | 268 | "The following commands make use of the <a href=\"https://github.com/jkbrzt/httpie\">HTTPie library</a>. Make sure it is installed on your system before using it.": "Les commandes suivantes utilisent la <a href=\"https://github.com/jkbrzt/httpie\">librarie HTTPie</a>. Assurez-vous qu'elle soit installée avant de l'utiliser." |
269 | You need a token to communicate between your 3rd application and wallabag API.: "Vous avez besoin d'un token pour échanger entre votre appication et l'API de wallabag." | 269 | You need a token to communicate between your 3rd application and wallabag API.: "Vous avez besoin d'un token pour échanger entre votre application et l'API de wallabag." |
270 | "To create this token, you need <a href=\"%link%\">to create a new client</a>.": "Pour créer un token, vous devez <a href=\"%link%\">créer un nouveau client</a>." | 270 | "To create this token, you need <a href=\"%link%\">to create a new client</a>.": "Pour créer un token, vous devez <a href=\"%link%\">créer un nouveau client</a>." |
271 | Now, create your token (replace client_id, client_secret, username and password with the good values):: "Maintenant créer votre token (remplacer client_id, client_secret, username et password avec les bonnes valeurs):" | 271 | Now, create your token (replace client_id, client_secret, username and password with the good values):: "Maintenant créez votre token (remplacer client_id, client_secret, username et password avec les bonnes valeurs):" |
272 | The API will return a response like this:: "L'API vous retournera une réponse comme ça:" | 272 | The API will return a response like this:: "L'API vous retournera une réponse comme ça:" |
273 | The access_token is useful to do a call to the API endpoint. For example:: "L'access_token doit être utilisé pour faire un appel à l'API. Par exemple:" | 273 | The access_token is useful to do a call to the API endpoint. For example:: "L'access_token doit être utilisé pour faire un appel à l'API. Par exemple :" |
274 | This call will return all the entries for your user.: "Cet appel va retourner tous les articles de l'utilisateur." | 274 | This call will return all the entries for your user.: "Cet appel va retourner tous les articles de l'utilisateur." |
275 | "If you want to see all the API endpoints, you can have a look <a href=\"%link%\">to our API documentation</a>.": "Si vous voulez toutes les méthodes de l'API, jettez un oeil <a href=\"%link%\">à la documentation de l'API</a>." | 275 | "If you want to see all the API endpoints, you can have a look <a href=\"%link%\">to our API documentation</a>.": "Si vous voulez toutes les méthodes de l'API, jetez un oeil <a href=\"%link%\">à la documentation de l'API</a>." |
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 82bd9a1d..f5d03084 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -50,6 +50,7 @@ | |||
50 | {% endif %} | 50 | {% endif %} |
51 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"><a class="waves-effect" href="{{ path('import') }}">{% trans %}import{% endtrans %}</a></li> | 51 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"><a class="waves-effect" href="{{ path('import') }}">{% trans %}import{% endtrans %}</a></li> |
52 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li> | 52 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li> |
53 | <li class="bold {% if currentRoute == 'developer' %}active{% endif %}"><a class="waves-effect" href="{{ path('developer') }}">{% trans %}Developer{% endtrans %}</a></li> | ||
53 | <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> | 54 | <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> |
54 | </ul> | 55 | </ul> |
55 | <div class="nav-wrapper nav-panels"> | 56 | <div class="nav-wrapper nav-panels"> |
@@ -116,8 +117,6 @@ | |||
116 | <div class="container"> | 117 | <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> | 118 | <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> | 119 | <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a> |
119 | <a class="grey-text text-lighten-4 right" href="{{ path('developer') }}">{% trans %}Developer{% endtrans %} | ||
120 | - | ||
121 | </div> | 120 | </div> |
122 | </div> | 121 | </div> |
123 | </footer> | 122 | </footer> |