Merge branch 'master' of git://github.com/Chill-project/Main

Form/Type/Select2CountryType.php

@@ -21,7 +21,10 @@
 namespace Chill\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Chill\MainBundle\Entity\Country;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Extends choice to allow adding select2 library on widget
@@ -30,6 +33,17 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface;
  */
 class Select2CountryType extends AbstractType
 {
+    /**
+     * 
+     * @var RequestStack
+     */
+    private $requestStack;
+    
+    public function __construct(RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+    }
+    
     public function getName()
     {
         return 'select2_chill_country';
@@ -42,8 +56,11 @@ class Select2CountryType extends AbstractType
     
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
+        $locale = $this->requestStack->getCurrentRequest()->getLocale();
+        
         $resolver->setDefaults(array(
-           'class' => 'Chill\MainBundle\Entity\Country'
+           'class' => 'Chill\MainBundle\Entity\Country',
+           'property' => 'name['.$locale.']'
         ));
     }
 }

Resources/config/services.yml

@@ -25,6 +25,19 @@ services:
             - "%locale%"
         tags:
             - { name: form.type, alias: translatable_string }
+            
+            
+    chill.main.helper.translatable_string:
+        class: Chill\MainBundle\Templating\TranslatableStringHelper
+        arguments:
+            - "@request_stack"
+            
+    chill.main.twig.translatable_string:
+        class: Chill\MainBundle\Templating\TranslatableStringTwig
+        calls:
+            - [ setContainer, ["@service_container"]]
+        tags:
+            - { name: twig.extension }
      
     chill.main.form.type.select2choice:
         class: Chill\MainBundle\Form\Type\Select2ChoiceType
@@ -38,5 +51,7 @@ services:
             
     chill.main.form.type.select2country:
         class: Chill\MainBundle\Form\Type\Select2CountryType
+        arguments:
+            - "@request_stack"
         tags:
             - { name: form.type, alias: select2_chill_country }

Templating/TranslatableStringHelper.php

@@ -0,0 +1,80 @@
+<?php
+
+
+/*
+ * Chill is a suite of a modules, Chill is a software for social workers
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\MainBundle\Templating;
+
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * 
+ * This helper helps to find the string in current locale from translatable_strings
+ * 
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ *
+ */
+class TranslatableStringHelper
+{
+    /**
+     * 
+     * @var RequestStack
+     */
+    private $requestStack;
+    
+    public function __construct(RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+    }
+    
+    /**
+     * return the string in current locale if it exists.
+     * 
+     * If it does not exists; return the name in the first language available.
+     * 
+     * Return a blank string if any strings are available.
+     * Return NULL if $translatableString is NULL
+     * 
+     * @param array $translatableStrings
+     * @return string
+     */
+    public function localize(array $translatableStrings)
+    {
+        if (NULL === $translatableStrings) {
+            return NULL;
+        }
+        
+        $language = $this->requestStack->getCurrentRequest()->getLocale();
+        
+
+        if (isset($translatableStrings[$language])) {
+            return $translatableStrings[$language];
+        } else {
+            foreach ($translatableStrings as $string) {
+                if (!empty($string)) {
+                    return $string;
+                }
+            }
+        }
+    
+        return '';
+
+    }
+
+}

Templating/TranslatableStringTwig.php

@@ -0,0 +1,32 @@
+<?php
+namespace Chill\MainBundle\Templating;
+
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
+class TranslatableStringTwig extends \Twig_Extension
+{
+    use ContainerAwareTrait;
+
+    /*
+     * (non-PHPdoc)
+     * @see Twig_Extension::getFilters()
+     */
+    public function getFilters()
+    {
+        return array(
+            new \Twig_SimpleFilter('localize_translatable_string', array($this, 'localize'))
+        );
+    }
+    
+    public function localize(array $translatableStrings)
+    {
+        return $this->container->get('chill.main.helper.translatable_string')
+            ->localize($translatableStrings);
+    }
+    
+    public function getName()
+    {
+        return 'chill_main_localize';
+    }
+
+}