Merge pull request #849 from djfm/bootstrap

// Translations fix

admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl

@@ -137,7 +137,7 @@
 					<li>
 						{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 @@
 		</div>
 	</div>
 </div>
-{/block}
+{/block}

admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl

@@ -117,7 +117,7 @@
 							<td>{$server.port}</td>
 							<td>{$server.weight}</td>
 							<td align="right">
-								<a class="btn btn-default" href="{$current}&token={$token}&deleteMemcachedServer={$server.id_memcached_server}" onclick="if (!confirm('{l s='Do you really want to remove the server %s:%s'|sprintf:$server.ip:$server.port}')) return false;"><i class="icon-minus-sign-alt"></i> {l s='Remove'}</a>
+								<a class="btn btn-default" href="{$current}&token={$token}&deleteMemcachedServer={$server.id_memcached_server}" onclick="if (!confirm('{l s='Do you really want to remove the server %s:%s' sprintf=[$server.ip, $server.port] js=1}')) return false;"><i class="icon-minus-sign-alt"></i> {l s='Remove'}</a>
 							</td>
 						</tr>
 					{/foreach}

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 ');
+				$url = 'https://'.Tools::safeOutput(Tools::getServerName()).Tools::safeOutput($_SERVER['REQUEST_URI']);
-				$warningSslMessage .= '<a href="https://'.Tools::safeOutput(Tools::getServerName()).Tools::safeOutput($_SERVER['REQUEST_URI']).'">log into secure mode (https://)</a>';
+				$warningSslMessage = sprintf(Tools::displayError('SSL is activated. Please connect using the following link to <a href="%s">log into secure mode (https://)</a>'), $url);
 				$this->context->smarty->assign(array('warningSslMessage' => $warningSslMessage));
 			}
 		}

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'
 					),

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'
 					),

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' => 0, 'name' => $this->l('Automatically with each field change')),
-								array('id' => 1, 'name' => $this->l('The required information is set.'))
+								array('id' => 1, 'name' => $this->l('When the customer clicks on the "Estimate Shipping Cost" button'))
 								),
 							'id' => 'id',
 							'name' => 'name',

modules/carriercompare/template/carriercompare.tpl

@@ -88,7 +88,7 @@ PS_SE_HandleEvent();
 		<p class="warning center" id="noCarrier" style="display: none;">{l s='No carrier has been made available for this selection.' mod='carriercompare'}</p>
 		<p class="SE_SubmitRefreshCard">
 			<input class="exclusive_large" id="carriercompare_submit" type="submit" name="carriercompare_submit" value="{l s='Update cart' mod='carriercompare'}"/>
-			<input id="update_carriers_list" type="button" class="exclusive_large" value="{l s='Update carrier list' mod='carriercompare'}" />
+			<input id="update_carriers_list" type="button" class="exclusive_large" value="{l s='Estimate Shipping Cost' mod='carriercompare'}" />
 		</p>
 	</fieldset>
 </form>

modules/dashactivity/dashactivity.php

@@ -298,9 +298,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 Notifications'), 'config_name' => 'DASHACTIVITY_SHOW_NOTIFICATION'),
-			array('label' => $this->l('Show Customers'), 'config_name' => 'DASHACTIVITY_SHOW_CUSTOMERS'),
+			array('label' => $this->l('Show Clients'), 'config_name' => 'DASHACTIVITY_SHOW_CUSTOMERS'),
-			array('label' => $this->l('Show Newsletter'), 'config_name' => 'DASHACTIVITY_SHOW_NEWSLETTER'),
+			array('label' => $this->l('Show Newsletters'), 'config_name' => 'DASHACTIVITY_SHOW_NEWSLETTER'),
 			array('label' => $this->l('Show Traffic'), 'config_name' => 'DASHACTIVITY_SHOW_TRAFFIC'),
 			);
 		

modules/producttooltip/producttooltip.php

@@ -159,8 +159,8 @@ class ProductToolTip extends Module
 				'input' => array(
 					array(
 						'type' => 'switch',
-						'label' => $this->l('Number of people:'),
+						'label' => $this->l('Number of visitors'),
-						'desc' => $this->l('Display the number of people who are currently watching this product?').'<br>'.
+						'desc' => $this->l('Display the number of visitors who are currently watching this product?').'<br>'.
 								$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('Added to a cart'),
-						'label' => $this->l('If not ordered yet, display the last time the product has been 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'
 					),