Compare commits

...
This repository has been archived on 2024-10-16. You can view files and clone it, but cannot push or open issues or pull requests.

4 commits

Author SHA1 Message Date
6b98dd6055 Add quotes around curl argument 2021-06-19 12:43:34 +02:00
929991dcca Change translation key 2021-06-19 12:42:40 +02:00
01db6b0f60 Use API to pull from loco 2021-06-19 12:33:11 +02:00
460005c0b0 Start using translation 2021-06-17 17:25:35 +02:00
9 changed files with 666 additions and 489 deletions

8
.env
View file

@ -28,7 +28,11 @@ DATABASE_URL="postgresql://postgres:develop@localhost:5432/plantex?serverVersion
###< doctrine/doctrine-bundle ### ###< doctrine/doctrine-bundle ###
###> symfony/mailer ### ###> symfony/mailer ###
# MAILER_DSN=smtp://localhost MAILER_DSN=smtp://localhost
###< symfony/mailer ### ###< symfony/mailer ###
DEFAULT_URI='http://localhost:8080/' DEFAULT_URI='http://localhost:8080/'
###> symfony/loco-translation-provider ###
LOCO_DSN=loco://RCrByb141Z9P3QjMhWgHrqRrdxu9x-Rro@default
###< symfony/loco-translation-provider ###

View file

@ -31,4 +31,8 @@ DATABASE_URL="postgresql://postgres:develop@localhost:5432/plantex?serverVersion
MAILER_DSN=smtp://no-reply@xn--pflnz-ira.li:dxS5ooKMEzFEa3YgTvru@mail.infomaniak.com:587 MAILER_DSN=smtp://no-reply@xn--pflnz-ira.li:dxS5ooKMEzFEa3YgTvru@mail.infomaniak.com:587
###< symfony/mailer ### ###< symfony/mailer ###
DEFAULT_URI="https://staging.this-server.pflaenz.li/" DEFAULT_URI="https://staging.this-server.pflaenz.li/"
###> symfony/loco-translation-provider ###
LOCO_DSN=loco://RCrByb141Z9P3QjMhWgHrqRrdxu9x-Rro@default
###< symfony/loco-translation-provider ###

2
.gitignore vendored
View file

@ -243,3 +243,5 @@ temp/
# .pnp.* # .pnp.*
# End of https://www.toptal.com/developers/gitignore/api/node,phpunit,symfony,composer,yarn # End of https://www.toptal.com/developers/gitignore/api/node,phpunit,symfony,composer,yarn
translations

View file

@ -25,6 +25,10 @@ RUN php ../composer.phar update
RUN yarn install && \ RUN yarn install && \
yarn build yarn build
# Pull translation
RUN curl "https://localise.biz/api/export/locale/en.yml?key=RCrByb141Z9P3QjMhWgHrqRrdxu9x-Rro&format=symfony" > translations/messages.en.yml
RUN curl "https://localise.biz/api/export/locale/de.yml?key=RCrByb141Z9P3QjMhWgHrqRrdxu9x-Rro&format=symfony" > translations/messages.de.yml
RUN cp .env.staging .env RUN cp .env.staging .env
# Run Migration and dev-webserver # Run Migration and dev-webserver

View file

@ -14,20 +14,21 @@
"easycorp/easyadmin-bundle": "^3", "easycorp/easyadmin-bundle": "^3",
"mjaschen/phpgeo": "^3.2", "mjaschen/phpgeo": "^3.2",
"sensio/framework-extra-bundle": "^6.1", "sensio/framework-extra-bundle": "^6.1",
"symfony/asset": "5.2.*", "symfony/asset": "5.3.*",
"symfony/console": "5.2.*", "symfony/console": "5.3.*",
"symfony/dotenv": "5.2.*", "symfony/dotenv": "5.3.*",
"symfony/flex": "^1.3.1", "symfony/flex": "^1.3.1",
"symfony/form": "5.2.*", "symfony/form": "5.3.*",
"symfony/framework-bundle": "5.2.*", "symfony/framework-bundle": "5.3.*",
"symfony/mailer": "5.2.*", "symfony/loco-translation-provider": "5.3.*",
"symfony/mailer": "5.3.*",
"symfony/monolog-bundle": "^3.7", "symfony/monolog-bundle": "^3.7",
"symfony/proxy-manager-bridge": "5.2.*", "symfony/proxy-manager-bridge": "5.3.*",
"symfony/security-bundle": "5.2.*", "symfony/security-bundle": "5.3.*",
"symfony/twig-bundle": "5.2.*", "symfony/twig-bundle": "5.3.*",
"symfony/validator": "5.2.*", "symfony/validator": "5.3.*",
"symfony/webpack-encore-bundle": "^1.11", "symfony/webpack-encore-bundle": "^1.11",
"symfony/yaml": "5.2.*", "symfony/yaml": "5.3.*",
"symfonycasts/reset-password-bundle": "^1.7", "symfonycasts/reset-password-bundle": "^1.7",
"symfonycasts/verify-email-bundle": "^1.4", "symfonycasts/verify-email-bundle": "^1.4",
"twig/extra-bundle": "^2.12|^3.0", "twig/extra-bundle": "^2.12|^3.0",
@ -74,7 +75,7 @@
"extra": { "extra": {
"symfony": { "symfony": {
"allow-contrib": false, "allow-contrib": false,
"require": "5.2.*" "require": "5.3.*"
} }
}, },
"require-dev": { "require-dev": {

1076
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,8 @@
framework: framework:
default_locale: en default_locale: en
translator: translator:
default_path: '%kernel.project_dir%/translations' providers:
fallbacks: loco:
- en dsn: '%env(LOCO_DSN)%'
domains: ['messages']
locales: ['en', 'de']

View file

@ -100,12 +100,6 @@
"laminas/laminas-code": { "laminas/laminas-code": {
"version": "4.2.0" "version": "4.2.0"
}, },
"laminas/laminas-eventmanager": {
"version": "3.3.1"
},
"laminas/laminas-zendframework-bridge": {
"version": "1.2.0"
},
"mjaschen/phpgeo": { "mjaschen/phpgeo": {
"version": "3.2.1" "version": "3.2.1"
}, },
@ -249,6 +243,9 @@
"src/Kernel.php" "src/Kernel.php"
] ]
}, },
"symfony/http-client": {
"version": "v5.3.0"
},
"symfony/http-client-contracts": { "symfony/http-client-contracts": {
"version": "v2.4.0" "version": "v2.4.0"
}, },
@ -261,6 +258,15 @@
"symfony/intl": { "symfony/intl": {
"version": "v5.2.4" "version": "v5.2.4"
}, },
"symfony/loco-translation-provider": {
"version": "5.3",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "master",
"version": "5.3",
"ref": "c706da68af4ae956f45cffccf99a130e9484cb33"
}
},
"symfony/mailer": { "symfony/mailer": {
"version": "4.3", "version": "4.3",
"recipe": { "recipe": {
@ -309,6 +315,9 @@
"symfony/orm-pack": { "symfony/orm-pack": {
"version": "v2.1.0" "version": "v2.1.0"
}, },
"symfony/password-hasher": {
"version": "v5.3.0"
},
"symfony/phpunit-bridge": { "symfony/phpunit-bridge": {
"version": "5.1", "version": "5.1",
"recipe": { "recipe": {

View file

@ -3,9 +3,10 @@
{% block title %}Home{% endblock %} {% block title %}Home{% endblock %}
{% block body %} {% block body %}
<div class="jumbotron"> <div class="jumbotron">
<h1 class="display-4">Welcome to Pflänz.li</h1> <h1 class="display-4">{% trans %} homepage.welcome.header {% endtrans %}</h1>
<p class="lead">This is a platform to trade plants. You can offer plants and setup a wishlist what you want to trade it for.</p> <p class="lead">{% trans %} homepage.welcome.info {% endtrans %}</p>
<hr class="my-4"> <hr class="my-4">
<p>To offer your plants, please register first.</p> <p>To offer your plants, please register first.</p>
<a class="btn btn-primary btn-lg" href="{{ path('app_register') }}" role="button">Register now</a> <a class="btn btn-primary btn-lg" href="{{ path('app_register') }}" role="button">Register now</a>