From 37656c2df91b66d52da77ee061e43f6a62224268 Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 18 Oct 2013 08:20:20 +0000 Subject: [PATCH 1/7] // fixed improper English string for translation --- .../template/controllers/customers/helpers/view/view.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index 73a3f68d4..d85cfd7dd 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -137,7 +137,7 @@
  • {l s='Age:'} {if isset($customer->birthday)} - {$customer_stats['age']} {l s='years old'} ({l s='Birth date:'} {$customer_birthday}) + {l s='%d years old' sprintf=[$customer_stats['age']]} ({l s='Birth date:'} {$customer_birthday}) {else} {l s='Unknown'} {/if} @@ -625,4 +625,4 @@ -{/block} \ No newline at end of file +{/block} From 3e687cd533a2f9d07d8dd47a9a36a9d2ae4ad929 Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 18 Oct 2013 12:17:23 +0000 Subject: [PATCH 2/7] // improved some messages --- modules/blockmanufacturer/blockmanufacturer.php | 2 +- modules/blocksupplier/blocksupplier.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/blockmanufacturer/blockmanufacturer.php b/modules/blockmanufacturer/blockmanufacturer.php index b9184a5f3..5a3d4f8b9 100644 --- a/modules/blockmanufacturer/blockmanufacturer.php +++ b/modules/blockmanufacturer/blockmanufacturer.php @@ -150,7 +150,7 @@ class BlockManufacturer extends Module ), array( 'type' => 'text', - 'label' => $this->l('Elements number'), + 'label' => $this->l('Number of elements to display'), 'name' => 'MANUFACTURER_DISPLAY_TEXT_NB', 'class' => 'fixed-width-xs' ), diff --git a/modules/blocksupplier/blocksupplier.php b/modules/blocksupplier/blocksupplier.php index 70b99ee84..a97c532b7 100644 --- a/modules/blocksupplier/blocksupplier.php +++ b/modules/blocksupplier/blocksupplier.php @@ -169,7 +169,7 @@ class BlockSupplier extends Module ), array( 'type' => 'text', - 'label' => $this->l('Elements number'), + 'label' => $this->l('Number of elements to display'), 'name' => 'SUPPLIER_DISPLAY_TEXT_NB', 'class' => 'fixed-width-xs' ), From f31eb37f37aeb3f859795544e80302d3387c8a14 Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 18 Oct 2013 12:53:16 +0000 Subject: [PATCH 3/7] // improved translations in carriercompare --- modules/carriercompare/carriercompare.php | 8 ++++---- modules/carriercompare/template/carriercompare.tpl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/carriercompare/carriercompare.php b/modules/carriercompare/carriercompare.php index a4a7a419a..a2029b489 100755 --- a/modules/carriercompare/carriercompare.php +++ b/modules/carriercompare/carriercompare.php @@ -290,15 +290,15 @@ class CarrierCompare extends Module 'input' => array( array( 'type' => 'select', - 'label' => $this->l('Refresh carrier list method'), + 'label' => $this->l('How to refresh the carrier list?'), 'name' => 'SE_RERESH_METHOD', 'required' => false, - 'desc' => $this->l('How would you like to refresh information for a customer?'), + 'desc' => $this->l('This determines when the list of carriers presented to the customer is updated.'), 'default_value' => (int)$this->context->country->id, 'options' => array( 'query' => array( - array('id' => 0, 'name' => $this->l('Anytime')), - array('id' => 1, 'name' => $this->l('The required information is set.')) + array('id' => 0, 'name' => $this->l('Automatically with each field change')), + array('id' => 1, 'name' => $this->l('When the customer clicks on the "Estimate Shipping Cost" button')) ), 'id' => 'id', 'name' => 'name', diff --git a/modules/carriercompare/template/carriercompare.tpl b/modules/carriercompare/template/carriercompare.tpl index 0f28d8f18..ceb265ea2 100755 --- a/modules/carriercompare/template/carriercompare.tpl +++ b/modules/carriercompare/template/carriercompare.tpl @@ -88,7 +88,7 @@ PS_SE_HandleEvent();

    - +

    From 06b80701c0ed036069e80a57e50c1bd8562f36f0 Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 18 Oct 2013 13:04:49 +0000 Subject: [PATCH 4/7] // labels --- modules/dashactivity/dashactivity.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php index ed193e9a3..ff56c40e8 100644 --- a/modules/dashactivity/dashactivity.php +++ b/modules/dashactivity/dashactivity.php @@ -297,9 +297,9 @@ class Dashactivity extends Module $sub_widget = array( array('label' => $this->l('Show Pending'), 'config_name' => 'DASHACTIVITY_SHOW_PENDING'), - array('label' => $this->l('Show Notification'), 'config_name' => 'DASHACTIVITY_SHOW_NOTIFICATION'), - array('label' => $this->l('Show Customers'), 'config_name' => 'DASHACTIVITY_SHOW_CUSTOMERS'), - array('label' => $this->l('Show Newsletter'), 'config_name' => 'DASHACTIVITY_SHOW_NEWSLETTER'), + array('label' => $this->l('Show Notifications'), 'config_name' => 'DASHACTIVITY_SHOW_NOTIFICATION'), + array('label' => $this->l('Show Clients'), 'config_name' => 'DASHACTIVITY_SHOW_CUSTOMERS'), + array('label' => $this->l('Show Newsletters'), 'config_name' => 'DASHACTIVITY_SHOW_NEWSLETTER'), array('label' => $this->l('Show Traffic'), 'config_name' => 'DASHACTIVITY_SHOW_TRAFFIC'), ); From b5b18b9d2bfb418379c313dd3bb7e9e559a5b46c Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 18 Oct 2013 13:55:30 +0000 Subject: [PATCH 5/7] // use sprintf --- controllers/admin/AdminLoginController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php index 90995cc23..65d92663d 100755 --- a/controllers/admin/AdminLoginController.php +++ b/controllers/admin/AdminLoginController.php @@ -67,9 +67,9 @@ class AdminLoginControllerCore extends AdminController if ($clientIsMaintenanceOrLocal) $this->errors[] = Tools::displayError('SSL is activated. However, your IP is allowed to enter unsecure mode for maintenance or local IP issues.'); else - { - $warningSslMessage = Tools::displayError('SSL is activated. Please connect using the following link to '); - $warningSslMessage .= 'log into secure mode (https://)'; + { + $url = 'https://'.Tools::safeOutput(Tools::getServerName()).Tools::safeOutput($_SERVER['REQUEST_URI']); + $warningSslMessage = sprintf(Tools::displayError('SSL is activated. Please connect using the following link to log into secure mode (https://)'), $url); $this->context->smarty->assign(array('warningSslMessage' => $warningSslMessage)); } } From d097679ea0a1f27c2d9985d774446dfbe95b0446 Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 18 Oct 2013 14:16:17 +0000 Subject: [PATCH 6/7] // improvements to producttooltip texts --- modules/producttooltip/producttooltip.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/producttooltip/producttooltip.php b/modules/producttooltip/producttooltip.php index 8778a3d73..a8d3c0f1b 100644 --- a/modules/producttooltip/producttooltip.php +++ b/modules/producttooltip/producttooltip.php @@ -159,8 +159,8 @@ class ProductToolTip extends Module 'input' => array( array( 'type' => 'switch', - 'label' => $this->l('Number of people:'), - 'desc' => $this->l('Display the number of people who are currently watching this product?').'
    '. + 'label' => $this->l('Number of visitors'), + 'desc' => $this->l('Display the number of visitors who are currently watching this product?').'
    '. $this->l('If you activate the option above, you must activate the first option of StatData module'), 'name' => 'PS_PTOOLTIP_PEOPLE', 'values' => array( @@ -178,7 +178,8 @@ class ProductToolTip extends Module ), array( 'type' => 'text', - 'label' => $this->l('Lifetime:'), + 'label' => $this->l('Period length'), + 'desc' => 'For instance, if set to 30 minutes, display the number of visitors in the last 30 minutes.', 'name' => 'PS_PTOOLTIP_LIFETIME', 'suffix' => 'minutes', 'values' => array( @@ -196,7 +197,7 @@ class ProductToolTip extends Module ), array( 'type' => 'switch', - 'label' => $this->l('Product ordered:'), + 'label' => $this->l('Last order date'), 'desc' => $this->l('Display the last time the product has been ordered?'), 'name' => 'PS_PTOOLTIP_DATE_ORDER', 'values' => array( @@ -214,8 +215,8 @@ class ProductToolTip extends Module ), array( 'type' => 'switch', - 'label' => $this->l('Added to a cart:'), - 'label' => $this->l('If not ordered yet, display the last time the product has been added to a cart?'), + 'label' => $this->l('Added to a cart'), + 'desc' => $this->l('If not ordered yet, display the last time the product has been added to a cart?'), 'name' => 'PS_PTOOLTIP_DATE_CART', 'values' => array( array( @@ -232,7 +233,7 @@ class ProductToolTip extends Module ), array( 'type' => 'text', - 'label' => $this->l('Do not display events older than:'), + 'label' => $this->l('Do not display events older than'), 'name' => 'PS_PTOOLTIP_DAYS', 'suffix' => 'days' ), From 5a3d487e9f3e888fb4bbe5db7c336ee76f52d143 Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 18 Oct 2013 14:31:48 +0000 Subject: [PATCH 7/7] // sprintf again --- .../template/controllers/performance/helpers/form/form.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl index 1a52d930f..0eb93f213 100644 --- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl @@ -117,7 +117,7 @@ {$server.port} {$server.weight} - {l s='Remove'} + {l s='Remove'} {/foreach}