diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php
index 916942623..b9cf3006b 100644
--- a/controllers/admin/AdminLanguagesController.php
+++ b/controllers/admin/AdminLanguagesController.php
@@ -152,7 +152,7 @@ class AdminLanguagesControllerCore extends AdminController
'name' => 'date_format_lite',
'required' => true,
'size' => 15,
- 'desc' => $this->l('Short date format (e.g. YY-MM-DD)')
+ 'desc' => sprintf($this->l('Short date format (e.g., %s)'), 'Y-m-d')
),
array(
'type' => 'text',
@@ -160,7 +160,7 @@ class AdminLanguagesControllerCore extends AdminController
'name' => 'date_format_full',
'required' => true,
'size' => 25,
- 'desc' => $this->l('Full date format (e.g., YYYY-MM-DD)')
+ 'desc' => sprintf($this->l('Full date format (e.g., %s)'), 'Y-m-d H:i:s')
),
array(
'type' => 'file',
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index eaa19d4a1..750f9aad0 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -426,8 +426,8 @@ class AdminTranslationsControllerCore extends AdminController
{
$this->exportTabs();
$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 = Tools::getCurrentUrlProtocolPrefix().Tools::getShopDomain().__PS_BASE_URI__.'translations/export/'.$this->lang_selected->iso_code.'.gzip';
+ $file_name = _PS_TRANSLATIONS_DIR_.'/export/'.$this->lang_selected->iso_code.'.gzip';
+ $gz = new Archive_Tar($file_name, true);
if ($gz->createModify($items, null, _PS_ROOT_DIR_));
{
ob_start();
@@ -440,7 +440,8 @@ class AdminTranslationsControllerCore extends AdminController
header('Content-Disposition: attachment; filename="'.$this->lang_selected->iso_code.'.gzip'.'"');
header('Content-Transfer-Encoding: binary');
ob_end_flush();
- @readfile($file_name);
+ readfile($file_name);
+ @unlink($file_name);
exit;
}
$this->errors[] = Tools::displayError('An error occurred while creating archive.');