Improved languages management, added many country flags. Fix #183

core/lib/Thelia/Controller/Admin/LangController.php

@@ -123,7 +123,6 @@ class LangController extends BaseAdminController
             $error_msg = $this->getTranslator()->trans("Failed to update language definition: %ex", array("%ex" => $ex->getMessage()));
             Tlog::getInstance()->addError("Failed to update language definition", $ex->getMessage());
         }
-echo "err=".$error_msg;
 
         return $this->renderDefault(array('error_message' => $error_msg));
     }
@@ -231,7 +230,7 @@ echo "err=".$error_msg;
         }
 
         return $this->renderDefault(array(
-           'error_delete_message' => $error_msg
+           'error_message' => $error_msg
         ));
 
     }

core/lib/Thelia/Form/Lang/LangCreateForm.php

@@ -70,7 +70,7 @@ class LangCreateForm extends BaseForm
                 'constraints' => array(
                     new NotBlank()
                 ),
-                'label' => Translator::getInstance()->trans('ISO 639 Code'),
+                'label' => Translator::getInstance()->trans('ISO 639-1 Code'),
                 'label_attr' => array(
                     'for' => 'code_lang'
                 )

core/lib/Thelia/Model/ConfigQuery.php

@@ -92,6 +92,9 @@ class ConfigQuery extends BaseConfigQuery {
         return self::read('check-available-stock', 1) != 0;
     }
 
+    public static function getUnknownFlagPath() {
+        return self::read('unknown-flag-path', '/assets/img/flags/unknown.png');
+    }
     /* smtp config */
     public static function isSmtpEnable()
     {

core/lib/Thelia/Model/Lang.php

@@ -5,8 +5,11 @@ namespace Thelia\Model;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Exception\PropelException;
 use Propel\Runtime\Propel;
+use Symfony\Component\Filesystem\Filesystem;
 use Thelia\Core\Event\Lang\LangEvent;
 use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Template\TemplateHelper;
+use Thelia\Core\Translation\Translator;
 use Thelia\Model\Base\Lang as BaseLang;
 use Thelia\Model\LangQuery;
 use Thelia\Model\Map\LangTableMap;
@@ -53,6 +56,33 @@ class Lang extends BaseLang {
 
     }
 
+    protected function fixMissingFlag() {
+        // Be sure that a lang have a flag, otherwise copy the
+        // "unknown" flag
+        $adminTemplate = TemplateHelper::getInstance()->getActiveAdminTemplate();
+        $unknownFlag = ConfigQuery::getUnknownFlagPath();
+
+        $unknownFlagPath = $adminTemplate->getAbsolutePath().DS.$unknownFlag;
+
+        if (! file_exists($unknownFlagPath)) {
+            throw new \RuntimeException(
+                Translator::getInstance()->trans(
+                    "The image which replaces an undefined country flag (%file) was not found. Please check unknown-flag-path configuration variable, and check that the image exists.",
+                    array("%file" => $unknownFlag)
+                )
+            );
+        }
+
+        // Check if the country flag exists
+        $countryFlag = rtrim(dirname($unknownFlagPath), DS).DS.$this->getCode().'.png';
+
+        if (! file_exists($countryFlag)) {
+            $fs = new Filesystem();
+
+            $fs->copy($unknownFlagPath, $countryFlag);
+        }
+    }
+
     public function preInsert(ConnectionInterface $con = null)
     {
         $this->dispatchEvent(TheliaEvents::BEFORE_CREATELANG, new LangEvent($this));
@@ -63,6 +93,8 @@ class Lang extends BaseLang {
     public function postInsert(ConnectionInterface $con = null)
     {
         $this->dispatchEvent(TheliaEvents::AFTER_CREATELANG, new LangEvent($this));
+
+        $this->fixMissingFlag();
     }
 
     public function preUpdate(ConnectionInterface $con = null)
@@ -75,6 +107,8 @@ class Lang extends BaseLang {
     public function postUpdate(ConnectionInterface $con = null)
     {
         $this->dispatchEvent(TheliaEvents::AFTER_UPDATELANG, new LangEvent($this));
+
+        $this->fixMissingFlag();
     }
 
     public function preDelete(ConnectionInterface $con = null)