Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

controllers/admin/AdminAttributeGeneratorController.php

@@ -196,9 +196,12 @@ class AdminAttributeGeneratorControllerCore extends AdminController
 		));
 	}
 
-	public function initToolbar()
+	public function initPageHeaderToolbar()
 	{
-		$this->toolbar_btn['back'] = array(
+		parent::initPageHeaderToolbar();
+
+		$this->page_header_toolbar_title = $this->l('Attributes generator');
+		$this->page_header_toolbar_btn['back'] = array(
 			'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)Tools::getValue('id_product').'&addproduct&key_tab=Combinations',
 			'desc' => $this->l('Back to the product')
 		);
@@ -215,8 +218,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
 		}
 
 		// Init toolbar
-		$this->initToolbarTitle();
-		$this->initToolbar();
+		$this->initPageHeaderToolbar();
 		$this->initGroupTable();
 
 		$attributes = Attribute::getAttributes(Context::getContext()->language->id, true);
@@ -239,7 +241,9 @@ class AdminAttributeGeneratorControllerCore extends AdminController
 			'attribute_js' => $attribute_js,
 			'toolbar_btn' => $this->toolbar_btn,
 			'toolbar_scroll' => true,
-			'title' => $this->toolbar_title,
+			'show_page_header_toolbar' => $this->show_page_header_toolbar,
+			'page_header_toolbar_title' => $this->page_header_toolbar_title,
+			'page_header_toolbar_btn' => $this->page_header_toolbar_btn
 		));
 	}
 }

controllers/admin/AdminCarrierWizardController.php

@@ -149,10 +149,10 @@ class AdminCarrierWizardControllerCore extends AdminController
 		$this->toolbar_title = $bread_extended;
 	}
 
-	public function initToolbar()
+	public function initPageHeaderToolbar()
 	{
-		parent::initToolbar();
-		$this->toolbar_btn['back']['href'] = $this->context->link->getAdminLink('AdminCarriers');
+		parent::initPageHeaderToolbar();
+		$this->page_header_toolbar_btn['back']['href'] = $this->context->link->getAdminLink('AdminCarriers');
 	}
 
 	public function renderStepOne($carrier)
@@ -254,7 +254,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 					),
 					array(
 						'type' => 'switch',
-						'label' => $this->l('Apply shipping cost:'),
+						'label' => $this->l('Free Shipping:'),
 						'name' => 'is_free',
 						'required' => false,
 						'class' => 't',
@@ -270,7 +270,6 @@ class AdminCarrierWizardControllerCore extends AdminController
 								'label' => '<img src="../img/admin/enabled.gif" alt="'.$this->l('Yes').'" title="'.$this->l('Yes').'" />'
 							)
 						),
-						'hint' => $this->l('Apply both regular shipping cost and product-specific shipping costs.')
 					),
 					array(
 						'type' => 'radio',

controllers/admin/AdminCategoriesController.php

@@ -351,7 +351,7 @@ class AdminCategoriesControllerCore extends AdminController
 		$helper->id = 'box-disabled-categories';
 		$helper->icon = 'icon-off';
 		$helper->color = 'color1';
-		$helper->title = $this->l('Disabled Categories');
+		$helper->title = $this->l('Disabled Categories', null, null, false);
 		if (ConfigurationKPI::get('DISABLED_CATEGORIES') !== false)
 			$helper->value = ConfigurationKPI::get('DISABLED_CATEGORIES');
 		if (ConfigurationKPI::get('DISABLED_CATEGORIES_EXPIRE') < $time)
@@ -362,7 +362,7 @@ class AdminCategoriesControllerCore extends AdminController
 		$helper->id = 'box-empty-categories';
 		$helper->icon = 'icon-bookmark-empty';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Empty Categories');
+		$helper->title = $this->l('Empty Categories', null, null, false);
 		if (ConfigurationKPI::get('EMPTY_CATEGORIES') !== false)
 			$helper->value = ConfigurationKPI::get('EMPTY_CATEGORIES');
 		if (ConfigurationKPI::get('EMPTY_CATEGORIES_EXPIRE') < $time)
@@ -373,8 +373,8 @@ class AdminCategoriesControllerCore extends AdminController
 		$helper->id = 'box-top-category';
 		$helper->icon = 'icon-money';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Top Category');
-		$helper->subtitle = $this->l('30 days');
+		$helper->title = $this->l('Top Category', null, null, false);
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang) !== false)
 			$helper->value = ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang);
 		if (ConfigurationKPI::get('TOP_CATEGORY_EXPIRE', $this->context->employee->id_lang) < $time)

controllers/admin/AdminCustomerThreadsController.php

@@ -478,7 +478,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
 		$helper->id = 'box-pending-messages';
 		$helper->icon = 'icon-envelope';
 		$helper->color = 'color1';
-		$helper->title = $this->l('Pending Messages');
+		$helper->title = $this->l('Pending Messages', null, null, false);
 		if (ConfigurationKPI::get('PENDING_MESSAGES') !== false)
 			$helper->value = ConfigurationKPI::get('PENDING_MESSAGES');
 		if (ConfigurationKPI::get('PENDING_MESSAGES_EXPIRE') < $time)
@@ -489,8 +489,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
 		$helper->id = 'box-age';
 		$helper->icon = 'icon-time';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Average Response Time');
-		$helper->subtitle = $this->l('30 days');
+		$helper->title = $this->l('Average Response Time', null, null, false);
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME') !== false)
 			$helper->value = ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME');
 		if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME_EXPIRE') < $time)
@@ -501,8 +501,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
 		$helper->id = 'box-messages-per-thread';
 		$helper->icon = 'icon-copy';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Messages per Thread');
-		$helper->subtitle = $this->l('30 day');
+		$helper->title = $this->l('Messages per Thread', null, null, false);
+		$helper->subtitle = $this->l('30 day', null, null, false);
 		if (ConfigurationKPI::get('MESSAGES_PER_THREAD') !== false)
 			$helper->value = ConfigurationKPI::get('MESSAGES_PER_THREAD');
 		if (ConfigurationKPI::get('MESSAGES_PER_THREAD_EXPIRE') < $time)

controllers/admin/AdminCustomersController.php

@@ -545,8 +545,8 @@ class AdminCustomersControllerCore extends AdminController
 		$helper->id = 'box-gender';
 		$helper->icon = 'icon-male';
 		$helper->color = 'color1';
-		$helper->title = $this->l('Customers');
-		$helper->subtitle = $this->l('All Time');
+		$helper->title = $this->l('Customers', null, null, false);
+		$helper->subtitle = $this->l('All Time', null, null, false);
 		if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER') !== false)
 			$helper->value = ConfigurationKPI::get('CUSTOMER_MAIN_GENDER');
 		if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER_EXPIRE') < $time)
@@ -557,8 +557,8 @@ class AdminCustomersControllerCore extends AdminController
 		$helper->id = 'box-age';
 		$helper->icon = 'icon-calendar';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Average Age');
-		$helper->subtitle = $this->l('All Time');
+		$helper->title = $this->l('Average Age', 'AdminTab', null, false);
+		$helper->subtitle = $this->l('All Time', null, null, false);
 		if (ConfigurationKPI::get('AVG_CUSTOMER_AGE') !== false)
 			$helper->value = ConfigurationKPI::get('AVG_CUSTOMER_AGE');
 		if (ConfigurationKPI::get('AVG_CUSTOMER_AGE_EXPIRE') < $time)
@@ -569,8 +569,8 @@ class AdminCustomersControllerCore extends AdminController
 		$helper->id = 'box-orders';
 		$helper->icon = 'icon-retweet';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Orders per Customer');
-		$helper->subtitle = $this->l('All Time');
+		$helper->title = $this->l('Orders per Customer', null, null, false);
+		$helper->subtitle = $this->l('All Time', null, null, false);
 		if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER') !== false)
 			$helper->value = ConfigurationKPI::get('ORDERS_PER_CUSTOMER');
 		if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER_EXPIRE') < $time)
@@ -581,8 +581,8 @@ class AdminCustomersControllerCore extends AdminController
 		$helper->id = 'box-newsletter';
 		$helper->icon = 'icon-envelope';
 		$helper->color = 'color4';
-		$helper->title = $this->l('Newsletter Registrations');
-		$helper->subtitle = $this->l('All Time');
+		$helper->title = $this->l('Newsletter Registrations', null, null, false);
+		$helper->subtitle = $this->l('All Time', null, null, false);
 		if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS') !== false)
 			$helper->value = ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS');
 		if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS_EXPIRE') < $time)

controllers/admin/AdminDashboardController.php

@@ -49,7 +49,7 @@ class AdminDashboardControllerCore extends AdminController
 			_PS_JS_DIR_.'/admin-dashboard.js',
 		));
 		$this->addCSS(array(
-			__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/nv.d3.css',
+			__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/vendor/nv.d3.css',
 		));
 	}
 
@@ -86,7 +86,7 @@ class AdminDashboardControllerCore extends AdminController
 			{
 				$forms['payment']['fields']['CONF_'.strtoupper($module->name).'_FIXED'] = array(
 					'title' => $module->displayName,
-					'desc' => sprintf($this->l('Choose a fixed fee for each order placed in %s with %s.'), $currency->iso_code, $module->displayName),
+					'desc' => sprintf($this->l('Choose a fixed fee for each order placed in %1$s with %2$s.'), $currency->iso_code, $module->displayName),
 					'validation' => 'isPrice',
 					'cast' => 'floatval',
 					'type' => 'text',
@@ -95,7 +95,7 @@ class AdminDashboardControllerCore extends AdminController
 				);
 				$forms['payment']['fields']['CONF_'.strtoupper($module->name).'_VAR'] = array(
 					'title' => $module->displayName,
-					'desc' => sprintf($this->l('Choose a variable fee for each order placed in %s with %s. It will be applied on the total paid with taxes.'), $currency->iso_code, $module->displayName),
+					'desc' => sprintf($this->l('Choose a variable fee for each order placed in %1$s with %2$s. It will be applied on the total paid with taxes.'), $currency->iso_code, $module->displayName),
 					'validation' => 'isPercentage',
 					'cast' => 'floatval',
 					'type' => 'text',
@@ -325,6 +325,7 @@ class AdminDashboardControllerCore extends AdminController
 			{
 				if ($articles_limit > 0 && Validate::isCleanHtml((string)$item->title) && Validate::isCleanHtml((string)$item->description))
 					$return['rss'][] = array(
+						'date' => Tools::displayDate(date('Y-m-d', strtotime((string)$item->pubDate))),
 						'title' => (string)$item->title,
 						'short_desc' => substr((string)$item->description, 0, 100).'...',
 						'link' => (string)$item->link,
@@ -339,22 +340,36 @@ class AdminDashboardControllerCore extends AdminController
 	
 	public function ajaxProcessSaveDashConfig()
 	{
-		$return = array('has_errors' => false);
+		$return = array('has_errors' => false, 'errors' => array());
 		$module = Tools::getValue('module');
 		$hook = Tools::getValue('hook');
 		$configs = Tools::getValue('configs');
-
+		
+		$params = array(
+			'date_from' => $this->context->employee->stats_date_from,
+			'date_to' => $this->context->employee->stats_date_to
+		);
+		
 		if (Validate::isModuleName($module) && $module_obj = Module::getInstanceByName($module))
-			if (Validate::isLoadedObject($module_obj) && method_exists($module_obj, 'saveDashConfig'))
-				$return['has_errors'] = $module_obj->saveDashConfig($configs);
+		{
+			if (Validate::isLoadedObject($module_obj) && method_exists($module_obj, 'validateDashConfig'))
+				$return['errors'] = $module_obj->validateDashConfig($configs);
+			if (!count($return['errors']))
+			{
+				if (Validate::isLoadedObject($module_obj) && method_exists($module_obj, 'saveDashConfig'))
+					$return['has_errors'] = $module_obj->saveDashConfig($configs);
+			}
+			else
+				$return['has_errors'] = true;
+		}
 		else if (is_array($configs) && count($configs))
 				foreach ($configs as $name => $value)
 					if (Validate::isConfigName($name))
 						Configuration::updateValue($name, $value);
 		
 		if (Validate::isHookName($hook) && method_exists($module_obj, $hook))
-			$return['widget_html'] = $module_obj->$hook(array());
-		
+			$return['widget_html'] = $module_obj->$hook($params);
+
 		die(Tools::jsonEncode($return));
 	}
 	

controllers/admin/AdminGroupsController.php

@@ -246,7 +246,7 @@ class AdminGroupsControllerCore extends AdminController
 			'input' => array(
 				array(
 					'type' => 'text',
-					'label' => $this->l('Name:'),
+					'label' => $this->l('Name'),
 					'name' => 'name',
 					'required' => true,
 					'lang' => true,
@@ -255,14 +255,15 @@ class AdminGroupsControllerCore extends AdminController
 				),
 				array(
 					'type' => 'text',
-					'label' => $this->l('Discount (%):'),
+					'label' => $this->l('Discount'),
 					'name' => 'reduction',
-					'col' => 2,
+					'suffix' => '%',
+					'col' => 1,
 					'hint' => $this->l('Automatically apply this value as a discount on all products for members of this customer group.')
 				),
 				array(
 					'type' => 'select',
-					'label' => $this->l('Price display method:'),
+					'label' => $this->l('Price display method'),
 					'name' => 'price_display_method',
 					'col' => 2,
 					'hint' => $this->l('How prices are displayed in the order summary for this customer group.'),
@@ -283,7 +284,7 @@ class AdminGroupsControllerCore extends AdminController
 				),
 				array(
 					'type' => 'switch',
-					'label' => $this->l('Show prices:'),
+					'label' => $this->l('Show prices'),
 					'name' => 'show_prices',
 					'required' => false,
 					'class' => 't',
@@ -310,7 +311,7 @@ class AdminGroupsControllerCore extends AdminController
 				),
 				array(
 					'type' => 'modules',
-					'label' => array('auth_modules' => $this->l('Authorized modules:'), 'unauth_modules' => $this->l('Unauthorized modules:')),
+					'label' => $this->l('Modules Authorization'),
 					'name' => 'auth_modules',
 					'values' => $this->formatModuleListAuth($group->id)
 				)

controllers/admin/AdminImportController.php

@@ -506,7 +506,6 @@ class AdminImportControllerCore extends AdminController
 		$this->toolbar_btn = array();
 
 		// adds fancybox
-		$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
 		$this->addJqueryPlugin(array('fancybox'));
 
 		$entity_selected = 0;

controllers/admin/AdminModulesController.php

@@ -694,6 +694,8 @@ class AdminModulesControllerCore extends AdminController
 						if ($key == 'configure' && Module::isInstalled($module->name))
 						{
 							$this->bootstrap = (isset($module->bootstrap) && $module->bootstrap);
+							if (!$this->bootstrap)
+								$this->setDeprecatedMedia();
 							if (isset($module->multishop_context))
 								$this->multishop_context = $module->multishop_context;
 
@@ -987,7 +989,7 @@ class AdminModulesControllerCore extends AdminController
 		$helper->id = 'box-installed-modules';
 		$helper->icon = 'icon-puzzle-piece';
 		$helper->color = 'color1';
-		$helper->title = html_entity_decode($this->l('Installed Modules'));
+		$helper->title = $this->l('Installed Modules', null, null, false);
 		if (ConfigurationKPI::get('INSTALLED_MODULES') !== false)
 			$helper->value = ConfigurationKPI::get('INSTALLED_MODULES');
 		if (ConfigurationKPI::get('INSTALLED_MODULES_EXPIRE') < $time)
@@ -998,7 +1000,7 @@ class AdminModulesControllerCore extends AdminController
 		$helper->id = 'box-disabled-modules';
 		$helper->icon = 'icon-off';
 		$helper->color = 'color2';
-		$helper->title = html_entity_decode($this->l('Disabled Modules'));
+		$helper->title = $this->l('Disabled Modules', null, null, false);
 		if (ConfigurationKPI::get('DISABLED_MODULES') !== false)
 			$helper->value = ConfigurationKPI::get('DISABLED_MODULES');
 		if (ConfigurationKPI::get('DISABLED_MODULES_EXPIRE') < $time)
@@ -1009,7 +1011,7 @@ class AdminModulesControllerCore extends AdminController
 		$helper->id = 'box-update-modules';
 		$helper->icon = 'icon-refresh';
 		$helper->color = 'color3';
-		$helper->title = html_entity_decode($this->l('Modules to update'));
+		$helper->title = $this->l('Modules to update', null, null, false);
 		if (ConfigurationKPI::get('UPDATE_MODULES') !== false)
 			$helper->value = ConfigurationKPI::get('UPDATE_MODULES');
 		if (ConfigurationKPI::get('UPDATE_MODULES_EXPIRE') < $time)

controllers/admin/AdminOrdersController.php

@@ -1263,8 +1263,8 @@ class AdminOrdersControllerCore extends AdminController
 		$helper->icon = 'icon-sort-by-attributes-alt';
 		//$helper->chart = true;
 		$helper->color = 'color1';
-		$helper->title = $this->l('Conversion Rate');
-		$helper->subtitle = $this->l('30 days');
+		$helper->title = $this->l('Conversion Rate', null, null, false);
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('CONVERSION_RATE') !== false)
 			$helper->value = ConfigurationKPI::get('CONVERSION_RATE');
 		if (ConfigurationKPI::get('CONVERSION_RATE_CHART') !== false)
@@ -1277,8 +1277,8 @@ class AdminOrdersControllerCore extends AdminController
 		$helper->id = 'box-carts';
 		$helper->icon = 'icon-shopping-cart';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Abandoned Carts');
-		$helper->subtitle = $this->l('Today');
+		$helper->title = $this->l('Abandoned Carts', null, null, false);
+		$helper->subtitle = $this->l('Today', null, null, false);
 		$helper->href = $this->context->link->getAdminLink('AdminCarts');
 		if (ConfigurationKPI::get('ABANDONED_CARTS') !== false)
 			$helper->value = ConfigurationKPI::get('ABANDONED_CARTS');
@@ -1290,8 +1290,8 @@ class AdminOrdersControllerCore extends AdminController
 		$helper->id = 'box-average-order';
 		$helper->icon = 'icon-money';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Average Order Value');
-		$helper->subtitle = $this->l('30 days');
+		$helper->title = $this->l('Average Order Value', null, null, false);
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('AVG_ORDER_VALUE') !== false)
 			$helper->value = ConfigurationKPI::get('AVG_ORDER_VALUE');
 		if (ConfigurationKPI::get('AVG_ORDER_VALUE_EXPIRE') < $time)
@@ -1302,8 +1302,8 @@ class AdminOrdersControllerCore extends AdminController
 		$helper->id = 'box-net-profit-visitor';
 		$helper->icon = 'icon-user';
 		$helper->color = 'color4';
-		$helper->title = $this->l('Net Profit per Visitor');
-		$helper->subtitle = $this->l('30 days');
+		$helper->title = $this->l('Net Profit per Visitor', null, null, false);
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('NETPROFIT_VISITOR') !== false)
 			$helper->value = ConfigurationKPI::get('NETPROFIT_VISITOR');
 		if (ConfigurationKPI::get('NETPROFIT_VISITOR_EXPIRE') < $time)

controllers/admin/AdminProductsController.php

@@ -2311,7 +2311,7 @@ class AdminProductsControllerCore extends AdminController
 			$helper->id = 'box-products-stock';
 			$helper->icon = 'icon-archive';
 			$helper->color = 'color1';
-			$helper->title = $this->l('Items in Stock');
+			$helper->title = $this->l('Items in Stock', null, null, false);
 			if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK') !== false)
 				$helper->value = ConfigurationKPI::get('PERCENT_PRODUCT_STOCK');
 			if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK_EXPIRE') < $time)
@@ -2323,7 +2323,7 @@ class AdminProductsControllerCore extends AdminController
 		$helper->id = 'box-avg-gross-margin';
 		$helper->icon = 'icon-tags';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Average Gross Margin');
+		$helper->title = $this->l('Average Gross Margin', null, null, false);
 		if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN') !== false)
 			$helper->value = ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN');
 		if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN_EXPIRE') < $time)
@@ -2334,8 +2334,8 @@ class AdminProductsControllerCore extends AdminController
 		$helper->id = 'box-8020-sales-catalog';
 		$helper->icon = 'icon-beaker';
 		$helper->color = 'color3';
-		$helper->title = $this->l('80% of your sales');
-		$helper->subtitle = $this->l('30 days');
+		$helper->title = $this->l('80% of your sales', null, null, false);
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('8020_SALES_CATALOG') !== false)
 			$helper->value = ConfigurationKPI::get('8020_SALES_CATALOG');
 		if (ConfigurationKPI::get('8020_SALES_CATALOG_EXPIRE') < $time)
@@ -2346,7 +2346,7 @@ class AdminProductsControllerCore extends AdminController
 		$helper->id = 'box-disabled-products';
 		$helper->icon = 'icon-off';
 		$helper->color = 'color4';
-		$helper->title = $this->l('Disabled Products');
+		$helper->title = $this->l('Disabled Products', null, null, false);
 		if (ConfigurationKPI::get('DISABLED_PRODUCTS') !== false)
 			$helper->value = ConfigurationKPI::get('DISABLED_PRODUCTS');
 		if (ConfigurationKPI::get('DISABLED_PRODUCTS_EXPIRE') < $time)
@@ -3883,6 +3883,7 @@ class AdminProductsControllerCore extends AdminController
 
 		$helper = new HelperList();
 		$helper->identifier = 'id_product_attribute';
+		$helper->table_id = 'combinations-list';
 		$helper->token = $this->token;
 		$helper->currentIndex = self::$currentIndex;
 		$helper->no_link = true;

controllers/admin/AdminTranslationsController.php

@@ -1294,7 +1294,7 @@ class AdminTranslationsControllerCore extends AdminController
 		$helper->id = 'box-languages';
 		$helper->icon = 'icon-microphone';
 		$helper->color = 'color1';
-		$helper->title = $this->l('Enabled Languages');
+		$helper->title = $this->l('Enabled Languages', null, null, false);
 		if (ConfigurationKPI::get('ENABLED_LANGUAGES') !== false)
 			$helper->value = ConfigurationKPI::get('ENABLED_LANGUAGES');
 		if (ConfigurationKPI::get('ENABLED_LANGUAGES_EXPIRE') < $time)
@@ -1305,8 +1305,8 @@ class AdminTranslationsControllerCore extends AdminController
 		$helper->id = 'box-country';
 		$helper->icon = 'icon-home';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Main Country');
-		$helper->subtitle = $this->l('30 Days');
+		$helper->title = $this->l('Main Country', null, null, false);
+		$helper->subtitle = $this->l('30 Days', null, null, false);
 		if (ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id) !== false)
 			$helper->value = ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id);
 		if (ConfigurationKPI::get('MAIN_COUNTRY_EXPIRE', $this->context->language->id) < $time)
@@ -1317,7 +1317,7 @@ class AdminTranslationsControllerCore extends AdminController
 		$helper->id = 'box-translations';
 		$helper->icon = 'icon-list';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Front Office Translations');
+		$helper->title = $this->l('Front Office Translations', null, null, false);
 		if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS') !== false)
 			$helper->value = ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS');
 		if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS_EXPIRE') < $time)

controllers/admin/AdminWebserviceController.php

@@ -97,7 +97,7 @@ class AdminWebserviceControllerCore extends AdminController
 		if (empty($this->display))
 			$this->page_header_toolbar_btn['new_webservice'] = array(
 				'href' => self::$currentIndex.'&addwebservice_account&token='.$this->token,
-				'desc' => $this->l('Add new webservice'),
+				'desc' => $this->l('Add new webservice key'),
 				'icon' => 'process-icon-new'
 			);