aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-02-22 11:24:41 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-02-22 11:24:41 +0100
commit12b5a8cea12c7c8b10ede7fd00d1f07ca06b1033 (patch)
treefcdf0fd0c237aa4ec9bd5a7a27f65933598a4775 /app
parenteabb9771f47fe226ecdf5a586cc88bee982620ea (diff)
parent077ddbe1aef64326f39e5e9a9f27517dd8d6ea44 (diff)
downloadwallabag-12b5a8cea12c7c8b10ede7fd00d1f07ca06b1033.tar.gz
wallabag-12b5a8cea12c7c8b10ede7fd00d1f07ca06b1033.tar.zst
wallabag-12b5a8cea12c7c8b10ede7fd00d1f07ca06b1033.zip
Merge pull request #1702 from wallabag/v2-piwik
Added Piwik implementation
Diffstat (limited to 'app')
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml3
-rw-r--r--app/config/services.yml6
3 files changed, 12 insertions, 0 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 1c47ed2d..719e51ea 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -22,3 +22,6 @@ export: "export"
22import: "import" 22import: "import"
23misc: "misc" 23misc: "misc"
24modify_settings: "apply" 24modify_settings: "apply"
25piwik_host: Host of your website in Piwik
26piwik_site_id: ID of your website in Piwik
27piwik_enabled: Enable Piwik
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index ddb78a13..ab5dfc72 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -22,3 +22,6 @@ export: "export"
22import: "import" 22import: "import"
23misc: "divers" 23misc: "divers"
24modify_settings: "appliquer" 24modify_settings: "appliquer"
25piwik_host: URL de votre site dans Piwik
26piwik_site_id: ID de votre site dans Piwik
27piwik_enabled: Activer Piwik
diff --git a/app/config/services.yml b/app/config/services.yml
index 80d6c1a1..e0683ffc 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -19,6 +19,12 @@ services:
19 tags: 19 tags:
20 - { name: twig.extension } 20 - { name: twig.extension }
21 21
22 wallabag.twig_piwik_extension:
23 class: PiwikTwigExtension\PiwikTwigExtension
24 public: false
25 tags:
26 - { name: twig.extension }
27
22 wallabag.locale_listener: 28 wallabag.locale_listener:
23 class: Wallabag\CoreBundle\EventListener\LocaleListener 29 class: Wallabag\CoreBundle\EventListener\LocaleListener
24 arguments: ["%kernel.default_locale%"] 30 arguments: ["%kernel.default_locale%"]