aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2015-10-18 15:35:42 +0200
committerNicolas Lœuillet <nicolas@loeuillet.org>2015-10-18 15:35:42 +0200
commitfcc6949d4a70f8b1d2c2b4e2c1e2fabdf6a93a7c (patch)
treecc09f37927d4a7ffbf576f636db0d36015190b08 /app/config
parent3d3ed955f11006a408c6596eb9151a0afb28e721 (diff)
parent2aac2f278f1ca63f2097f80ddbdb924dea9ec59e (diff)
downloadwallabag-fcc6949d4a70f8b1d2c2b4e2c1e2fabdf6a93a7c.tar.gz
wallabag-fcc6949d4a70f8b1d2c2b4e2c1e2fabdf6a93a7c.tar.zst
wallabag-fcc6949d4a70f8b1d2c2b4e2c1e2fabdf6a93a7c.zip
Merge pull request #1446 from wallabag/v2-language-config
[WIP] language selection on config screen
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml5
-rw-r--r--app/config/services.yml12
2 files changed, 17 insertions, 0 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 956fdd07..a4d88b94 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -25,6 +25,11 @@ framework:
25 fragments: ~ 25 fragments: ~
26 http_method_override: true 26 http_method_override: true
27 27
28wallabag_core:
29 languages:
30 en: 'English'
31 fr: 'Français'
32
28# Twig Configuration 33# Twig Configuration
29twig: 34twig:
30 debug: "%kernel.debug%" 35 debug: "%kernel.debug%"
diff --git a/app/config/services.yml b/app/config/services.yml
index ff6a582b..80d6c1a1 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -18,3 +18,15 @@ services:
18 public: false 18 public: false
19 tags: 19 tags:
20 - { name: twig.extension } 20 - { name: twig.extension }
21
22 wallabag.locale_listener:
23 class: Wallabag\CoreBundle\EventListener\LocaleListener
24 arguments: ["%kernel.default_locale%"]
25 tags:
26 - { name: kernel.event_subscriber }
27
28 wallabag.user_locale_listener:
29 class: Wallabag\CoreBundle\EventListener\UserLocaleListener
30 arguments: ["@session"]
31 tags:
32 - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }