diff --git a/app/Resources/translations/default/AdminCatalogFeature.xlf b/app/Resources/translations/default/AdminCatalogFeature.xlf index 6507593ae6497..cb9ed4a4647c8 100644 --- a/app/Resources/translations/default/AdminCatalogFeature.xlf +++ b/app/Resources/translations/default/AdminCatalogFeature.xlf @@ -1380,8 +1380,8 @@ File: src/PrestaShopBundle/Translation/Api/StockApi.php:54 File: src/PrestaShopBundle/Translation/Api/StockApi.php:56 - Stocks - Stocks + Stock + Stock Context: File: src/PrestaShopBundle/Translation/Api/StockApi.php:55 diff --git a/app/Resources/translations/default/AdminNavigationMenu.xlf b/app/Resources/translations/default/AdminNavigationMenu.xlf index f99c1d56c4b9a..45334d55e8def 100644 --- a/app/Resources/translations/default/AdminNavigationMenu.xlf +++ b/app/Resources/translations/default/AdminNavigationMenu.xlf @@ -684,8 +684,8 @@ File: src/PrestaShopBundle/Controller/Admin/ModuleController.php:80 - Stocks - Stocks + Stock + Stock Context: File: install-dev/upgrade/php/add_new_status_stock.php:68 diff --git a/classes/lang/TabLang.php b/classes/lang/TabLang.php index 8562e3177d2c9..846560a4f9c02 100644 --- a/classes/lang/TabLang.php +++ b/classes/lang/TabLang.php @@ -130,7 +130,7 @@ protected function init() md5('Stock Coverage') => $this->translator->trans('Stock Coverage', array(), 'Admin.Navigation.Menu', $this->locale), md5('Stock Management') => $this->translator->trans('Stock Management', array(), 'Admin.Navigation.Menu', $this->locale), md5('Stock Movement') => $this->translator->trans('Stock Movement', array(), 'Admin.Navigation.Menu', $this->locale), - md5('Stocks') => $this->translator->trans('Stocks', array(), 'Admin.Navigation.Menu', $this->locale), + md5('Stock') => $this->translator->trans('Stock', array(), 'Admin.Navigation.Menu', $this->locale), md5('Stores') => $this->translator->trans('Stores', array(), 'Admin.Navigation.Menu', $this->locale), md5('Suppliers') => $this->translator->trans('Suppliers', array(), 'Admin.Navigation.Menu', $this->locale), md5('Supply orders') => $this->translator->trans('Supply orders', array(), 'Admin.Navigation.Menu', $this->locale), diff --git a/install-dev/upgrade/php/add_new_status_stock.php b/install-dev/upgrade/php/add_new_status_stock.php index 490cfd0128248..767afc3a80bb1 100644 --- a/install-dev/upgrade/php/add_new_status_stock.php +++ b/install-dev/upgrade/php/add_new_status_stock.php @@ -65,7 +65,7 @@ function add_new_status_stock() foreach ($languages as $lang) { Db::getInstance()->execute( 'INSERT INTO `'._DB_PREFIX_.'tab_lang` (`id_tab`, `id_lang`, `name`) - VALUES ('.(int)$lastIdTab.', '.(int)$lang['id_lang'].', "'.pSQL($translator->trans('Stocks', array(), 'Admin.Navigation.Menu', $lang['locale'])).'")'); + VALUES ('.(int)$lastIdTab.', '.(int)$lang['id_lang'].', "'.pSQL($translator->trans('Stock', array(), 'Admin.Navigation.Menu', $lang['locale'])).'")'); } foreach ($data as $d) { diff --git a/src/PrestaShopBundle/Translation/Api/StockApi.php b/src/PrestaShopBundle/Translation/Api/StockApi.php index 0ddf3a1622b1e..e0568ec615325 100644 --- a/src/PrestaShopBundle/Translation/Api/StockApi.php +++ b/src/PrestaShopBundle/Translation/Api/StockApi.php @@ -50,9 +50,9 @@ public function getTranslations() 'head_title' => $this->translator->trans('Stock management', array(), 'Admin.Catalog.Feature'), 'link_catalog' => $this->translator->trans('Catalog', array(), 'Admin.Navigation.Menu'), 'link_movements' => $this->translator->trans('Movements', array(), 'Admin.Catalog.Feature'), - 'link_overview' => $this->translator->trans('Stocks', array(), 'Admin.Catalog.Feature'), + 'link_overview' => $this->translator->trans('Stock', array(), 'Admin.Catalog.Feature'), 'link_stock' => $this->translator->trans('Stock management', array(), 'Admin.Catalog.Feature'), - 'menu_stock' => $this->translator->trans('Stocks', array(), 'Admin.Catalog.Feature'), + 'menu_stock' => $this->translator->trans('Stock', array(), 'Admin.Catalog.Feature'), 'menu_movements' => $this->translator->trans('Movements', array(), 'Admin.Catalog.Feature'), 'no_product' => $this->translator->trans('No product matches your search. Try changing search terms.', array(), 'Admin.Catalog.Notification'), 'none' => $this->translator->trans('None', array(), 'Admin.Catalog.Feature'),