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

[-] BO : fixed translation and languages issues

Browse Source
This commit is contained in:
Damien Metzger
2013-06-27 17:51:25 +02:00
parent 75cddbae99
commit 8f01b35f46
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminLanguagesController.php
+2 -2
View File
@@ -152,7 +152,7 @@ class AdminLanguagesControllerCore extends AdminController
'name' => 'date_format_lite', 'name' => 'date_format_lite',
'required' => true, 'required' => true,
'size' => 15, 'size' => 15,
'desc' => $this->l('Short date format (e.g. YY-MM-DD)') 'desc' => sprintf($this->l('Short date format (e.g., %s)'), '<a href="http://php.net/date" target="_blank">Y-m-d</a>')
), ),
array( array(
'type' => 'text', 'type' => 'text',
@@ -160,7 +160,7 @@ class AdminLanguagesControllerCore extends AdminController
'name' => 'date_format_full', 'name' => 'date_format_full',
'required' => true, 'required' => true,
'size' => 25, 'size' => 25,
'desc' => $this->l('Full date format (e.g., YYYY-MM-DD)') 'desc' => sprintf($this->l('Full date format (e.g., %s)'), '<a href="http://php.net/date" target="_blank">Y-m-d H:i:s</a>')
), ),
array( array(
'type' => 'file', 'type' => 'file',
controllers/admin/AdminTranslationsController.php
+4 -3
View File
@@ -426,8 +426,8 @@ class AdminTranslationsControllerCore extends AdminController
{ {
$this->exportTabs(); $this->exportTabs();
$items = array_flip(Language::getFilesList($this->lang_selected->iso_code, $this->theme_selected, false, false, false, false, true)); $items = array_flip(Language::getFilesList($this->lang_selected->iso_code, $this->theme_selected, false, false, false, false, true));
$gz = new Archive_Tar(_PS_TRANSLATIONS_DIR_.'/export/'.$this->lang_selected->iso_code.'.gzip', true); $file_name = _PS_TRANSLATIONS_DIR_.'/export/'.$this->lang_selected->iso_code.'.gzip';
$file_name = Tools::getCurrentUrlProtocolPrefix().Tools::getShopDomain().__PS_BASE_URI__.'translations/export/'.$this->lang_selected->iso_code.'.gzip'; $gz = new Archive_Tar($file_name, true);
if ($gz->createModify($items, null, _PS_ROOT_DIR_)); if ($gz->createModify($items, null, _PS_ROOT_DIR_));
{ {
ob_start(); ob_start();
@@ -440,7 +440,8 @@ class AdminTranslationsControllerCore extends AdminController
header('Content-Disposition: attachment; filename="'.$this->lang_selected->iso_code.'.gzip'.'"'); header('Content-Disposition: attachment; filename="'.$this->lang_selected->iso_code.'.gzip'.'"');
header('Content-Transfer-Encoding: binary'); header('Content-Transfer-Encoding: binary');
ob_end_flush(); ob_end_flush();
@readfile($file_name); readfile($file_name);
@unlink($file_name);
exit; exit;
} }
$this->errors[] = Tools::displayError('An error occurred while creating archive.'); $this->errors[] = Tools::displayError('An error occurred while creating archive.');