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

// Fix update english key of translations in all files

Browse Source
This commit is contained in:
lLefevre
2012-03-14 12:25:51 +00:00
parent d93eff8834
commit c21bef2acf
553 changed files with 17474 additions and 20745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarriersController.php
+38 -38
View File
@@ -83,7 +83,7 @@ class AdminCarriersControllerCore extends AdminController
'width' => 25
),
'is_free' => array(
'title' => $this->l('Is Free'),
'title' => $this->l('Free Shipping'),
'align' => 'center',
'icon' => array(
0 => 'disabled.gif',
@@ -119,23 +119,23 @@ class AdminCarriersControllerCore extends AdminController
'fields' => array(
'PS_CARRIER_DEFAULT' => array(
'title' => $this->l('Default carrier:'),
'desc' => $this->l('The default carrier used in shop'),
'desc' => $this->l('Your shop\'s default carrier'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'id_carrier',
'list' => Carrier::getCarriers((int)Configuration::get('PS_LANG_DEFAULT'), true, false, false, null, Carrier::ALL_CARRIERS)
),
'PS_CARRIER_DEFAULT_SORT' => array(
'title' => $this->l('Carrier default sort:'),
'desc' => $this->l('This default sort will be available only on front-office'),
'title' => $this->l('Sort by:'),
'desc' => $this->l('This will only be visible in the Front Office'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'value',
'list' => $carrier_default_sort
),
'PS_CARRIER_DEFAULT_ORDER' => array(
'title' => $this->l('Carrier default order:'),
'desc' => $this->l('This default order will be available only on front-office'),
'title' => $this->l('Order by:'),
'desc' => $this->l('This will only be visible in the Front Office'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'value',
@@ -152,28 +152,28 @@ class AdminCarriersControllerCore extends AdminController
public function renderList()
{
$this->displayInformation(
'&nbsp;<b>'.$this->l('How to create a new carrier?').'</b>
'&nbsp;<b>'.$this->l('How do I create a new carrier?').'</b>
<br />
<ul>
<li>'.$this->l('Click "Add new".').'<br /></li>
<li>'.$this->l('Fill in the fields and click "Save".').'</li>
<li>'.$this->l('Click \\"Add new.\\"').'<br /></li>
<li>'.$this->l('Fill in the fields and click \\"Save.\\"').'</li>
<li>'.
$this->l('You need to decide a price range or a weight range for which the new carrier will be available.').' '.
$this->l('Under the "Shipping" tab, click either "Price Ranges" or "Weight Ranges".').'
$this->l('You need to set a price range or a weight range for which the new carrier will be available.').' '.
$this->l('Under the \\"Shipping\\" tab, click either \\"Price Ranges\\" or \\"Weight Ranges.\\"').'
</li>
<li>'.$this->l('Click "Add new".').'</li>
<li>'.$this->l('Click \\"Add new.\\"').'</li>
<li>'.
$this->l('Select the name of the carrier and define the price range or the weight range.').' '.
$this->l('For example the carrier can be made available for a weight range between 0 and 5kgs. Another carrier will have a range between 5 and 10kgs.').'
$this->l('For example, the carrier can be made available for a weight range between 0 and 5lbs. Another carrier will have a range between 5 and 10lbs.').'
</li>
<li>'.$this->l('When you are done, click "Save".').'</li>
<li>'.$this->l('Click on the "Shipping" tab.').'</li>
<li>'.$this->l('When you are done, click \\"Save.\\"').'</li>
<li>'.$this->l('Click on the \\"Shipping\\" tab.').'</li>
<li>'.
$this->l('You need to choose the fees that will be applied for this carrier.').' '.
$this->l('At the bottom on the page, in the "Fees" section, select the name of the carrier.').'
$this->l('You need to set the fees that will be applied for this carrier.').' '.
$this->l('At the bottom on the page, in the \\"Fees\\" section, select the name of the carrier.').'
</li>
<li>'.$this->l('For each zone, enter a price. Click "Save".').'</li>
<li>'.$this->l('You\'re set! The new carrier will be displayed to your customers.').'</li>
<li>'.$this->l('For each zone, enter a price and click \\"Save.\\"').'</li>
<li>'.$this->l('You\'re all set! The new carrier will be displayed to your customers.').'</li>
</ul>'
);
$this->_select = 'b.*';
@@ -202,14 +202,14 @@ class AdminCarriersControllerCore extends AdminController
'hint' => $this->l('Allowed characters: letters, spaces and').' ().-',
'desc' => array(
$this->l('Carrier name displayed during checkout'),
$this->l('With a value of 0, the carrier name will be replaced by the shop name')
$this->l('For in-store pickup, enter 0 to replace the carrier name with your shop name')
)
),
array(
'type' => 'file',
'label' => $this->l('Logo:'),
'name' => 'logo',
'desc' => $this->l('Upload logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
'desc' => $this->l('Upload a logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
),
array(
'type' => 'text',
@@ -219,22 +219,22 @@ class AdminCarriersControllerCore extends AdminController
'required' => true,
'size' => 41,
'maxlength' => 128,
'desc' => $this->l('Time taken for product delivery; displayed during checkout')
'desc' => $this->l('Estimated delivery time, displayed during checkout')
),
array(
'type' => 'text',
'label' => $this->l('Grade:'),
'label' => $this->l('Speed Grade:'),
'name' => 'grade',
'required' => false,
'size' => 1,
'desc' => $this->l('"0" for a longest shipping delay,"9" for the shortest shipping delay.')
'desc' => $this->l('\\"0\\" for a longest shipping delay,\\"9\\" for the shortest shipping delay.')
),
array(
'type' => 'text',
'label' => $this->l('URL:'),
'name' => 'url',
'size' => 40,
'desc' => $this->l('URL for the tracking number; type \'@\' where the tracking number will appear')
'desc' => $this->l('Delivery tracking URL; type \'@\' where the tracking number will appear, it will be automatically replaced by the tracking number')
),
array(
'type' => 'checkbox',
@@ -245,14 +245,14 @@ class AdminCarriersControllerCore extends AdminController
'id' => 'id_zone',
'name' => 'name'
),
'desc' => $this->l('The zone in which this carrier is to be used')
'desc' => $this->l('The zones in which this carrier is to be used')
),
array(
'type' => 'group',
'label' => $this->l('Group access:'),
'name' => 'groupBox',
'values' => Group::getGroups(Context::getContext()->language->id),
'desc' => $this->l('Mark all groups you want to give access to this carrier')
'desc' => $this->l('Mark all groups for which you want to give access to this carrier')
),
array(
'type' => 'radio',
@@ -273,7 +273,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Include or exclude carrier from list of carriers on Front Office')
'desc' => $this->l('Enable carrier in the Front Office')
),
array(
'type' => 'radio',
@@ -293,7 +293,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('No').'" title="'.$this->l('No').'" />'
)
),
'desc' => $this->l('Apply shipping costs and additional shipping costs by products in carrier price')
'desc' => $this->l('Apply both regular shipping cost and product-specific additional shipping costs')
),
array(
'type' => 'select',
@@ -373,7 +373,7 @@ class AdminCarriersControllerCore extends AdminController
'id' => 'id',
'name' => 'name'
),
'desc' => $this->l('Out-of-range behavior 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 when none is defined (e.g. when a customer\'s cart weight is greater than the highest range limit)')
),
array(
'type' => 'text',
@@ -381,7 +381,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_height',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum height managed by this carrier. Set "0" or nothing, to ignore this field.')
'desc' => $this->l('Maximum height managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'text',
@@ -389,23 +389,23 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_width',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum width managed by this carrier. Set "0" or nothing, to ignore this field.')
'desc' => $this->l('Maximum width managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'text',
'label' => $this->l('Maximium package deep:'),
'label' => $this->l('Maximium package depth:'),
'name' => 'max_depth',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum deep managed by this carrier. Set "0" or nothing, to ignore this field.')
'desc' => $this->l('Maximum depth managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'text',
'label' => $this->l('Maximium package weigth:'),
'label' => $this->l('Maximium package weight:'),
'name' => 'max_weight',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum weight managed by this carrier. Set "0" or nothing, to ignore this field.')
'desc' => $this->l('Maximum weight managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'hidden',
@@ -530,7 +530,7 @@ class AdminCarriersControllerCore extends AdminController
if ($this->tabAccess['edit'] === '1')
{
if (Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT'))
$this->errors[] = Tools::displayError('You can\'t disable the default carrier, please change your default carrier first.');
$this->errors[] = Tools::displayError('You cannot disable the default carrier, please change your default carrier first.');
else
parent::postProcess();
}
@@ -541,7 +541,7 @@ class AdminCarriersControllerCore extends AdminController
{
if ((Tools::isSubmit('submitDel'.$this->table) && in_array(Configuration::get('PS_CARRIER_DEFAULT'), Tools::getValue('carrierBox')))
|| (isset($_GET['delete'.$this->table]) && Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT')))
$this->errors[] = $this->l('Please set another carrier as default before deleting');
$this->errors[] = $this->l('Please set another carrier as default before deleting this one');
else
{
// if deletion : removes the carrier from the warehouse/carrier association