[-] BO : Bug fix #PSTEST-1014 #PSTEST-966 - Wrong call of smarty translation function
This commit is contained in:
fSerny
@@ -278,8 +278,8 @@ class AdminControllerCore extends Controller
|
||||
5 => $this->l('Status update successful'), 6 => $this->l('Settings update successful'),
|
||||
7 => $this->l('Image successfully deleted'), 8 => $this->l('Module downloaded successfully'),
|
||||
9 => $this->l('Thumbnails successfully regenerated'), 10 => $this->l('Message sent to the customer'),
|
||||
11 => $this->l('Comment added'), 12 => $this->l('Module installed successfully'),
|
||||
13 => $this->l('Module uninstalled successfully'), 14 => $this->l('Language successfully copied'),
|
||||
11 => $this->l('Comment added'), 12 => $this->l('Module(s) installed successfully'),
|
||||
13 => $this->l('Module(s) uninstalled successfully'), 14 => $this->l('Language successfully copied'),
|
||||
15 => $this->l('Translations successfully added'), 16 => $this->l('Module transplanted successfully to hook'),
|
||||
17 => $this->l('Module removed successfully from hook'), 18 => $this->l('Upload successful'),
|
||||
19 => $this->l('Duplication completed successfully'), 20 => $this->l('Translation added successfully but the language has not been created'),
|
||||
|
||||
@@ -662,7 +662,7 @@ class BlockCms extends Module
|
||||
public function displayBlockCMS($column)
|
||||
{
|
||||
$cms_titles = BlockCMSModel::getCMSTitles($column);
|
||||
|
||||
print_r($cms_titles);
|
||||
$this->smarty->assign(array(
|
||||
'block' => 1,
|
||||
'cms_titles' => $cms_titles,
|
||||
|
||||
+10
-10
@@ -1,12 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<module>
|
||||
<name>blockcms</name>
|
||||
<displayName><![CDATA[CMS Block]]></displayName>
|
||||
<version><![CDATA[1.1]]></version>
|
||||
<description><![CDATA[Adds a block with several CMS links.]]></description>
|
||||
<author><![CDATA[PrestaShop]]></author>
|
||||
<tab><![CDATA[front_office_features]]></tab>
|
||||
<is_configurable>1</is_configurable>
|
||||
<need_instance>0</need_instance>
|
||||
<module>
|
||||
<name>blockcms</name>
|
||||
<displayName><![CDATA[CMS Block]]></displayName>
|
||||
<version><![CDATA[1.1]]></version>
|
||||
<description><![CDATA[Adds a block with several CMS links.]]></description>
|
||||
<author><![CDATA[PrestaShop]]></author>
|
||||
<tab><![CDATA[front_office_features]]></tab>
|
||||
<is_configurable>0</is_configurable>
|
||||
<need_instance>0</need_instance>
|
||||
<limited_countries></limited_countries>
|
||||
</module>
|
||||
</module>
|
||||
@@ -44,20 +44,20 @@
|
||||
|
||||
<h3 style="margin-top:1px;">
|
||||
{if $key == 0}
|
||||
{l s='Left blocks'}
|
||||
{l s='Left blocks' mod='blockcms'}
|
||||
{else}
|
||||
{l s='Right blocks'}
|
||||
{l s='Right blocks' mod='blockcms'}
|
||||
{/if}
|
||||
</h3>
|
||||
|
||||
<table cellspacing="0" cellpadding="0" style="min-width:40em;" class="table tableDnD cms" id="cms_block_{$key%2}">
|
||||
<thead>
|
||||
<tr class="nodrag nodrop">
|
||||
<th>{l s='ID'}</th>
|
||||
<th>{l s='Name of block'}</th>
|
||||
<th>{l s='Category name'}</th>
|
||||
<th>{l s='Position'}</th>
|
||||
<th>{l s='Actions'}</th>
|
||||
<th>{l s='ID' mod='blockcms'}</th>
|
||||
<th>{l s='Name of block' mod='blockcms'}</th>
|
||||
<th>{l s='Category name' mod='blockcms'}</th>
|
||||
<th>{l s='Position' mod='blockcms'}</th>
|
||||
<th>{l s='Actions' mod='blockcms'}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -72,19 +72,19 @@
|
||||
style="display: none;"
|
||||
{/if}
|
||||
href="{$current}&configure=blockcms&id_cms_block={$cms_block['id_cms_block']}&way=1&position={(int)$cms_block['position'] + 1}&location=0&token={$token}">
|
||||
<img src="{$smarty.const._PS_ADMIN_IMG_}down.gif" alt="{l s='Down'}" title="{l s='Down'}" />
|
||||
<img src="{$smarty.const._PS_ADMIN_IMG_}down.gif" alt="{l s='Down' mod='blockcms'}" title="{l s='Down' mod='blockcms'}" />
|
||||
</a>
|
||||
<a
|
||||
{if (($cms_block['position'] == 0) || ($key == 0))}
|
||||
style="display: none;"
|
||||
{/if}
|
||||
href="{$current}&configure=blockcms&id_cms_block={$cms_block['id_cms_block']}&way=0&position={(int)$cms_block['position'] - 1}&location=0&token={$token}">
|
||||
<img src="{$smarty.const._PS_ADMIN_IMG_}up.gif" alt="{l s='Up'}" title="{l s='Up'}" />
|
||||
<img src="{$smarty.const._PS_ADMIN_IMG_}up.gif" alt="{l s='Up' mod='blockcms'}" title="{l s='Up' mod='blockcms'}" />
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="{$current}&token={$token}&editBlockCMS&id_cms_block={(int)$cms_block['id_cms_block']}" title="{l s='Edit'}"><img src="{$smarty.const._PS_ADMIN_IMG_}edit.gif" alt="" /></a>
|
||||
<a href="{$current}&token={$token}&deleteBlockCMS&id_cms_block={(int)$cms_block['id_cms_block']}" title="{l s='Delete'}"><img src="{$smarty.const._PS_ADMIN_IMG_}delete.gif" alt="" /></a>
|
||||
<a href="{$current}&token={$token}&editBlockCMS&id_cms_block={(int)$cms_block['id_cms_block']}" title="{l s='Edit' mod='blockcms'}"><img src="{$smarty.const._PS_ADMIN_IMG_}edit.gif" alt="" /></a>
|
||||
<a href="{$current}&token={$token}&deleteBlockCMS&id_cms_block={(int)$cms_block['id_cms_block']}" title="{l s='Delete' mod='blockcms'}"><img src="{$smarty.const._PS_ADMIN_IMG_}delete.gif" alt="" /></a>
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
@@ -132,8 +132,8 @@
|
||||
<th>
|
||||
<input type="checkbox" name="checkme" id="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$input.name}', this.checked)" />
|
||||
</th>
|
||||
<th>{l s='ID'}</th>
|
||||
<th>{l s='Name'}</th>
|
||||
<th>{l s='ID' mod='blockcms'}</th>
|
||||
<th>{l s='Name' mod='blockcms'}</th>
|
||||
</tr>
|
||||
|
||||
{foreach $cms as $key => $cms_category}
|
||||
@@ -165,7 +165,7 @@
|
||||
|
||||
</table>
|
||||
{else}
|
||||
<p>{l s='No pages created'}</p>
|
||||
<p>{l s='No pages created' mod='blockcms'}</p>
|
||||
{/if}
|
||||
{else}
|
||||
{$smarty.block.parent}
|
||||
|
||||
@@ -660,6 +660,7 @@ $_LANGADM['AdminController5bdc90e9608e48cc15f38ff360cd234a'] = 'Message affiché
|
||||
$_LANGADM['AdminController6175b106e638d4dd873cb3ff96724392'] = 'Miniatures régénérées avec succès';
|
||||
$_LANGADM['AdminController630f6dc397fe74e52d5189e2c80f282b'] = 'Retour à la liste';
|
||||
$_LANGADM['AdminController6357d3551190ec7e79371a8570121d3a'] = 'Il y a';
|
||||
$_LANGADM['AdminController6b5ed001b03b7e1788ba881c15a08633'] = 'Module(s) installé(s) avec succès';
|
||||
$_LANGADM['AdminController70f4b635847038d056e33959821a7a66'] = 'caractères maximum';
|
||||
$_LANGADM['AdminController76b626495e191e08268ba5ed8bacee18'] = 'Mise à jour réussie';
|
||||
$_LANGADM['AdminController77181afe06241c54ef771a23ee6da8f4'] = 'Derniers messages';
|
||||
@@ -681,7 +682,6 @@ $_LANGADM['AdminController998b344cff693ad388a14ba89b1523c7'] = 'n\'est pas valab
|
||||
$_LANGADM['AdminControllera1acc250773be8550f5758190e1db93a'] = 'Mise à jour de l\'état réussie';
|
||||
$_LANGADM['AdminControllera2eda4e1c4dfc9bade7150b878c57a46'] = 'Voir tous les messages';
|
||||
$_LANGADM['AdminControllera4da6f31ab268a5310bc475e63ab92db'] = 'Je comprends les risques et je veux vraiment afficher cette page';
|
||||
$_LANGADM['AdminControllera7c974ac23201089a5d17536bbb09f05'] = 'Module installé avec succès';
|
||||
$_LANGADM['AdminControllera7df4df5ba87b5e752c81b276959e797'] = 'Sélection supprimée avec succès';
|
||||
$_LANGADM['AdminControllera92269f5f14ac147a821728c23204c0b'] = 'Cacher l\'avertissement';
|
||||
$_LANGADM['AdminControllerab2f2e57bccf2066528b0c585993dcda'] = 'Pas de nouveau client inscrit sur votre boutique';
|
||||
@@ -690,8 +690,8 @@ $_LANGADM['AdminControllerad3737feaf28ed81b4073c7113f6228e'] = 'Message envoyé
|
||||
$_LANGADM['AdminControllerb73a47387ac1a23b17154c3b1e93fb71'] = 'Pas de nouveau message envoyé sur votre boutique';
|
||||
$_LANGADM['AdminControllerb85b9d2e7e1153bd3d5a4bb0f57d347b'] = 'Duplication réussie';
|
||||
$_LANGADM['AdminControllerb95c09fb28e80cc672fd533a62252d70'] = 'Ajouter %s';
|
||||
$_LANGADM['AdminControllerbbaed3b1f842925ef862ec19261744d8'] = 'Module désinstallé';
|
||||
$_LANGADM['AdminControllerbbaff12800505b22a853e8b7f4eb6a22'] = 'Contact';
|
||||
$_LANGADM['AdminControllerbea715e8641867e000b491b04f4f9d3c'] = 'Module(s) désinstallé(s) avec succès';
|
||||
$_LANGADM['AdminControllerbee83fbebb6a50869091c78685f2b7f7'] = 'caractères max, HTML inclus';
|
||||
$_LANGADM['AdminControllerc9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
|
||||
$_LANGADM['AdminControllercbebc850f5f849e8956b5f8075f48f69'] = 'partout';
|
||||
@@ -1070,6 +1070,7 @@ $_LANGADM['AdminEmployees0885f0c211f74834f0109c5abaf4cdc4'] = 'Langue :';
|
||||
$_LANGADM['AdminEmployees20db0bfeecd8fe60533206a2b5e9891a'] = 'Prénom';
|
||||
$_LANGADM['AdminEmployees2467bfdbc86d3cc7aab2130f56ce6978'] = 'Minimum 8 caractères, uniquement lettres, nombres ou';
|
||||
$_LANGADM['AdminEmployees24a23d787190f2c4812ff9ab11847a72'] = 'État :';
|
||||
$_LANGADM['AdminEmployees38bc801a65d737636374445ec68de6d4'] = 'Onglet par défaut';
|
||||
$_LANGADM['AdminEmployees38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
|
||||
$_LANGADM['AdminEmployees41bc9496fbde8565bd5fc699e513fbd9'] = 'Autoriser cet employé à se connecter au back-office';
|
||||
$_LANGADM['AdminEmployees440a99c75011af93d1728ea673516eb3'] = 'Largeur du back-office en pixels. La valeur \"0\" signifie que la largeur sera flexible.';
|
||||
@@ -1083,6 +1084,7 @@ $_LANGADM['AdminEmployees6826c313cc8d16a3773ae8d892d4549d'] = 'Sélectionnez les
|
||||
$_LANGADM['AdminEmployees78e365acb087fd1f8d494dae0001de10'] = 'Adresse e-mail :';
|
||||
$_LANGADM['AdminEmployees79f79257476673a2aea1b2a41adf3384'] = 'Montrer screencast :';
|
||||
$_LANGADM['AdminEmployees7bc873cba11f035df692c3549366c722'] = '-- Choisissez --';
|
||||
$_LANGADM['AdminEmployees802a0d2adac7699a3a37d1abe76f8ad4'] = 'Cet onglet s\'affichera juste après que l\'employé soit authentifié';
|
||||
$_LANGADM['AdminEmployees8b5dd64ab8d0b8158906796b53a200e2'] = 'Adresse e-mail';
|
||||
$_LANGADM['AdminEmployees8d3f5eff9c40ee315d452392bed5309b'] = 'Nom';
|
||||
$_LANGADM['AdminEmployees9273a15f9ab581801b7faeeda6ca08e4'] = 'Options des employés';
|
||||
|
||||
Reference in New Issue
Block a user