From 0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 9 Mar 2016 08:59:08 +0100 Subject: Convert english translation file - convert english translation to translate key - remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material) - fix tests about text in response (now checking translation key instead of translated text) - remove all ugly `` --- .../views/themes/material/Static/about.html.twig | 50 +++++++------- .../views/themes/material/Static/howto.html.twig | 36 +++++----- .../themes/material/Static/quickstart.html.twig | 79 ++++++++++++---------- 3 files changed, 84 insertions(+), 81 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Static') 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 1368bb09..a294b74d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig @@ -1,6 +1,6 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} -{% block title %}{% trans %}About{% endtrans %}{% endblock %} +{% block title %}{{ 'about.page_title'|trans }}{% endblock %} {% block content %} @@ -11,56 +11,56 @@
-
{% trans %}Developed by{% endtrans %}
-
Nicolas Lœuillet — {% trans %}website{% endtrans %}
-
Thomas Citharel — {% trans %}website{% endtrans %}
-
Jérémy Benoist — {% trans %}website{% endtrans %}
-
{% trans %}And many others contributors ♥{% endtrans %} {% trans %}on GitHub{% endtrans %}
-
{% trans %}Project website{% endtrans %}
+
{{ 'about.who_behind_wallabag.developped_by'|trans }}
+
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
+
Thomas Citharel — {{ 'about.who_behind_wallabag.website'|trans }}
+
Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
+
{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}
+
{{ 'about.who_behind_wallabag.project_website'|trans }}
https://www.wallabag.org
-
{% trans %}License{% endtrans %}: MIT
-
{% trans %}Version{% endtrans %}: {{ version }}
+
{{ 'about.who_behind_wallabag.license'|trans }}: MIT
+
{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}
-
{% trans %}Documentation{% endtrans %}
+
{{ 'about.getting_help.documentation'|trans }}
english
français
deutsch
-
{% trans %}Bug reports{% endtrans %}
-
{% trans %}On our support website{% endtrans %} {% trans %}or{% endtrans %} {% trans %}on GitHub{% endtrans %}
+
{{ 'about.getting_help.bug_reports'|trans }}
+
{{ 'about.getting_help.support'|trans|raw }}
-
{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}
-
{% trans %}by contributing to the project:{% endtrans %} {% trans %}an issue lists all our needs{% endtrans %}
-
{% trans %}via Paypal{% endtrans %}
+
{{ 'about.helping.description'|trans }}
+
{{ 'about.helping.by_contributing_2'|trans }} {{ 'about.helping.by_contributing'|trans }}
+
{{ 'about.helping.by_paypal'|trans }}
-

{% trans %}Here are the list of third-party libraries used in wallabag (with their licenses):{% endtrans %}

- +

{{ 'about.third_party.description'|trans }}

+
- - + + 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 e2795409..15b548d8 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,44 +1,40 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} -{% block title %}{% trans %}howto{% endtrans %}{% endblock %} +{% block title %}{{ 'howto.page_title'|trans }}{% endblock %} {% block content %}
+

{{ 'howto.page_description'|trans }}

-
- -
-
- {% trans %}Thanks to this form{% endtrans %} +
+ {{ 'howto.form.description'|trans }}
-
+
+
{{ 'howto.top_menu.browser_addons'|trans }}
-
+
+
{{ 'howto.top_menu.mobile_apps'|trans }}
-
- {% trans %}Drag & drop this link to your bookmarks bar:{% endtrans %} +
+
{{ 'howto.top_menu.bookmarklet'|trans }}
+ {{ 'howto.bookmarklet.description'|trans }} {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig index 03754d38..706c4a79 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig @@ -1,6 +1,6 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} -{% block title %}{% trans %}Quickstart{% endtrans %}{% endblock %} +{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %} {% block content %} @@ -9,56 +9,63 @@
-

{% trans %}Welcome to wallabag!{% endtrans %}

-

{% trans %}We'll accompany you to visit wallabag and show you some features which can interess you.{% endtrans %}

-

{% trans %}Follow us!{% endtrans %}

-

{% trans %}Configure the application{% endtrans %}

+

{{ 'quickstart.intro.title'|trans }}

+

{{ 'quickstart.intro.paragraph_1'|trans }}

+

{{ 'quickstart.intro.paragraph_2'|trans }}

+ +

{{ 'quickstart.configure.title'|trans }}

+ {% if is_granted('ROLE_SUPER_ADMIN') %} -

{% trans %}Administration{% endtrans %}

-

{% trans %}As a administrator, you have privileges on wallabag. You can:{% endtrans %}

+

{{ 'quickstart.admin.title'|trans }}

+

{{ 'quickstart.admin.description'|trans }}

{% endif %} -

{% trans %}First steps{% endtrans %}

+ +

{{ 'quickstart.first_steps.title'|trans }}

-

{% trans %}Migrate from an existing service{% endtrans %}

-

{% trans %}You're using an other service? We'll help you to retrieve your data on wallabag.{% endtrans %}

+ +

{{ 'quickstart.migrate.title'|trans }}

+

{{ 'quickstart.migrate.description'|trans }}

-

{% trans %}Developers{% endtrans %}

+ +

{{ 'quickstart.developer.title'|trans }}

-

{% trans %}Full documentation{% endtrans %}

+ +

{{ 'quickstart.docs.title'|trans }}

-

{% trans %}Support{% endtrans %}

-

{% trans %}If you need some help, we are here for you.{% endtrans %}

+ +

{{ 'quickstart.support.title'|trans }}

+

{{ 'quickstart.support.description'|trans }}

-- cgit v1.2.3
{% trans %}Package{% endtrans %}{% trans %}License{% endtrans %}{{ 'about.third_party.package'|trans }}{{ 'about.third_party.license'|trans }}
behat/transliteratorArtistic 1.0
CraueConfigBundleMIT