Merge pull request #3 from NicolasBarbey/feature/i18n

Feature/i18n

Author: zawaze

Config/module.xml

@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.0</version>
+    <version>2.0.1</version>
     <authors>
         <author>
             <name>Tom Pradat</name>

Controller/Configuration.php

@@ -37,8 +37,9 @@ public function saveAction(){
         try {
             $vform = $this->validateForm($form);
             $data = $vform->getData();
+            $lang = $this->getRequest()->getSession()->get('thelia.admin.edition.lang');
 
-            GoogleTagManager::setConfigValue('googletagmanager_gtmId',$data['gtmId']);
+            GoogleTagManager::setConfigValue('googletagmanager_gtmId', $data['gtmId'], $lang->getlocale());
         } catch (\Exception $e) {
             $this->setupFormErrorContext(
                 $this->getTranslator()->trans("Syntax error"),

Form/Configuration.php

@@ -28,7 +28,8 @@ protected function buildForm()
     {
         $form = $this->formBuilder;
 
-        $value = GoogleTagManager::getConfigValue('googletagmanager_gtmId');
+        $lang = $this->getRequest()->getSession()->get('thelia.admin.edition.lang');
+        $value = GoogleTagManager::getConfigValue('googletagmanager_gtmId', null, $lang->getLocale());
         $form->add(
             "gtmId",
             "text",

Hook/FrontHook.php

@@ -16,6 +16,7 @@
 use GoogleTagManager\GoogleTagManager;
 use Thelia\Core\Event\Hook\HookRenderEvent;
 use Thelia\Core\Hook\BaseHook;
+use Thelia\Model\Base\LangQuery;
 use Thelia\Model\ConfigQuery;
 
 /**
@@ -26,7 +27,8 @@
 class FrontHook extends BaseHook
 {
     public function onMainHeadTop(HookRenderEvent $event){
-        $value = GoogleTagManager::getConfigValue('googletagmanager_gtmId');
+        $lang = $this->getLang();
+        $value = GoogleTagManager::getConfigValue('googletagmanager_gtmId', null, $lang->getLocale());
         if ("" != $value){
             $event->add(
                 "<!-- Google Tag Manager -->".
@@ -40,7 +42,8 @@ public function onMainHeadTop(HookRenderEvent $event){
         }
     }
     public function onMainBodyTop(HookRenderEvent $event){
-        $value = GoogleTagManager::getConfigValue('googletagmanager_gtmId');
+        $lang = $this->getLang();
+        $value = GoogleTagManager::getConfigValue('googletagmanager_gtmId', null, $lang->getLocale());
         if ("" != $value){
             $event->add("<!-- Google Tag Manager (noscript) -->".
                 "<noscript><iframe src='https://www.googletagmanager.com/ns.html?id=".$value."' ".
@@ -49,4 +52,13 @@ public function onMainBodyTop(HookRenderEvent $event){
             );
         }
     }
+
+    protected function getLang()
+    {
+        $lang = $this->getRequest()->getSession()->get("thelia.current.lang");
+        if (null === $lang){
+            $lang = LangQuery::create()->filterByByDefault(1)->findOne();
+        }
+        return $lang;
+    }
 }

templates/backOffice/default/module_configuration.html

@@ -7,7 +7,9 @@
 
         <div class="form-container">
             <div class="col-md-12">
-
+                {include file="includes/inner-form-toolbar.html"
+                    hide_submit_buttons = true
+                }
                 {form name="googletagmanager.configuration.form"}
                 <form method="POST" id="googletagmanager-form"  action="{url path="/admin/module/googletagmanager/save"}" {form_enctype} class="clearfix">