From e4ae9e8a8243fc7dc312a0709f1b3565d8c3426c Mon Sep 17 00:00:00 2001 From: Julien Rosset Date: Fri, 31 Jan 2020 20:53:38 +0100 Subject: [PATCH] First page and translations --- composer.json | 6 +- composer.lock | 192 +++++++++++++------------- config/packages/translation.yaml | 4 +- config/routes/annotations.yaml | 5 + config/services.yaml | 1 + src/Controller/ExternalController.php | 16 +++ templates/base.html.twig | 20 +-- templates/index.html.twig | 8 ++ translations/messages.en.yaml | 2 + 9 files changed, 143 insertions(+), 111 deletions(-) create mode 100644 src/Controller/ExternalController.php create mode 100644 templates/index.html.twig create mode 100644 translations/messages.en.yaml diff --git a/composer.json b/composer.json index 6cfe33a..830c11e 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "php": "^7.4.2", "ext-ctype": "*", "ext-iconv": "*", - "sensio/framework-extra-bundle": "^5.1", + "sensio/framework-extra-bundle": "^5.5", "symfony/apache-pack": "^1.0", "symfony/asset": "5.0.*", "symfony/console": "5.0.*", @@ -21,11 +21,12 @@ "symfony/notifier": "5.0.*", "symfony/orm-pack": "*", "symfony/process": "5.0.*", + "symfony/profiler-pack": "^1.0", "symfony/security-bundle": "5.0.*", "symfony/serializer-pack": "*", "symfony/string": "5.0.*", "symfony/translation": "5.0.*", - "symfony/twig-pack": "*", + "symfony/twig-pack": "^1.0", "symfony/validator": "5.0.*", "symfony/web-link": "5.0.*", "symfony/yaml": "5.0.*" @@ -33,7 +34,6 @@ "require-dev": { "symfony/debug-pack": "*", "symfony/maker-bundle": "^1.0", - "symfony/profiler-pack": "*", "symfony/test-pack": "*" }, "config": { diff --git a/composer.lock b/composer.lock index 9f27bb5..c601352 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8599ff3bf6527894dd387d5a4d9d4076", + "content-hash": "c1d18f6f47806c1deade9c1c5e845af7", "packages": [ { "name": "doctrine/annotations", @@ -4493,6 +4493,34 @@ "homepage": "https://symfony.com", "time": "2020-01-09T09:53:06+00:00" }, + { + "name": "symfony/profiler-pack", + "version": "v1.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/profiler-pack.git", + "reference": "99c4370632c2a59bb0444852f92140074ef02209" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/profiler-pack/zipball/99c4370632c2a59bb0444852f92140074ef02209", + "reference": "99c4370632c2a59bb0444852f92140074ef02209", + "shasum": "" + }, + "require": { + "php": "^7.0", + "symfony/stopwatch": "*", + "symfony/twig-bundle": "*", + "symfony/web-profiler-bundle": "*" + }, + "type": "symfony-pack", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pack for the Symfony web profiler", + "time": "2018-12-10T12:11:44+00:00" + }, { "name": "symfony/property-access", "version": "v5.0.3", @@ -5332,7 +5360,7 @@ }, { "name": "symfony/translation", - "version": "v5.0.3", + "version": "v5.0.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", @@ -5970,6 +5998,72 @@ ], "time": "2020-01-04T14:08:26+00:00" }, + { + "name": "symfony/web-profiler-bundle", + "version": "v5.0.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/web-profiler-bundle.git", + "reference": "438d072d21675806dedd3ca31c7a436db3ac3688" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/438d072d21675806dedd3ca31c7a436db3ac3688", + "reference": "438d072d21675806dedd3ca31c7a436db3ac3688", + "shasum": "" + }, + "require": { + "php": "^7.2.5", + "symfony/config": "^4.4|^5.0", + "symfony/framework-bundle": "^4.4|^5.0", + "symfony/http-kernel": "^4.4|^5.0", + "symfony/routing": "^4.4|^5.0", + "symfony/twig-bundle": "^4.4|^5.0", + "twig/twig": "^2.10|^3.0" + }, + "conflict": { + "symfony/form": "<4.4", + "symfony/messenger": "<4.4" + }, + "require-dev": { + "symfony/browser-kit": "^4.4|^5.0", + "symfony/console": "^4.4|^5.0", + "symfony/css-selector": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/stopwatch": "^4.4|^5.0" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bundle\\WebProfilerBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony WebProfilerBundle", + "homepage": "https://symfony.com", + "time": "2020-01-09T12:38:56+00:00" + }, { "name": "symfony/yaml", "version": "v5.0.3", @@ -6752,34 +6846,6 @@ "homepage": "https://symfony.com", "time": "2020-01-21T08:40:24+00:00" }, - { - "name": "symfony/profiler-pack", - "version": "v1.0.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/profiler-pack.git", - "reference": "99c4370632c2a59bb0444852f92140074ef02209" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/profiler-pack/zipball/99c4370632c2a59bb0444852f92140074ef02209", - "reference": "99c4370632c2a59bb0444852f92140074ef02209", - "shasum": "" - }, - "require": { - "php": "^7.0", - "symfony/stopwatch": "*", - "symfony/twig-bundle": "*", - "symfony/web-profiler-bundle": "*" - }, - "type": "symfony-pack", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "A pack for the Symfony web profiler", - "time": "2018-12-10T12:11:44+00:00" - }, { "name": "symfony/test-pack", "version": "v1.0.6", @@ -6807,72 +6873,6 @@ ], "description": "A pack for functional and end-to-end testing within a Symfony app", "time": "2019-06-21T06:27:32+00:00" - }, - { - "name": "symfony/web-profiler-bundle", - "version": "v5.0.3", - "source": { - "type": "git", - "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "438d072d21675806dedd3ca31c7a436db3ac3688" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/438d072d21675806dedd3ca31c7a436db3ac3688", - "reference": "438d072d21675806dedd3ca31c7a436db3ac3688", - "shasum": "" - }, - "require": { - "php": "^7.2.5", - "symfony/config": "^4.4|^5.0", - "symfony/framework-bundle": "^4.4|^5.0", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/routing": "^4.4|^5.0", - "symfony/twig-bundle": "^4.4|^5.0", - "twig/twig": "^2.10|^3.0" - }, - "conflict": { - "symfony/form": "<4.4", - "symfony/messenger": "<4.4" - }, - "require-dev": { - "symfony/browser-kit": "^4.4|^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/css-selector": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/stopwatch": "^4.4|^5.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Bundle\\WebProfilerBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony WebProfilerBundle", - "homepage": "https://symfony.com", - "time": "2020-01-09T12:38:56+00:00" } ], "aliases": [], diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml index 05a2b3d..1d7cded 100644 --- a/config/packages/translation.yaml +++ b/config/packages/translation.yaml @@ -1,6 +1,6 @@ framework: - default_locale: en + default_locale: fr translator: default_path: '%kernel.project_dir%/translations' fallbacks: - - en + - fr diff --git a/config/routes/annotations.yaml b/config/routes/annotations.yaml index d49a502..ff48c7d 100644 --- a/config/routes/annotations.yaml +++ b/config/routes/annotations.yaml @@ -1,3 +1,8 @@ controllers: resource: ../../src/Controller/ type: annotation + prefix: /{_locale} + requirements: + _locale: '%app.supported_locales%' + defaults: + _locale: '%kernel.default_locale%' diff --git a/config/services.yaml b/config/services.yaml index 5c4b417..611d2ff 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -4,6 +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: + app.supported_locales: 'fr|en' services: # default configuration for services in *this* file diff --git a/src/Controller/ExternalController.php b/src/Controller/ExternalController.php new file mode 100644 index 0000000..c833e25 --- /dev/null +++ b/src/Controller/ExternalController.php @@ -0,0 +1,16 @@ +render('index.html.twig'); + } +} \ No newline at end of file diff --git a/templates/base.html.twig b/templates/base.html.twig index 043f42d..14b3759 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,12 +1,12 @@ - - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %}{% endblock %} - - - {% block body %}{% endblock %} - {% block javascripts %}{% endblock %} - + + + + {% block title %}WishList{% endblock %} + {% block stylesheets %}{% endblock %} + + + {% block body %}{% endblock %} + {% block javascripts %}{% endblock %} + diff --git a/templates/index.html.twig b/templates/index.html.twig new file mode 100644 index 0000000..7b50f77 --- /dev/null +++ b/templates/index.html.twig @@ -0,0 +1,8 @@ +{% extends 'base.html.twig' %} + +{% block body %} +

{% trans %}Accueil{% endtrans %}

+

+ {% trans %}Bienvenue sur WishList{% endtrans %} +

+{% endblock %} diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml new file mode 100644 index 0000000..373b02a --- /dev/null +++ b/translations/messages.en.yaml @@ -0,0 +1,2 @@ +Accueil: Accueil +Bienvenue sur WishList: Welcome on WishList \ No newline at end of file