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)

install/insert.sql

@@ -32,6 +32,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('url_site','', 0, 0, NOW(), NOW()),
 ('pdf_invoice_file', 'invoice', 0, 0, NOW(), NOW()),
 ('pdf_delivery_file', 'delivery', 0, 0, NOW(), NOW()),
+('unknown-flag-path','assets/img/flags/unknown.png', 0, 0, NOW(), NOW()),
+
 ('session_config.default', '1', 1, 1, NOW(), NOW()),
 ('default_lang_without_translation', '1', 1, 1, NOW(), NOW()),
 ('store_name','', 0, 1, NOW(), NOW()),
@@ -43,6 +45,7 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('thelia_release_version','0', 1, 1, NOW(), NOW()),
 ('thelia_extra_version','beta3', 1, 1, NOW(), NOW());
 
+
 INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
 (1, 'en_US', 'Class name of the session handler', NULL, NULL, NULL),
 (2, 'en_US', 'Check available product stock (1) or ignore it (0) when displaying and changing ordered quantity', NULL, NULL, NULL),
@@ -70,7 +73,8 @@ INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `pos
 (24, 'en_US', '"Remember me" cookie expiration time, in seconds, for customer users', NULL, NULL, NULL),
 (25, 'en_US', 'Base URL of the shop (e.g. http://www.yourshopdomain.com)', NULL, NULL, NULL),
 (26, 'en_US', 'Name of the invoice view in the current PDF template (without extension)', NULL, NULL, NULL),
-(27, 'en_US', 'Name of the delivery view in the current PDF template (without extension)', NULL, NULL, NULL);
+(27, 'en_US', 'Name of the delivery view in the current PDF template (without extension)', NULL, NULL, NULL),
+(28, 'en_US', 'The path (relative to the default back-office template) to the image used when no flag image can be found for a country', NULL, NULL, NULL);
 
 INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES
 (1, 'TheliaDebugBar', 1, 1, 1, 'TheliaDebugBar\\TheliaDebugBar', NOW(), NOW()),

install/thelia.sql

@@ -1,3 +1,4 @@
+
 # This is a fix for InnoDB in MySQL >= 4.1.x
 # It "suspends judgement" for fkey relationships until are tables are set.
 SET FOREIGN_KEY_CHECKS = 0;

install/update/2.0.0-beta4.sql

@@ -12,6 +12,12 @@ INSERT INTO  `module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `po
 UPDATE `config` SET `value`='2.0.0-beta4' WHERE `name`='thelia_version';
 UPDATE `config` SET `value`='beta4' WHERE `name`='thelia_extra_version';
 
+-- Preferred locale for admin users
+ALTER TABLE `admin` ADD `locale` VARCHAR(45) NOT NULL;
 UPDATE `admin` SET `locale`='en_US';
 
+-- Unknown flag image path
+INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updated_at`) VALUES
+('unknown-flag-path','assets/img/flags/unknown.png', 1, 1, NOW(), NOW());
+
 SET FOREIGN_KEY_CHECKS = 1;

templates/backOffice/default/admin-layout.tpl

@@ -84,7 +84,7 @@
                                 <div class="btn-group">
                                     {loop type="lang" name="ui-lang" id="{lang attr='id'}"}
                                     <button class="btn btn-default">
-                                        <img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /> {$CODE|ucfirst}</a>
+                                        <img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /> {$CODE|ucfirst}</a>
                                     </button>
                                     {/loop}
 
@@ -93,7 +93,7 @@
                                     </button>
                                     <ul class="dropdown-menu">
                                         {loop type="lang" name="ui-lang"}
-                                        <li><a href="{url path="{navigate to="current"}" lang={$CODE}}"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /> {$CODE|ucfirst}</a></li>
+                                        <li><a href="{url path="{navigate to="current"}" lang={$CODE}}"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /> {$CODE|ucfirst}</a></li>
                                         {/loop}
                                      </ul>
                                 </div>

templates/backOffice/default/ajax/language-update-modal.html

@@ -18,6 +18,7 @@
         <div class="form-group {if $error}has-error{/if}">
             <label for="{$label_attr.for}" class="control-label">{intl l={$label}} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l={$label}}" placeholder="{intl l='Company'}">
+            <span class="help-block">{intl l='<a href="http://en.wikipedia.org/wiki/ISO_639-1_language_matrix" target="_other">Check the list</a> of ISO 639-1 codes'}</span>
         </div>
     {/form_field}
 
@@ -32,6 +33,7 @@
         <div class="form-group {if $error}has-error{/if}">
             <label for="{$label_attr.for}" class="control-label">{intl l={$label}} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l={$label}}" placeholder="{intl l='Company'}">
+            <span class="help-block">{intl l='The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function'}</span>
         </div>
     {/form_field}
 
@@ -39,6 +41,7 @@
         <div class="form-group {if $error}has-error{/if}">
             <label for="{$label_attr.for}" class="control-label">{intl l={$label}} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l={$label}}" placeholder="{intl l='Company'}">
+            <span class="help-block">{intl l='The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function'}</span>
         </div>
     {/form_field}
 
@@ -53,7 +56,7 @@
     dialog_title = {intl l="Edit a language"}
     dialog_body  = {$smarty.capture.edit_lang_dialog nofilter}
 
-dialog_ok_label     = {intl l="Edit this language"}
+dialog_ok_label     = {intl l="Save changes"}
 dialog_cancel_label = {intl l="Cancel"}
 
 form_action        = {url path="/admin/configuration/languages/save/{$lang_id}"}