From 07643dde08a7cd3f5a556021643e64dd1d5e89f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 19 Feb 2016 15:27:57 +0100 Subject: Fix #1137: implemented Piwik --- .../CraueConfigBundle/translations/CraueConfigBundle.en.yml | 3 +++ .../CraueConfigBundle/translations/CraueConfigBundle.fr.yml | 3 +++ app/config/services.yml | 8 ++++++++ 3 files changed, 14 insertions(+) (limited to 'app') 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" import: "import" misc: "misc" modify_settings: "apply" +piwik_host: Host of your website in Piwik +piwik_site_id: ID of your website in Piwik +piwik_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" import: "import" misc: "divers" modify_settings: "appliquer" +piwik_host: URL de votre site dans Piwik +piwik_site_id: ID de votre site dans Piwik +piwik_enabled: Activer Piwik diff --git a/app/config/services.yml b/app/config/services.yml index 80d6c1a1..71862fd2 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -19,6 +19,14 @@ services: tags: - { name: twig.extension } + wallabag.twig_piwik_extension: + class: Wallabag\CoreBundle\Twig\WallabagPiwikExtension + public: false + arguments: + - "@craue_config" + tags: + - { name: twig.extension } + wallabag.locale_listener: class: Wallabag\CoreBundle\EventListener\LocaleListener arguments: ["%kernel.default_locale%"] -- cgit v1.2.3 From 077ddbe1aef64326f39e5e9a9f27517dd8d6ea44 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 22 Feb 2016 10:58:43 +0100 Subject: Use a different way to use piwik --- app/config/services.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app') diff --git a/app/config/services.yml b/app/config/services.yml index 71862fd2..e0683ffc 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -20,10 +20,8 @@ services: - { name: twig.extension } wallabag.twig_piwik_extension: - class: Wallabag\CoreBundle\Twig\WallabagPiwikExtension + class: PiwikTwigExtension\PiwikTwigExtension public: false - arguments: - - "@craue_config" tags: - { name: twig.extension } -- cgit v1.2.3