diff --git a/admin-dev/themes/default/template/controllers/products/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl index f355bde3c..f17f56af9 100644 --- a/admin-dev/themes/default/template/controllers/products/attachments.tpl +++ b/admin-dev/themes/default/template/controllers/products/attachments.tpl @@ -37,13 +37,13 @@ {/foreach}  * -

{l s='Maximum 32 characters.'}

+

{l s='Maximum 32 characters.'}

 
{foreach $languages as $language} -
+
{/foreach} @@ -90,4 +90,10 @@
 
+ + {/if} diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 13d44c7c1..721007181 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3153,9 +3153,14 @@ class AdminProductsControllerCore extends AdminController $attachment_description[$language['id_lang']] = ''; } + $iso_tiny_mce = $this->context->language->iso_code; + $iso_tiny_mce = (file_exists(_PS_JS_DIR_.'tiny_mce/langs/'.$iso_tiny_mce.'.js') ? $iso_tiny_mce : 'en'); + $data->assign(array( 'obj' => $obj, 'table' => $this->table, + 'ad' => dirname($_SERVER['PHP_SELF']), + 'iso_tiny_mce' => $iso_tiny_mce, 'languages' => $this->_languages, 'attach1' => Attachment::getAttachments($this->context->language->id, $obj->id, true), 'attach2' => Attachment::getAttachments($this->context->language->id, $obj->id, false),