Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert Stock to singular #8077

Merged
merged 1 commit into from Jul 10, 2017
Merged

Revert Stock to singular #8077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Resources/translations/default/AdminCatalogFeature.xlf
View file
Open in desktop
Expand Up @@ -1380,8 +1380,8 @@ File: src/PrestaShopBundle/Translation/Api/StockApi.php:54</note>
File: src/PrestaShopBundle/Translation/Api/StockApi.php:56</note>
</trans-unit>
<trans-unit id="1dc2af14d15238ba67e03c99a6f415f6">
<source>Stocks</source>
<target>Stocks</target>
<source>Stock</source>
<target>Stock</target>
<note>Context:
File: src/PrestaShopBundle/Translation/Api/StockApi.php:55</note>
</trans-unit>
Expand Down
4 changes: 2 additions & 2 deletions app/Resources/translations/default/AdminNavigationMenu.xlf
View file
Open in desktop
Expand Up @@ -684,8 +684,8 @@ File: src/PrestaShopBundle/Controller/Admin/ModuleController.php:80</note>
<file original="install-dev/upgrade/php/add_new_status_stock.php" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="1dc2af14d15238ba67e03c99a6f415f6">
<source>Stocks</source>
<target>Stocks</target>
<source>Stock</source>
<target>Stock</target>
<note>Context:
File: install-dev/upgrade/php/add_new_status_stock.php:68</note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion classes/lang/TabLang.php
View file
Open in desktop
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion install-dev/upgrade/php/add_new_status_stock.php
View file
Open in desktop
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/PrestaShopBundle/Translation/Api/StockApi.php
View file
Open in desktop
Expand Up @@ -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'),
Expand Down