Add translations checking functionality (Cocolabs-SAS#279)

app/config/parameters.yml.dist

@@ -36,6 +36,8 @@ parameters:
     cocorico.admin: admin
     #Admin Web JMS translations activation
     cocorico.admin_translation: false
+    #To check if site texts are translatable
+    cocorico.check_translation: false
 
     #Microsoft Translator key
     cocorico.translator.secret.key: ~

src/Cocorico/ConfigBundle/Resources/views/list_parameter_value.html.twig

@@ -5,6 +5,8 @@
         {{ (object.getValue() / 100) | format_price(app.request.locale, 2) }}
     {% elseif object.getType() == 'percent' %}
         {{ object.getValue() * 100 }} %
+    {% elseif object.getType() == 'checkbox' %}
+        {{ object.getValue() ? true : false }}
     {% else %}
         {{ object.getValue() }}
     {% endif %}

src/Cocorico/CoreBundle/Admin/ListingAdmin.php

@@ -207,8 +207,7 @@ function ($num) {
                     array(
                         'translation_domain' => 'cocorico_listing_deposit',
                     )
-                )
-                ->end();
+                );
         }
 
         $formMapper

src/Cocorico/CoreBundle/Resources/config/Services/twig_extensions.yml

@@ -76,4 +76,15 @@ services:
         arguments:
             - "%kernel.bundles%"
         tags:
-            - { name: twig.extension }
+            - { name: twig.extension }
+
+    #Override trans filters. Don't change service name
+    twig.extension.trans:
+        class: Cocorico\CoreBundle\Twig\TranslationExtension
+        public: false
+        arguments:
+            - '@translator'
+        calls:
+            - [setCheckTranslation, ["%cocorico.check_translation%"]]
+        tags:
+             - { name: twig.extension }

src/Cocorico/CoreBundle/Resources/config/config.yml

@@ -130,7 +130,7 @@ jms_translation:
             dirs: ["%kernel.root_dir%", "%kernel.root_dir%/../src"]
             output_dir: "%kernel.root_dir%/Resources/translations"
 #            ignored_domains: [routes]
-            excluded_names: ["*TestCase.php", "*Test.php"]
+            excluded_names: ["*TestCase.php", "*Test.php", "TranslationExtension.php"]
             excluded_dirs: [cache, data, logs, Tests]
             extractors: [jms_i18n_routing, cocorico_breadcrumbs, sonata_admin ]
 

src/Cocorico/CoreBundle/Resources/config/parameters.yml

@@ -230,12 +230,14 @@ parameters:
     #BookingDepositRefund : none or Cocorico\ListingDepositBundle\Entity\BookingDepositRefund (without quotes!)
     cocorico_listing_deposit.booking_deposit_refund.entity_class: none
 
-    #Config
+    #Config. types  taken into account for now are  percent, price, checkbox
     cocorico_config.parameters_allowed:
         cocorico.fee_as_asker:
             type: 'percent'
         cocorico.fee_as_offerer:
             type: 'percent'
+        cocorico.check_translation:
+            type: 'text'
 
     #User
     #Is there a delivery address. Should not be enabled if DeliveryBundle is enabled.
@@ -309,6 +311,8 @@ parameters:
     cocorico.admin: ~
     #Admin Web JMS translations activation
     cocorico.admin_translation: ~
+    #To check if site texts are translatable
+    cocorico.check_translation: ~
 
     #translator key
     cocorico.translator.secret.key: ~

src/Cocorico/CoreBundle/Twig/TranslationExtension.php

@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of the Cocorico package.
+ *
+ * (c) Cocolabs SAS <contact@cocolabs.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Cocorico\CoreBundle\Twig;
+
+
+use Symfony\Bridge\Twig\Extension\TranslationExtension as BaseTranslationExtension;
+use Symfony\Component\Translation\TranslatorInterface;
+
+/**
+ * Class TranslationExtension
+ *
+ * Override trans filter by adding suffix to translations to know if a text has been translated through web interface
+ *
+ * @package Cocorico\CoreBundle\Twig
+ */
+class TranslationExtension extends BaseTranslationExtension
+{
+    private $checkTranslation;
+
+    const TRANS_SUFFIX = '☮';
+
+    public function __construct(
+        TranslatorInterface $translator,
+        \Twig_NodeVisitorInterface $translationNodeVisitor = null
+    ) {
+        parent::__construct($translator, $translationNodeVisitor);
+    }
+
+    public function setCheckTranslation($checkTranslation)
+    {
+        $this->checkTranslation = $checkTranslation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilters()
+    {
+        if ($this->checkTranslation) {
+            return array(
+                new \Twig_SimpleFilter('trans', array($this, 'transOverride')),
+                new \Twig_SimpleFilter('transchoice', array($this, 'transchoiceOverride')),
+            );
+        }
+
+        return parent::getFilters();
+    }
+
+    public function transOverride($id, array $parameters = array(), $domain = null, $locale = null)
+    {
+        if (null === $locale) {
+            $locale = $this->getTranslator()->getLocale();
+        }
+
+        if (null === $domain) {
+            $domain = 'messages';
+        }
+
+        if ('messages' !== $domain && false === $this->translationExists($id, $domain, $locale)) {
+            $domain = 'messages';
+        }
+
+        return $this->getTranslator()->trans($id, $parameters, $domain, $locale) . self::TRANS_SUFFIX;
+    }
+
+    public function transchoiceOverride($id, $number, array $parameters = array(), $domain = null, $locale = null)
+    {
+        if (null === $locale) {
+            $locale = $this->getTranslator()->getLocale();
+        }
+
+        if (null === $domain) {
+            $domain = 'messages';
+        }
+
+        if ('messages' !== $domain && false === $this->translationExists($id, $domain, $locale)) {
+            $domain = 'messages';
+        }
+
+        return $this->getTranslator()->transChoice(
+            $id,
+            $number,
+            array_merge(array('%count%' => $number), $parameters),
+            $domain,
+            $locale
+        ) . self::TRANS_SUFFIX;
+    }
+
+    protected function translationExists($id, $domain, $locale)
+    {
+        return $this->getTranslator()->getCatalogue($locale)->has((string)$id, $domain);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'translator';
+    }
+}

web/css/all-override.css

@@ -356,7 +356,7 @@ li.time-fields {
 }
 
 .time-fields .jcf-select, .nb-days .jcf-select {
-    width: 50px;
+    width: 54px;
     margin-left: 3px;
 }
 
@@ -369,7 +369,7 @@ li.time-fields {
 }
 
 .time-fields .jcf-select-text, .nb-days .jcf-select-text {
-    width: 20px;
+    width: 24px;
 }
 
 .jcf-select-no-scroll .jcf-scrollbar {

web/css/all.css

@@ -7080,7 +7080,7 @@ span.btn:focus {
 
 .date-selection .col {
     float: left;
-    width: 48%;
+    width: 48.7%;
     position: relative;
 }
 
@@ -8637,7 +8637,11 @@ label {
 }
 
 .nav-tabs > li {
-    margin-right: 6px;
+    margin-right: 5px;
+}
+
+.nav-tabs > li:last-child {
+    margin-right: 0;
 }
 
 .nav-tabs > li > a {