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

// [-] IN : Fixed language detection and help in the installer

Browse Source
This commit is contained in:
Damien Metzger
2013-08-05 11:23:09 +02:00
parent 7f4e4efbd8
commit 581dcec718
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/configure.php
+1 -1
View File
@@ -56,7 +56,7 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
$params = http_build_query(array( $params = http_build_query(array(
'email' => $this->session->admin_email, 'email' => $this->session->admin_email,
'method' => 'addMemberToNewsletter', 'method' => 'addMemberToNewsletter',
'language' => $this->session->lang, 'language' => $this->language->getLanguageIso(),
'visitorType' => 1, 'visitorType' => 1,
'source' => 'installer' 'source' => 'installer'
)); ));
install-dev/theme/views/footer.phtml
+2 -1
View File
@@ -36,7 +36,8 @@
errors.push($(this).text().trim()); errors.push($(this).text().trim());
}); });
psuser_assistance.setStep('install_<?php echo addslashes($this->step) ?>', {'error':errors}); psuser_assistance.setStep('install_<?php echo addslashes($this->step) ?>', {'error':errors});
$('#iframe_help').attr('src', $('#iframe_help').attr('src') + '&errors=' + encodeURI(errors.join(', '))); if (errors.length)
$('#iframe_help').attr('src', $('#iframe_help').attr('src') + '&errors=' + encodeURI(errors.join(', ')));
} }
</script> </script>
</body> </body>
install-dev/theme/views/header.phtml
+1 -1
View File
@@ -73,7 +73,7 @@
</ol> </ol>
<?php if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3)): ?> <?php if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3)): ?>
<iframe scrolling="no" style="height:210px;width:200px;border:none;margin-top:20px" id="iframe_help" <iframe scrolling="no" style="height:210px;width:200px;border:none;margin-top:20px" id="iframe_help"
src="https://api.prestashop.com/iframe/install.php?step=<?php echo $this->step ?>&lang=<?php echo $this->language->getLanguageIso() ?>&country=<?php echo $this->session->shop_country ?>"> src="https://api.prestashop.com/iframe/install.php?step=<?php echo $this->step ?>&lang=<?php echo $this->language->getLanguageIso() ?><?php if (isset($this->session->shop_country)) echo '&country='.$this->session->shop_country; ?>">
<p><?php echo $this->l('Contact us!') ?><br /><?php echo $this->getPhone() ?></p> <p><?php echo $this->l('Contact us!') ?><br /><?php echo $this->getPhone() ?></p>
</iframe> </iframe>
<?php endif; ?> <?php endif; ?>