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

[*] TR : update English translations key for Back Office

Browse Source
This commit is contained in:
lLefevre
2012-07-12 10:04:56 +00:00
parent 91c8738940
commit 1da5ce07d4
50 changed files with 321 additions and 4644 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAddressesController.php
+2 -2
View File
@@ -56,7 +56,7 @@ class AdminAddressesControllerCore extends AdminController
'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'),
'lastname' => array('title' => $this->l('Last name'), 'width' => 140, 'filter_key' => 'a!lastname'),
'address1' => array('title' => $this->l('Address')),
'postcode' => array('title' => $this->l('Postcode / Zip Code'), 'align' => 'right', 'width' => 80),
'postcode' => array('title' => $this->l('Postal Code/Zip Code'), 'align' => 'right', 'width' => 80),
'city' => array('title' => $this->l('City'), 'width' => 150),
'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'list' => $this->countries_array, 'filter_key' => 'cl!id_country'));
@@ -251,7 +251,7 @@ class AdminAddressesControllerCore extends AdminController
{
$temp_fields[] = array(
'type' => 'text',
'label' => $this->l('Postcode / Zip Code'),
'label' => $this->l('Postal Code/Zip Code'),
'name' => 'postcode',
'size' => 33,
'required' => true,
controllers/admin/AdminCarriersController.php
+1 -1
View File
@@ -172,7 +172,7 @@ class AdminCarriersControllerCore extends AdminController
<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 5lbs. Another carrier will have a range between 5 and 10lbs.').'
$this->l('For example, the carrier can be made available for a weight range between 0 and 5lbs. Another carrier can 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>
controllers/admin/AdminCategoriesController.php
+1 -1
View File
@@ -301,7 +301,7 @@ class AdminCategoriesControllerCore extends AdminController
$unidentified_group_information = sprintf($this->l('%s - All people without a validated customer account.'), '<b>'.$unidentified->name[$this->context->language->id].'</b>');
$guest_group_information = sprintf($this->l('%s - Customer who placed an order with the Guest Checkout.'), '<b>'.$guest->name[$this->context->language->id].'</b>');
$default_group_information = sprintf($this->l('%s - All people who created an account on this site.'), '<b>'.$default->name[$this->context->language->id].'</b>');
$default_group_information = sprintf($this->l('%s - All people who have created an account on this site.'), '<b>'.$default->name[$this->context->language->id].'</b>');
$root_category = Category::getRootCategory();
$root_category = array('id_category' => $root_category->id_category, 'name' => $root_category->name);
$this->fields_form = array(
controllers/admin/AdminCountriesController.php
+1 -1
View File
@@ -240,7 +240,7 @@ class AdminCountriesControllerCore extends AdminController
'name' => 'zip_code_format',
'class' => 'uppercase',
'required' => true,
'desc' => $this->l('National zip code (L for a letter, N for a number and C for the Iso code), e.g. NNNNN for the United States. No verification if undefined')
'desc' => $this->l('Zip Code format (L for a letter, N for a number and C for the Iso code), e.g. NNNNN for the United States. No verification if undefined')
),
array(
'type' => 'address_layout',
controllers/admin/AdminCustomerPreferencesController.php
+1 -1
View File
@@ -77,7 +77,7 @@ class AdminCustomerPreferencesControllerCore extends AdminController
),
'PS_B2B_ENABLE' => array(
'title' => $this->l('Enable B2B mode'),
'desc' => $this->l('Activate or deactivate B2B mode. When this option is enabled some B2B features are available.'),
'desc' => $this->l('Activate or deactivate B2B mode. When this option is enabled, some B2B features are available.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
controllers/admin/AdminCustomerThreadsController.php
+2 -2
View File
@@ -178,7 +178,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
),
'PS_SAV_IMAP_DELETE_MSG' => array(
'title' => $this->l('Delete messages'),
'desc' => $this->l('Delete message after sync. If you do not active this option, the sync will be longer'),
'desc' => $this->l('Delete messages after sync. If you do not active this option, the sync will be longer'),
'type' => 'bool',
'visibility' => Shop::CONTEXT_ALL,
),
@@ -215,7 +215,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
'PS_SAV_IMAP_OPT_NOTLS' => array(
'title' => $this->l('IMAP options').' (/notls)',
'type' => 'bool',
'desc' => $this->l('do not use start-TLS to encrypt the session, even with servers that support it'),
'desc' => $this->l('Do not use start-TLS to encrypt the session, even with servers that support it'),
'visibility' => Shop::CONTEXT_ALL,
),
),
controllers/admin/AdminGeolocationController.php
+1 -1
View File
@@ -70,7 +70,7 @@ class AdminGeolocationControllerCore extends AdminController
'geolocationWhitelist' => array(
'title' => $this->l('IP address whitelist'),
'icon' => 'world',
'description' => $this->l('You can add IP addresses that will always be allowed to access your shop (e.g. Google bots\' IP).'),
'description' => $this->l('You can add IP addresses that will always be allowed to access your shop (e.g. Google bots\' IP).'),
'fields' => array(
'PS_GEOLOCATION_WHITELIST' => array('title' => $this->l('Whitelisted IP addresses'), 'type' => 'textarea_newlines', 'cols' => 80, 'rows' => 30),
),
controllers/admin/AdminImagesController.php
+3 -3
View File
@@ -189,7 +189,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be used for product images'),
'desc' => $this->l('This type will be used for Product images'),
'values' => array(
array(
'id' => 'products_on',
@@ -273,7 +273,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be used for scene images'),
'desc' => $this->l('This type will be used for Scene images'),
'values' => array(
array(
'id' => 'scenes_on',
@@ -324,7 +324,7 @@ class AdminImagesControllerCore extends AdminController
// When moving images, if duplicate images were found they are moved to a folder named duplicates/
if (file_exists(_PS_PROD_IMG_DIR_.'duplicates/'))
{
$this->warnings[] = $this->l('Duplicate images were found when moving the product images. It is likely caused by unused demonstration images. Please make sure that the folder ').
$this->warnings[] = $this->l('Duplicate images were found when moving the product images. This is likely caused by unused demonstration images. Please make sure that the folder ').
_PS_PROD_IMG_DIR_.'duplicates/'.
$this->l('only contains demonstration images, and then delete this folder.');
}
controllers/admin/AdminImportController.php
+6 -6
View File
@@ -139,7 +139,7 @@ class AdminImportControllerCore extends AdminController
),
'shop' => array(
'label' => $this->l('ID / Name of shop'),
'help' => $this->l('Ignore this field if you don\'t use the multishop tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, default shop will be used'),
)
);
@@ -178,7 +178,7 @@ class AdminImportControllerCore extends AdminController
'image' => array('label' => $this->l('Image URL')),
'shop' => array(
'label' => $this->l('ID / Name of shop'),
'help' => $this->l('Ignore this field if you don\'t use the multishop tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, default shop will be used'),
),
);
@@ -240,7 +240,7 @@ class AdminImportControllerCore extends AdminController
'condition' => array('label' => $this->l('Condition')),
'shop' => array(
'label' => $this->l('ID / Name of shop'),
'help' => $this->l('Ignore this field if you don\'t use the multishop tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, default shop will be used'),
)
);
@@ -279,7 +279,7 @@ class AdminImportControllerCore extends AdminController
'optin' => array('label' => $this->l('Opt-in (0/1)')),
'id_shop' => array(
'label' => $this->l('ID / Name of shop'),
'help' => $this->l('Ignore this field if you don\'t use the multishop tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, default shop will be used'),
),
);
@@ -352,7 +352,7 @@ class AdminImportControllerCore extends AdminController
'meta_description' => array('label' => $this->l('Meta-description')),
'shop' => array(
'label' => $this->l('ID / Name of group shop'),
'help' => $this->l('Ignore this field if you don\'t use the multishop tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, default shop will be used'),
),
);
@@ -410,7 +410,7 @@ class AdminImportControllerCore extends AdminController
'supply_order_reference' => array('label' => $this->l('Supply Order Reference *')),
'id_product' => array('label' => $this->l('Product ID *')),
'id_product_attribute' => array('label' => $this->l('Product Attribute ID')),
'unit_price_te' => array('label' => $this->l('Unit Price (tax excl.) *')),
'unit_price_te' => array('label' => $this->l('Unit Price (tax excl.)*')),
'quantity_expected' => array('label' => $this->l('Quantity Expected *')),
'discount_rate' => array('label' => $this->l('Discount Rate')),
'tax_rate' => array('label' => $this->l('Tax Rate')),
controllers/admin/AdminMaintenanceController.php
+1 -1
View File
@@ -48,7 +48,7 @@ class AdminMaintenanceControllerCore extends AdminController
),
'PS_MAINTENANCE_IP' => array(
'title' => $this->l('Maintenance IP'),
'desc' => $this->l('IP addresses allowed to access the Front Office even if shop is disabled. Use a comma to separate them (e.g. 42.24.4.2,127.0.0.1,99.98.97.96)'),
'desc' => $this->l('IP addresses allowed to access the Front Office even if the shop is disabled. Use a comma to separate them (e.g. 42.24.4.2,127.0.0.1,99.98.97.96)'),
'validation' => 'isGenericName',
'type' => 'maintenance_ip',
'size' => 30,
controllers/admin/AdminManufacturersController.php
+1 -1
View File
@@ -165,7 +165,7 @@ class AdminManufacturersControllerCore extends AdminController
'filter_key' => 'a!name'
),
'postcode' => array(
'title' => $this->l('Postcode / Zip Code'),
'title' => $this->l('Postal Code/Zip Code'),
'align' => 'right',
'width' => 50
),
controllers/admin/AdminMetaController.php
+1 -1
View File
@@ -149,7 +149,7 @@ class AdminMetaControllerCore extends AdminController
}
}
else
$shop_url_options['description'] = $this->l('Multishop option is enabled, if you want to change the url of your shop you have to go in "Advanced parameters" -> "multishop" tab.');
$shop_url_options['description'] = $this->l('Multistore option is enabled, if you want to change the URL of your shop you have to go to "Advanced Parameters" -> "Multistore" tab.');
// List of options
$this->fields_options = array(
controllers/admin/AdminOrderPreferencesController.php
+1 -1
View File
@@ -75,7 +75,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
),
'PS_GUEST_CHECKOUT_ENABLED' => array(
'title' => $this->l('Enable guest checkout'),
'desc' => $this->l('Guest can place an order without registering'),
'desc' => $this->l('Guests can place an order without registering'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
controllers/admin/AdminPerformanceController.php
+1 -1
View File
@@ -41,7 +41,7 @@ class AdminPerformanceControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('Templates cache'),
'label' => $this->l('Template cache'),
'name' => 'smarty_force_compile',
'class' => 't',
'br' => true,
controllers/admin/AdminPreferencesController.php
+3 -3
View File
@@ -81,14 +81,14 @@ class AdminPreferencesControllerCore extends AdminController
),
'PS_DISPLAY_SUPPLIERS' => array(
'title' => $this->l('Display suppliers and manufacturers'),
'desc' => $this->l('Display suppliers and manufacturers list even if corresponding blocks are disabled'),
'desc' => $this->l('Display suppliers and manufacturers lists even if corresponding blocks are disabled'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_MULTISHOP_FEATURE_ACTIVE' => array(
'title' => $this->l('Enable multishop'),
'desc' => $this->l('Multishop feature allows you to manage several shops with one back-office. If this feature is enabled, a tab "multishop" will be available in "advanced parameters" menu.'),
'title' => $this->l('Enable Multistore'),
'desc' => $this->l('Multistore feature allows you to manage several shops with one back-office. If this feature is enabled, a "Multistore" tab will be available in the "Advanced Parameters" menu.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
controllers/admin/AdminProductsController.php
+2 -2
View File
@@ -345,7 +345,7 @@ class AdminProductsControllerCore extends AdminController
{
if ($_FILES['attachment_file']['size'] > (Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024 * 1024))
$this->errors[] = sprintf(
$this->l('File too large, maximum size allowed: %1$d kB. File size you\'re trying to upload is: %2$d kB.'),
$this->l('File too large, maximum size allowed: %1$d kB. File size you\'re trying to upload is: %2$d kB.'),
(Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024),
number_format(($_FILES['attachment_file']['size'] / 1024), 2, '.', '')
);
@@ -1189,7 +1189,7 @@ class AdminProductsControllerCore extends AdminController
else
$json = array(
'status' => 'error',
'message'=> $this->l('You do not have permission to delete here.')
'message'=> $this->l('You do not have permission to delete this.')
);
die(Tools::jsonEncode($json));
controllers/admin/AdminRangePriceController.php
+1 -1
View File
@@ -76,7 +76,7 @@ class AdminRangePriceControllerCore extends AdminController
'id' => 'id_carrier',
'name' => 'name'
),
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There isn\'t any carrier available for this price range.').'</div>'
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There is no carrier available for this price range.').'</div>'
),
array(
'type' => 'text',
controllers/admin/AdminRangeWeightController.php
+1 -1
View File
@@ -74,7 +74,7 @@ class AdminRangeWeightControllerCore extends AdminController
'id' => 'id_carrier',
'name' => 'name'
),
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There isn\'t any carrier available for this weight range.').'</div>'
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There is no carrier available for this weight range.').'</div>'
),
array(
'type' => 'text',
controllers/admin/AdminScenesController.php
+1 -1
View File
@@ -200,7 +200,7 @@ class AdminScenesControllerCore extends AdminController
.(Tools::getMaxUploadSize() / 1024).''.$this->l('kB max.').' '
.sprintf($this->l('If larger than the image size setting, the image will be reduced to %1$d x %2$dpx (width x height).'),
$large_scene_image_type['width'], $large_scene_image_type['height'])
.$this->l('If smaller than the image-size setting, a white background will be added in order to achieve the correct image size.').'<br />'.
.$this->l('If smaller than the image size setting, a white background will be added in order to achieve the correct image size.').'<br />'.
$this->l('Note: To change image dimensions, please change the \'large_scene\' image type settings to the desired size (in Back Office > Preferences > Images).');
if ($obj->id && file_exists(_PS_SCENE_IMG_DIR_.$obj->id.'-large_scene.jpg'))
{
controllers/admin/AdminShopController.php
+2 -2
View File
@@ -340,9 +340,9 @@ class AdminShopControllerCore extends AdminController
}
if ($this->display == 'add')
$group_desc = $this->l('Warning: you won\'t be able to change the group of this shop if this shop belong to a group with one of these options "share customers" or "share quantities" or "share orders" activated.');
$group_desc = $this->l('Warning: you won\'t be able to change the group of this shop if this shop belongs to a group with one of these options activated: Share Customers, Share Quantities or Share Orders');
else
$group_desc = $this->l('You can only move your shop to a shop group with all "share" options disabled or to a shop group with no customers / orders.');
$group_desc = $this->l('You can only move your shop to a shop group with all "share" options disabled or to a shop group with no customers/orders.');
$this->fields_form['input'][] = array(
'type' => 'select',
controllers/admin/AdminShopGroupController.php
+6 -6
View File
@@ -68,7 +68,7 @@ class AdminShopGroupControllerCore extends AdminController
$this->fields_options = array(
'general' => array(
'title' => $this->l('Multishop options'),
'title' => $this->l('Multistore options'),
'fields' => array(
'PS_SHOP_DEFAULT' => array(
'title' => $this->l('Default shop:'),
@@ -129,9 +129,9 @@ class AdminShopGroupControllerCore extends AdminController
{
$this->fields_form = array(
'legend' => array(
'title' => $this->l('ShopGroup')
'title' => $this->l('Shop Group')
),
'description' => $this->l('Warning: it is not recommended to enable the "share customers" and "share orders" options, because once they are activated and customers or orders are created, you won\'t be able to disable these options anymore. If you need these options, try to first consider using several categories instead on several shops.'),
'description' => $this->l('Warning: it is not recommended to enable the "share customers" and "share orders" options, because once they are activated and customers or orders are created, you will not be able to disable these options. If you need these options, try to first consider using several categories instead on several shops.'),
'input' => array(
array(
'type' => 'text',
@@ -159,7 +159,7 @@ class AdminShopGroupControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Once the option is enabled, the shops in this group will share their customers: if a customer registers on one of this group\'s shops, the account will automatically be available on the others shops of this goup. Warning: you won\'t be able to disable this option once you have customers registered on at least one shop of this group.'),
'desc' => $this->l('Once the option is enabled, the shops in this group will share their customers: if a customer registers on one of this group\'s shops, the account will automatically be available on the others shops of this goup. Warning: you will not be able to disable this option once you have customers registered on at least one shop of this group.'),
),
array(
'type' => 'radio',
@@ -180,7 +180,7 @@ class AdminShopGroupControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Share available quantities to sell between shops of this group. When changing this option, all product available quantities for this group will be reset to 0.'),
'desc' => $this->l('Share available quantities to sell between shops of this group. When changing this option, all products available quantities for this group will be reset to 0.'),
),
array(
'type' => 'radio',
@@ -202,7 +202,7 @@ class AdminShopGroupControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Once this option is enabled (which is only possible if customers and available quantities are shared among shops), the customer\'s cart will be shared among all the shops in this group. This way, any purchase started on one of the shops in this group will be able to be finished in another shop from the same shop group. Warning: you won\'t be able to disable this option once you have orders on at least one shop of this group.')
'desc' => $this->l('Once this option is enabled (which is only possible if customers and available quantities are shared among shops), the customer\'s cart will be shared among all the shops in this group. This way, any purchase started on one of the shops in this group will be able to be finished in another shop from the same shop group. Warning: you will not be able to disable this option once you have orders on at least one shop of this group.')
),
array(
'type' => 'radio',
controllers/admin/AdminShopUrlController.php
+3 -3
View File
@@ -112,7 +112,7 @@ class AdminShopUrlControllerCore extends AdminController
);
else
$desc_virtual_uri = array(
$this->l('You can use this option if you want to create a store with an URI that doesn\'t exist on your server (e.g. if you want your store to be available with the URL www.my-prestashop.com/my-store/shoes/, you have to set shoes/ in this field, assuming that my-store/ is your Physical URI).'),
$this->l('You can use this option if you want to create a store with a URI that doesn\'t exist on your server (e.g. if you want your store to be available with the URL www.my-prestashop.com/my-store/shoes/, you have to set shoes/ in this field, assuming that my-store/ is your Physical URI).'),
'<strong>'.$this->l('URL rewriting must be activated on your server to use this feature.').'</strong>'
);
$this->fields_form = array(
@@ -226,7 +226,7 @@ class AdminShopUrlControllerCore extends AdminController
'name' => 'virtual_uri',
'desc' => $desc_virtual_uri,
'size' => 50,
'hint' => (!$update_htaccess) ? $this->l('Warning: the URL rewriting (E.g. mod_rewrite for Apache) seems to be disabled. If your URL don\'t work, please check with your host provider how to activate URL rewriting.') : '',
'hint' => (!$update_htaccess) ? $this->l('Warning: URL rewriting (e.g. mod_rewrite for Apache) seems to be disabled. If your URL don\'t work, please check with your host provider how to activate URL rewriting.') : '',
),
array(
'type' => 'text',
@@ -281,7 +281,7 @@ class AdminShopUrlControllerCore extends AdminController
$this->show_toolbar = false;
if (isset($this->toolbar_btn['new']))
$this->toolbar_btn['new'] = array(
'desc' => $this->l('Add new url'),
'desc' => $this->l('Add new URL'),
'href' => $this->context->link->getAdminLink('AdminShopUrl').'&amp;add'.$this->table.'&amp;id_shop='.$this->id_shop,
);
controllers/admin/AdminStockManagementController.php
+1 -1
View File
@@ -110,7 +110,7 @@ class AdminStockManagementControllerCore extends AdminController
$this->displayInformation($this->l('Furthermore, you can move quantities of (transfer) products between warehouses, or within one warehouse.').'<br />');
$this->displayInformation($this->l('Note that if you want to increase quantities of multiple products at once, you can use the supply orders tab.').'<br />');
$this->displayInformation($this->l('Finally, you will be asked to specify the state of the quantity you will add:'));
$this->displayInformation($this->l('usable for sale means that this quantity will be available in your shop(s),'));
$this->displayInformation($this->l('Usable for sale means that this quantity will be available in your shop(s),'));
$this->displayInformation($this->l('otherwise it will be considered reserved (i.e. for other purposes).'));
return parent::renderList();
controllers/admin/AdminStoresController.php
+3 -3
View File
@@ -181,7 +181,7 @@ class AdminStoresControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('Postcode / Zip Code'),
'label' => $this->l('Postal Code/Zip Code'),
'name' => 'postcode',
'size' => 6,
'required' => true
@@ -224,7 +224,7 @@ class AdminStoresControllerCore extends AdminController
'required' => true,
'size' => 11,
'maxlength' => 12,
'desc' => $this->l('Store coordinates (e.g. 45.265469 / -47.226478)')
'desc' => $this->l('Store coordinates (e.g. 45.265469/-47.226478)')
),
array(
'type' => 'text',
@@ -468,7 +468,7 @@ class AdminStoresControllerCore extends AdminController
'type' => 'text'
),
'PS_SHOP_CODE' => array(
'title' => $this->l('Postcode / Zip code'),
'title' => $this->l('Postal Code/Zip code'),
'validation' => 'isGenericName',
'size' => 6,
'type' => 'text'
controllers/admin/AdminSuppliersController.php
+2 -2
View File
@@ -120,7 +120,7 @@ class AdminSuppliersControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('Postcode / Zip Code:'),
'label' => $this->l('Postal Code/Zip Code:'),
'name' => 'postcode',
'size' => 10,
'maxlength' => 12,
@@ -397,7 +397,7 @@ class AdminSuppliersControllerCore extends AdminController
if (!($obj = $this->loadObject(true)))
return;
else if (SupplyOrder::supplierHasPendingOrders($obj->id))
$this->errors[] = $this->l('It is not possible to delete a supplier if there are any pending supply order.');
$this->errors[] = $this->l('It is not possible to delete a supplier if there are any pending supplier orders.');
else
{
//delete all product_supplier linked to this supplier
controllers/admin/AdminSupplyOrdersController.php
+2 -2
View File
@@ -335,7 +335,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
$this->l('Also, changing the currency or the supplier will reset the order.')
.'<br />'
.'<br />'.
$this->l('Finaly, please note that you can only order from one supplier at once.')
$this->l('Finaly, please note that you can only order from one supplier at a time.')
);
return parent::renderForm();
}
@@ -508,7 +508,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
$this->_where .= ' AND a.id_warehouse = '.$this->getCurrentWarehouse();
// re-defines toolbar & buttons
$this->toolbar_title = $this->l('Stock: Supply orders templates');
$this->toolbar_title = $this->l('Stock: Supply order templates');
$this->initToolbar();
unset($this->toolbar_btn['new']);
$this->toolbar_btn['new'] = array(
controllers/admin/AdminTranslationsController.php
+1 -1
View File
@@ -1393,7 +1393,7 @@ class AdminTranslationsControllerCore extends AdminController
$language_code = Tools::htmlentitiesUTF8(Language::getLanguageCodeByIso(Tools::getValue('lang')));
return array('language_code' => $language_code,
'not_available' => addslashes(html_entity_decode($this->l('this language is not available in Google Translate\'s API'), ENT_QUOTES, 'utf-8')),
'tooltip_title' => addslashes(html_entity_decode($this->l('Google Translate suggests :'), ENT_QUOTES, 'utf-8'))
'tooltip_title' => addslashes(html_entity_decode($this->l('Google Translate suggests:'), ENT_QUOTES, 'utf-8'))
);
}
controllers/admin/AdminWarehousesController.php
+2 -2
View File
@@ -145,7 +145,7 @@ class AdminWarehousesControllerCore extends AdminController
// sets the fields of the form
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Warehouse informations'),
'title' => $this->l('Warehouse information'),
'image' => '../img/admin/edit.gif'
),
'input' => array(
@@ -198,7 +198,7 @@ class AdminWarehousesControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('Postcode / Zip Code:'),
'label' => $this->l('Postcode/Zip Code:'),
'name' => 'postcode',
'size' => 10,
'maxlength' => 12,