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

[-] TR : #PSCFV-4027 : change string "tabs" by "Menus"...

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17309 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-09-12 15:06:48 +00:00
parent a0bf4a30b9
commit 25c9cbdf6e
40 changed files with 128 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarriersController.php
+2 -2
View File
@@ -167,7 +167,7 @@ class AdminCarriersControllerCore extends AdminController
<li>'.$this->l('Fill in the fields and click "Save."').'</li>
<li>'.
$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."').'
$this->l('Under the "Shipping" menu, click either "Price Ranges" or "Weight Ranges".').'
</li>
<li>'.$this->l('Click "Add new."').'</li>
<li>'.
@@ -175,7 +175,7 @@ class AdminCarriersControllerCore extends AdminController
$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>
<li>'.$this->l('Click on the "Shipping" menu.').'</li>
<li>'.
$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.').'
controllers/admin/AdminContactsController.php
+1 -1
View File
@@ -78,7 +78,7 @@ class AdminContactsControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('If enabled, all messages will be saved in the "Customer Service" tab'),
'desc' => $this->l('If enabled, all messages will be saved in the "Customer Service" page under the "Customer" menu'),
'values' => array(
array(
'id' => 'customer_service_on',
controllers/admin/AdminEmployeesController.php
+2 -2
View File
@@ -210,9 +210,9 @@ class AdminEmployeesControllerCore extends AdminController
),
array(
'type' => 'default_tab',
'label' => $this->l('Default tab'),
'label' => $this->l('Default page'),
'name' => 'default_tab',
'desc' => $this->l('This tab will be displayed just after login'),
'desc' => $this->l('This page will be displayed just after login'),
'options' => $this->tabs_list
),
array(
controllers/admin/AdminHomeController.php
+1 -1
View File
@@ -169,7 +169,7 @@ class AdminHomeControllerCore extends AdminController
$shop = Context::getContext()->shop;
if ($_SERVER['HTTP_HOST'] != $shop->domain && $_SERVER['HTTP_HOST'] != $shop->domain_ssl)
$this->displayWarning($this->l('You are currently connected with the following domain name:').' <span style="color: #CC0000;">'.$_SERVER['HTTP_HOST'].'</span><br />'.
$this->l('This is different from the main shop domain name set in shop tab:').' <span style="color: #CC0000;">'.$shop->domain.'</span><br />
$this->l('This is different from the main shop domain name set in "Multistore" page under the "Advanced Parameters" menu:').' <span style="color: #CC0000;">'.$shop->domain.'</span><br />
<a href="index.php?controller=AdminMeta&token='.Tools::getAdminTokenLite('AdminMeta').'#conf_id_domain">'.
$this->l('Click here if you want to modify the main shop domain name').'</a>');
}
controllers/admin/AdminImagesController.php
+1 -1
View File
@@ -139,7 +139,7 @@ class AdminImagesControllerCore extends AdminController
),
'PS_LEGACY_IMAGES' => array(
'title' => $this->l('Use the legacy image filesystem'),
'desc' => $this->l('This should be set to yes unless you successfully moved images in Preferences > Images tab'),
'desc' => $this->l('This should be set to yes unless you successfully moved images in "Images" page under the "Preferences" menu'),
'validation' => 'isBool',
'cast' => 'intval',
'required' => false,
controllers/admin/AdminImportController.php
+1 -1
View File
@@ -2561,7 +2561,7 @@ class AdminImportControllerCore extends AdminController
If your server configuration allows it, you may add a directive in your .htaccess, for example:')
.'<br/><a href="'.$this->context->link->getAdminLink('AdminMeta').'" >
<code>php_value post_max_size 20M</code> '.
Tools::displayError('(click to open "Generators" tab)').'</a>';
Tools::displayError('(click to open "Generators" page)').'</a>';
break;
break;
case UPLOAD_ERR_PARTIAL:
controllers/admin/AdminMetaController.php
+1 -1
View File
@@ -149,7 +149,7 @@ class AdminMetaControllerCore extends AdminController
}
}
else
$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.');
$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 "Multistore" page under the "Advanced Parameters" menu.');
// List of options
$this->fields_options = array(
controllers/admin/AdminPreferencesController.php
+1 -1
View File
@@ -88,7 +88,7 @@ class AdminPreferencesControllerCore extends AdminController
),
'PS_MULTISHOP_FEATURE_ACTIVE' => array(
'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.'),
'desc' => $this->l('Multistore feature allows you to manage several shops with one back-office. If this feature is enabled, a "Multistore" page will be available in the "Advanced Parameters" menu.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
controllers/admin/AdminStockManagementController.php
+1 -1
View File
@@ -108,7 +108,7 @@ class AdminStockManagementControllerCore extends AdminController
$this->displayInformation($this->l('This interface allows you to manage the stocks of each of your products and their variations.').'<br />');
$this->displayInformation($this->l('Through this interface, you can increase quantities (add) and decrease quantities (delete) of products for a given warehouse.'));
$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('Note that if you want to increase quantities of multiple products at once, you can use the "Supply orders" page under the "Stock" menu.').'<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('otherwise it will be considered reserved (i.e. for other purposes).'));
controllers/admin/AdminTabsController.php
+3 -3
View File
@@ -103,7 +103,7 @@ class AdminTabsControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Tabs'),
'title' => $this->l('Menus'),
'image' => '../img/admin/tab.gif'
),
'input' => array(
@@ -157,7 +157,7 @@ class AdminTabsControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Show or hide tab.')
'desc' => $this->l('Show or hide menu.')
),
array(
'type' => 'select',
@@ -272,7 +272,7 @@ class AdminTabsControllerCore extends AdminController
Tools::redirectAdmin(self::$currentIndex.'&conf=5&token='.Tools::getAdminTokenLite('AdminTabs'));
}
elseif (Tools::isSubmit('submitAddtab') && Tools::getValue('id_tab') === Tools::getValue('id_parent'))
$this->errors[] = Tools::displayError('You can\'t put this tab in itself');
$this->errors[] = Tools::displayError('You can\'t put this menu in itself');
else
{
// Temporary add the position depend of the selection of the parent category
controllers/admin/AdminTranslationsController.php
+2 -2
View File
@@ -1730,12 +1730,12 @@ class AdminTranslationsControllerCore extends AdminController
if (Tools::file_exists_cache($this->translations_informations['modules']['dir']))
$modules = scandir($this->translations_informations['modules']['dir']);
else
$this->displayWarning(Tools::displayError('There are no modules in your copy of PrestaShop. Use the Modules tab to activate them or go to our Website to download additional Modules.'));
$this->displayWarning(Tools::displayError('There are no modules in your copy of PrestaShop. Use the Modules page to activate them or go to our Website to download additional Modules.'));
else
if (Tools::file_exists_cache($this->translations_informations['modules']['override']['dir']))
$modules = scandir($this->translations_informations['modules']['override']['dir']);
else
$this->displayWarning(Tools::displayError('There are no modules in your copy of PrestaShop. Use the Modules tab to activate them or go to our Website to download additional Modules.'));
$this->displayWarning(Tools::displayError('There are no modules in your copy of PrestaShop. Use the Modules page to activate them or go to our Website to download additional Modules.'));
return $modules;
}