Merge pull request #612 from djfm/development
// Reviewed CarrierWizard strings, and corrected a few glitches with smarty translation functions and quotes
This commit is contained in:
Damien Metzger
@@ -24,15 +24,15 @@
|
||||
*}
|
||||
{extends file="helpers/form/form.tpl"}
|
||||
{block name="script"}
|
||||
var string_price = '{l s="Will be applied when the price will be:" js=1}';
|
||||
var string_weight = '{l s="Will be applied when the weight will be:" js=1}';
|
||||
var string_price = '{l s='Will be applied when the price is' js=1}';
|
||||
var string_weight = '{l s='Will be applied when the weight is' js=1}';
|
||||
{/block}
|
||||
|
||||
{block name="field"}
|
||||
{if $input.name == 'zones'}
|
||||
{include file='controllers/carrier_wizard/helpers/form/form_ranges.tpl'}
|
||||
<div class="new_range">
|
||||
<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s="Add new range"}<img src="../img/admin/add.gif"/></a>
|
||||
<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s='Add new range'}<img src="../img/admin/add.gif"/></a>
|
||||
</div>
|
||||
{/if}
|
||||
{$smarty.block.parent}
|
||||
|
||||
+2
-2
@@ -29,7 +29,7 @@
|
||||
{foreachelse}
|
||||
<td class="center border_top border_bottom">
|
||||
<input style="display:none" type="text" />
|
||||
<button class="button">{l s="Validate"}</button>
|
||||
<button class="button">{l s='Validate'}</button>
|
||||
</td>
|
||||
{/foreach}
|
||||
</tr>
|
||||
@@ -49,7 +49,7 @@
|
||||
{if $smarty.foreach.ranges.first}
|
||||
<td class="center"> </td>
|
||||
{else}
|
||||
<td class="center"><button class="button">{l s="Delete"}</button</td>
|
||||
<td class="center"><button class="button">{l s='Delete'}</button</td>
|
||||
{/if}
|
||||
{/foreach}
|
||||
</tr>
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
var labelNext = '{$labels.next|addslashes}';
|
||||
var labelPrevious = '{$labels.previous|addslashes}';
|
||||
var labelFinish = '{$labels.finish|addslashes}';
|
||||
var labelDelete = '{l s="Delete" js=1}';
|
||||
var labelValidate = '{l s="Validate" js=1}';
|
||||
var labelDelete = '{l s='Delete' js=1}';
|
||||
var labelValidate = '{l s='Validate' js=1}';
|
||||
var validate_url = '{$validate_url|addslashes}';
|
||||
var carrierlist_url = '{$carrierlist_url|addslashes}';
|
||||
var nbr_steps = {$wizard_steps.steps|count};
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
var carrier_translation_undefined = '{l s='undefined' js='1'}';
|
||||
var carrier_translation_undefined = '{l s='undefined' js=1}';
|
||||
|
||||
function removeCarrierLogo()
|
||||
{
|
||||
|
||||
@@ -24,17 +24,17 @@
|
||||
*}
|
||||
|
||||
<script type="text/javascript">
|
||||
var summary_translation_undefined = '{l s='[undefined]' js='1'}';
|
||||
var summary_translation_undefined = '{l s='[undefined]' js=1}';
|
||||
|
||||
var summary_translation_meta_informations = '{l s='This carrier is @s1 and display to the customers the following delay: @s2.' js='1'}';
|
||||
var summary_translation_free = '<strong>{l s='free' js='1'}</strong>';
|
||||
var summary_translation_paid = '<strong>{l s='paid' js='1'}</strong>';
|
||||
var summary_translation_meta_informations = '{l s='This carrier is @s1 and the displayed delivery time is: @s2.' js=1}';
|
||||
var summary_translation_free = '<strong>{l s='free' js=1}</strong>';
|
||||
var summary_translation_paid = '<strong>{l s='paid' js=1}</strong>';
|
||||
|
||||
var summary_translation_range = '{l s='This carrier can deliver orders from @s1 to @s2. If the order is out of range, the behavior is to @s3.' js='1'}';
|
||||
var summary_translation_range = '{l s='This carrier can deliver orders from @s1 to @s2. If the order is out of range, the behavior is to @s3.' js=1}';
|
||||
|
||||
var summary_translation_shipping_cost = '{l s='The shipping cost is calculated @s1 and the tax rule @s2 is applied.' js='1'}';
|
||||
var summary_translation_price = '<strong>{l s='according to the price' js='1'}</strong>';
|
||||
var summary_translation_weight = '<strong>{l s='according to the weight' js='1'}</strong>';
|
||||
var summary_translation_shipping_cost = '{l s='The shipping cost is calculated @s1 and the tax rule @s2 is applied.' js=1}';
|
||||
var summary_translation_price = '<strong>{l s='according to the price' js=1}</strong>';
|
||||
var summary_translation_weight = '<strong>{l s='according to the weight' js=1}</strong>';
|
||||
</script>
|
||||
|
||||
<fieldset>
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
*}
|
||||
|
||||
<script type="text/javascript">
|
||||
var msg_select_one = "{l s="Please select at least one product." js=1}";
|
||||
var msg_set_quantity = "{l s="Please set a quantity to add a product." js=1}";
|
||||
var msg_select_one = "{l s='Please select at least one product.' js=1}";
|
||||
var msg_set_quantity = "{l s='Please set a quantity to add a product.' js=1}";
|
||||
</script>
|
||||
<input type="hidden" name="submitted_tabs[]" value="Pack" />
|
||||
<h4>{l s='Pack'}</h4>
|
||||
|
||||
@@ -61,20 +61,20 @@ class AdminCarrierWizardControllerCore extends AdminController
|
||||
'name' => 'carrier_wizard',
|
||||
'steps' => array(
|
||||
array(
|
||||
'title' => $this->l('General'),
|
||||
'desc' => $this->l('General'),
|
||||
'title' => $this->l('General settings'),
|
||||
'desc' => $this->l('General settings'),
|
||||
),
|
||||
array(
|
||||
'title' => $this->l('Where and how much ?'),
|
||||
'desc' => $this->l('Where and how much ?'),
|
||||
'title' => $this->l('Shipping locations and costs'),
|
||||
'desc' => $this->l('Shipping locations and costs'),
|
||||
),
|
||||
array(
|
||||
'title' => $this->l('What and to who ?'),
|
||||
'desc' => $this->l('What and to who ?'),
|
||||
'title' => $this->l('Size, weight, and group access'),
|
||||
'desc' => $this->l('Size, weight, and group access'),
|
||||
),
|
||||
array(
|
||||
'title' => $this->l('Resume'),
|
||||
'desc' => $this->l('Resume'),
|
||||
'title' => $this->l('Summary'),
|
||||
'desc' => $this->l('Summary'),
|
||||
),
|
||||
|
||||
));
|
||||
@@ -160,7 +160,7 @@ class AdminCarrierWizardControllerCore extends AdminController
|
||||
'input' => array(
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Company:'),
|
||||
'label' => $this->l('Carrier name:'),
|
||||
'name' => 'name',
|
||||
'size' => 25,
|
||||
'required' => true,
|
||||
@@ -182,7 +182,7 @@ class AdminCarrierWizardControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Speed Grade:'),
|
||||
'label' => $this->l('Speed grade:'),
|
||||
'name' => 'grade',
|
||||
'required' => false,
|
||||
'size' => 1,
|
||||
@@ -190,7 +190,7 @@ class AdminCarrierWizardControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('URL:'),
|
||||
'label' => $this->l('Tracking URL:'),
|
||||
'name' => 'url',
|
||||
'size' => 40,
|
||||
'desc' => $this->l('Delivery tracking URL: Type \'@\' where the tracking number should appear. It will then be automatically replaced by the tracking number.')
|
||||
@@ -338,7 +338,7 @@ class AdminCarrierWizardControllerCore extends AdminController
|
||||
'id' => 'id',
|
||||
'name' => 'name'
|
||||
),
|
||||
'desc' => $this->l('Out-of-range behavior occurs when none is defined (e.g. when a customer\'s cart weight is greater than the highest range limit)')
|
||||
'desc' => $this->l('Out-of-range behavior occurs when no defined range matches the customer\'s cart (e.g. when the weight of the cart is greater than the highest weight limit defined by the weight ranges)')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -346,7 +346,7 @@ class AdminCarrierWizardControllerCore extends AdminController
|
||||
'name' => 'max_height',
|
||||
'required' => false,
|
||||
'size' => 10,
|
||||
'desc' => $this->l('Maximum height managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
|
||||
'desc' => $this->l('Maximum height managed by this carrier. Set the value to "0", or leave this field blank to ignore.')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -354,7 +354,7 @@ class AdminCarrierWizardControllerCore extends AdminController
|
||||
'name' => 'max_width',
|
||||
'required' => false,
|
||||
'size' => 10,
|
||||
'desc' => $this->l('Maximum width managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
|
||||
'desc' => $this->l('Maximum width managed by this carrier. Set the value to "0", or leave this field blank to ignore.')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -362,7 +362,7 @@ class AdminCarrierWizardControllerCore extends AdminController
|
||||
'name' => 'max_depth',
|
||||
'required' => false,
|
||||
'size' => 10,
|
||||
'desc' => $this->l('Maximum depth managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
|
||||
'desc' => $this->l('Maximum depth managed by this carrier. Set the value to "0", or leave this field blank to ignore.')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -370,7 +370,7 @@ class AdminCarrierWizardControllerCore extends AdminController
|
||||
'name' => 'max_weight',
|
||||
'required' => false,
|
||||
'size' => 10,
|
||||
'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
|
||||
'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0", or leave this field blank to ignore.')
|
||||
),
|
||||
array(
|
||||
'type' => 'group',
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
{/if}
|
||||
var lastMove = '';
|
||||
var saveOK = '{l s='Module position saved' js=1}';
|
||||
var confirmClose = "{l s="Are you sure? If you close this window, its position won't be saved" js=1}";
|
||||
var confirmClose = "{l s='Are you sure? If you close this window, its position won't be saved' js=1}";
|
||||
var close = '{l s='Close' js=1}';
|
||||
var cancel = '{l s='Cancel' js=1}';
|
||||
var confirm = '{l s='Confirm' js=1}';
|
||||
|
||||
Reference in New Issue
Block a user