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

// Merge -> revision 8720

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-22 15:45:10 +00:00
parent 69db63f26c
commit 4f2a090e24
87 changed files with 1591 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/importerosc/fr.php
+8
View File
@@ -12,3 +12,11 @@ $_MODULE['<{importerosc}prestashop>importerosc_a89a64592edf58aee0fc749735902cea'
$_MODULE['<{importerosc}prestashop>importerosc_375e6e17d4bd18a5163d3a7d13b80b4b'] = 'Merci de choisir la devise par défaut';
$_MODULE['<{importerosc}prestashop>importerosc_294f0969b5f80f1bae24a7183eb338d5'] = 'Merci de choisir l\'url de la boutique';
$_MODULE['<{importerosc}prestashop>importerosc_86545d77ce5790e924190d9b5a7ac1b6'] = 'Group par défaut OsCommerce';
$_MODULE['<{importerosc}prestashop>importerosc_9aa1b03934893d7134a660af4204f2a9'] = 'Serveur';
$_MODULE['<{importerosc}prestashop>importerosc_770b2f7556eecbe5000cfcbddc9f9885'] = '(Ex: mysql.mydomain.com)';
$_MODULE['<{importerosc}prestashop>importerosc_8f9bfe9d1345237cb3b2b205864da075'] = 'Utilisateur';
$_MODULE['<{importerosc}prestashop>importerosc_dc647eb65e6711e155375218212b3964'] = 'Mot de passe';
$_MODULE['<{importerosc}prestashop>importerosc_14ae0ea02f571a833786d13d9ca6a897'] = '(Mot de passe peut être vide)';
$_MODULE['<{importerosc}prestashop>importerosc_e307db07b3975fef922a80d07455ee5e'] = 'Base de données';
$_MODULE['<{importerosc}prestashop>importerosc_dac130bdd2c5492a8108a4145bd9f04a'] = 'Préfixe base de données';
$_MODULE['<{importerosc}prestashop>importerosc_6bdc02625540b5264cffe801c37a82dd'] = '(Le préfixe est optionnel. Si toute votre base de données commence par \"pref_\", votre préfixe est \"pref_\")';
modules/importerosc/importerosc.php
+9 -12
View File
@@ -47,7 +47,7 @@ class importerosc extends ImportModule
public function install()
{
if (!parent::install() OR !$this->registerHook('beforeAuthentication'))
if (!parent::install() || !$this->registerHook('beforeAuthentication'))
return false;
return true;
}
@@ -64,26 +64,23 @@ class importerosc extends ImportModule
$langagues = $this->ExecuteS('SELECT * FROM `'.addslashes($this->prefix).'languages`');
$curencies = $this->ExecuteS('SELECT * FROM `'.addslashes($this->prefix).'currencies`');
$html = '<label style="width:220px">'.$this->l('Default osCommerce language').' : </label>
$html = '<label style=\'width:220px\'>'.$this->l('Default osCommerce language : ').'</label>
<div class="margin-form">
<select name="defaultOscLang"><option value="0">------</option>';
<select name=\'defaultOscLang\'><option value=\'0\'>------</option>';
foreach($langagues AS $lang)
$html .= '<option value="'.$lang['languages_id'].'">'.$lang['name'].'</option>';
$html .= '</select></div>
<label style="width:220px">'.$this->l('Default osCommerce currency').' : </label>
<div class="margin-form">
<select name="defaultOscCurrency"><option value="0">------</option>';
<label style=\'width:220px\'>'.$this->l('Default osCommerce currency : ').'</label>
<div class=\'margin-form\'>
<select name=\'defaultOscCurrency\'><option value=\'0\'>------</option>';
foreach($curencies AS $curency)
$html .= '<option value="'.$curency['currencies_id'].'">'.$curency['title'].'</option>';
$html .= '<option value=\''.$curency['currencies_id'].'\'>'.$curency['title'].'</option>';
$html .= '</select></div>';
$html .= '<label style="width:220px">'.$this->l('Shop url').' : </label>
<div class="margin-form">
$html .= '<label style=\'width:220px\'>'.$this->l('Shop url : ').'</label>
<div class=\'margin-form\'>
http://<input type="text" name="shop_url">/
<p>'.$this->l('Specify the root URL of your site oscommerce').'</p>
</div>';
return $html;
}