From 47448a1bfbfaabec71d46834d6976607da80c14c Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 22 Aug 2019 09:54:45 +0200 Subject: [PATCH] Dutch translation + some changes --- README.md | 2 ++ composer.json | 1 + config/packages/security.yaml | 4 ++-- config/services.yaml | 2 +- public/img/flags/nl.svg | 5 +++++ src/Controller/FediPlanController.php | 10 +++++----- templates/fediplan/about.html.twig | 8 ++++++++ templates/nav.html.twig | 5 +++-- 8 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 public/img/flags/nl.svg diff --git a/README.md b/README.md index 50e0d86..64ebf72 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +**If you want to contribute to a _translation_:**[![Crowdin](https://badges.crowdin.net/fediplan/localized.svg)](https://crowdin.com/project/fediplan) + ### How to install FediPlan **1 - Clone the repository** diff --git a/composer.json b/composer.json index 7023ca9..9bf16a8 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "symfony/flex": "^1.3.1", "symfony/framework-bundle": "4.3.*", "symfony/security-bundle": "4.3.*", + "symfony/translation": "4.3.*", "symfony/twig-bundle": "4.3.*", "symfony/yaml": "4.3.*" }, diff --git a/config/packages/security.yaml b/config/packages/security.yaml index 1e71116..73977ce 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -21,5 +21,5 @@ security: # Note: Only the *first* access control that matches will be used access_control: # - { path: ^/admin, roles: ROLE_ADMIN } - - { path: ^/(en|fr)?/schedule, roles: ROLE_USER } - - { path: ^/(en|fr)?/scheduled, roles: ROLE_USER } + - { path: ^/(en|fr|nl)?/schedule, roles: ROLE_USER } + - { path: ^/(en|fr|nl)?/scheduled, roles: ROLE_USER } diff --git a/config/services.yaml b/config/services.yaml index 8f4a167..8b207d2 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -4,7 +4,7 @@ # Put parameters here that don't need to change on each machine where the app is deployed # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration parameters: - + allowed_language: "fr|en|nl" services: # default configuration for services in *this* file _defaults: diff --git a/public/img/flags/nl.svg b/public/img/flags/nl.svg new file mode 100644 index 0000000..e6690c3 --- /dev/null +++ b/public/img/flags/nl.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/Controller/FediPlanController.php b/src/Controller/FediPlanController.php index 33c662d..c943d8a 100644 --- a/src/Controller/FediPlanController.php +++ b/src/Controller/FediPlanController.php @@ -33,7 +33,7 @@ class FediPlanController extends AbstractController /** - * @Route("/{_locale}",name="index", defaults={"_locale"="en"}, requirements={"_locale": "en|fr"}) + * @Route("/{_locale}",name="index", defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"}) */ public function indexAction(Request $request, AuthorizationCheckerInterface $authorizationChecker, ConnectMastodonAccountFlow $flow, Mastodon_api $mastodon_api, TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher) { @@ -146,7 +146,7 @@ class FediPlanController extends AbstractController /** - * @Route("/{_locale}/schedule", name="schedule", defaults={"_locale"="en"}, requirements={"_locale": "en|fr"}) + * @Route("/{_locale}/schedule", name="schedule", defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"}) */ public function schedule(Request $request, Mastodon_api $mastodon_api) { @@ -234,7 +234,7 @@ class FediPlanController extends AbstractController /** - * @Route("/{_locale}/scheduled", name="scheduled", defaults={"_locale"="en"}, requirements={"_locale": "en|fr"}) + * @Route("/{_locale}/scheduled", name="scheduled", defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"}) */ public function scheduled() { @@ -273,7 +273,7 @@ class FediPlanController extends AbstractController } /** - * @Route("/{_locale}/scheduled/delete/messages/{id}", options={"expose"=true}, name="delete_message", methods={"POST"}, defaults={"_locale"="en"}, requirements={"_locale": "en|fr"}) + * @Route("/{_locale}/scheduled/delete/messages/{id}", options={"expose"=true}, name="delete_message", methods={"POST"}, defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"}) */ public function deleteMessage(Mastodon_api $mastodon_api, String $id = null){ @@ -293,7 +293,7 @@ class FediPlanController extends AbstractController /** * @Route("/about",defaults={"_locale"="en"}) - * @Route("/{_locale}/about", name="about", defaults={"_locale":"en"}, requirements={"_locale": "en|fr"}) + * @Route("/{_locale}/about", name="about", defaults={"_locale":"en"}, requirements={"_locale": "%allowed_language%"}) */ public function about() { diff --git a/templates/fediplan/about.html.twig b/templates/fediplan/about.html.twig index 82cf231..4d9b1cb 100644 --- a/templates/fediplan/about.html.twig +++ b/templates/fediplan/about.html.twig @@ -24,4 +24,12 @@ + +
+ +
+ + {% endblock %} diff --git a/templates/nav.html.twig b/templates/nav.html.twig index 7bba240..f8c0fe8 100644 --- a/templates/nav.html.twig +++ b/templates/nav.html.twig @@ -42,8 +42,9 @@ {% if route == "app_fediplan_about" %} {% set route = "about" %} {% endif %} - English - Français + English  English + Français  Français + Nederlands  Nederlands