dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] TR : fix #PSCFV-3358

Browse Source
This commit is contained in:
lLefevre
2012-07-26 14:05:50 +00:00
parent 952278a4e5
commit c11f298a8a
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/attachments.tpl
+8 -2
View File
@@ -37,13 +37,13 @@
</div> </div>
{/foreach} {/foreach}
<sup>&nbsp;*</sup> <sup>&nbsp;*</sup>
<p class="preference_description">{l s='Maximum 32 characters.'}</p>
</div> </div>
<p class="margin-form preference_description">{l s='Maximum 32 characters.'}</p>
<div class="clear">&nbsp;</div> <div class="clear">&nbsp;</div>
<label>{l s='Description:'} </label> <label>{l s='Description:'} </label>
<div class="margin-form translatable"> <div class="margin-form translatable">
{foreach $languages as $language} {foreach $languages as $language}
<div id="attachment_description_{$language.id_lang}" style="display: {if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;"> <div class="lang_{$language.id_lang}" style="display: {if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
<textarea name="attachment_description_{$language.id_lang}">{$attachment_description[$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea> <textarea name="attachment_description_{$language.id_lang}">{$attachment_description[$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
</div> </div>
{/foreach} {/foreach}
@@ -90,4 +90,10 @@
</table> </table>
<div class="clear">&nbsp;</div> <div class="clear">&nbsp;</div>
<input type="hidden" name="arrayAttachments" id="arrayAttachments" value="{foreach $attach1 as $attach}{$attach.id_attachment},{/foreach}" /> <input type="hidden" name="arrayAttachments" id="arrayAttachments" value="{foreach $attach1 as $attach}{$attach.id_attachment},{/foreach}" />
<script type="text/javascript">
var iso = '{$iso_tiny_mce}';
var pathCSS = '{$smarty.const._THEME_CSS_DIR_}';
var ad = '{$ad}';
</script>
{/if} {/if}
controllers/admin/AdminProductsController.php
+5
View File
@@ -3153,9 +3153,14 @@ class AdminProductsControllerCore extends AdminController
$attachment_description[$language['id_lang']] = ''; $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( $data->assign(array(
'obj' => $obj, 'obj' => $obj,
'table' => $this->table, 'table' => $this->table,
'ad' => dirname($_SERVER['PHP_SELF']),
'iso_tiny_mce' => $iso_tiny_mce,
'languages' => $this->_languages, 'languages' => $this->_languages,
'attach1' => Attachment::getAttachments($this->context->language->id, $obj->id, true), 'attach1' => Attachment::getAttachments($this->context->language->id, $obj->id, true),
'attach2' => Attachment::getAttachments($this->context->language->id, $obj->id, false), 'attach2' => Attachment::getAttachments($this->context->language->id, $obj->id, false),