From a781594b10d0cfe37896c4d28e994cf78722b1d7 Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 15 Jan 2019 16:03:55 +0530 Subject: [PATCH] Translations added for menu and acl lables --- packages/Webkul/Admin/src/Config/acl.php | 63 +++++++++--------- packages/Webkul/Admin/src/Config/menu.php | 58 ++++++++--------- .../Admin/src/Resources/lang/en/app.php | 64 +++++++++++++++++++ .../views/layouts/nav-aside.blade.php | 4 +- .../views/layouts/nav-left.blade.php | 2 +- .../Resources/views/layouts/nav-top.blade.php | 6 +- .../Resources/views/layouts/tabs.blade.php | 4 +- packages/Webkul/Core/src/Tree.php | 1 + packages/Webkul/Shop/src/Config/menu.php | 12 ++-- .../Webkul/Shop/src/Resources/lang/en/app.php | 9 +++ .../account/partials/sidemenu.blade.php | 4 +- 11 files changed, 148 insertions(+), 79 deletions(-) diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php index 084205d45..245f39447 100755 --- a/packages/Webkul/Admin/src/Config/acl.php +++ b/packages/Webkul/Admin/src/Config/acl.php @@ -3,147 +3,142 @@ return [ [ 'key' => 'dashboard', - 'name' => 'Dashboard', + 'name' => 'admin::app.acl.dashboard', 'route' => 'admin.dashboard.index', 'sort' => 1 ], [ 'key' => 'sales', - 'name' => 'Sales', + 'name' => 'admin::app.acl.sales', 'route' => 'admin.sales.orders.index', 'sort' => 2 ], [ 'key' => 'sales.orders', - 'name' => 'Orders', + 'name' => 'admin::app.acl.orders', 'route' => 'admin.sales.orders.index', 'sort' => 1 ], [ 'key' => 'sales.invoices', - 'name' => 'Invoices', + 'name' => 'admin::app.acl.invoices', 'route' => 'admin.sales.invoices.index', 'sort' => 2 ], [ 'key' => 'sales.shipments', - 'name' => 'Shipments', + 'name' => 'admin::app.acl.shipments', 'route' => 'admin.sales.shipments.index', 'sort' => 3 ], [ 'key' => 'catalog', - 'name' => 'Catalog', + 'name' => 'admin::app.acl.catalog', 'route' => 'admin.catalog.index', 'sort' => 3 ], [ 'key' => 'catalog.products', - 'name' => 'Products', + 'name' => 'admin::app.acl.products', 'route' => 'admin.catalog.products.index', 'sort' => 1 ], [ 'key' => 'catalog.categories', - 'name' => 'Categories', + 'name' => 'admin::app.acl.categories', 'route' => 'admin.catalog.categories.index', 'sort' => 2 ], [ 'key' => 'catalog.attributes', - 'name' => 'Attributes', + 'name' => 'admin::app.acl.attributes', 'route' => 'admin.catalog.attributes.index', 'sort' => 3 ], [ 'key' => 'catalog.families', - 'name' => 'Families', + 'name' => 'admin::app.acl.attribute-families', 'route' => 'admin.catalog.families.index', 'sort' => 4 ], [ 'key' => 'customers', - 'name' => 'Customers', + 'name' => 'admin::app.acl.customers', 'route' => 'admin.customers.index', 'sort' => 4 ], [ 'key' => 'customers.customers', - 'name' => 'Customers', + 'name' => 'admin::app.acl.customers', 'route' => 'admin.customers.index', 'sort' => 1 ], [ 'key' => 'customers.groups', - 'name' => 'Groups', + 'name' => 'admin::app.acl.groups', 'route' => 'admin.groups.index', 'sort' => 2 ], [ 'key' => 'customers.reviews', - 'name' => 'Reviews', + 'name' => 'admin::app.acl.reviews', 'route' => 'admin.customers.reviews.index', 'sort' => 3 ], [ 'key' => 'configuration', - 'name' => 'Configure', + 'name' => 'admin::app.acl.configure', 'route' => 'admin.account.edit', - 'sort' => 1 - ], [ - 'key' => 'configuration', - 'name' => 'Configure', - 'route' => 'admin.account.edit', - 'sort' => 1 + 'sort' => 5 ], [ 'key' => 'settings', - 'name' => 'Settings', + 'name' => 'admin::app.acl.settings', 'route' => 'admin.users.index', 'sort' => 6 ], [ 'key' => 'settings.locales', - 'name' => 'Locales', + 'name' => 'admin::app.acl.locales', 'route' => 'admin.locales.index', 'sort' => 1 ], [ 'key' => 'settings.currencies', - 'name' => 'Currencies', + 'name' => 'admin::app.acl.currencies', 'route' => 'admin.currencies.index', 'sort' => 2 ], [ 'key' => 'settings.exchange_rates', - 'name' => 'Exchange Rates', + 'name' => 'admin::app.acl.exchange-rates', 'route' => 'admin.exchange_rates.index', 'sort' => 3 ], [ 'key' => 'settings.inventory_sources', - 'name' => 'Inventory Sources', + 'name' => 'admin::app.acl.inventory-sources', 'route' => 'admin.inventory_sources.index', 'sort' => 4 ], [ 'key' => 'settings.channels', - 'name' => 'Channels', + 'name' => 'admin::app.acl.channels', 'route' => 'admin.channels.index', 'sort' => 5 ], [ 'key' => 'settings.users', - 'name' => 'Users', + 'name' => 'admin::app.acl.users', 'route' => 'admin.users.index', 'sort' => 6 ], [ 'key' => 'settings.users.users', - 'name' => 'Users', + 'name' => 'admin::app.acl.users', 'route' => 'admin.users.index', 'sort' => 1 ], [ 'key' => 'settings.users.roles', - 'name' => 'Roles', + 'name' => 'admin::app.acl.roles', 'route' => 'admin.roles.index', 'sort' => 1 ], [ 'key' => 'settings.sliders', - 'name' => 'Sliders', + 'name' => 'admin::app.acl.sliders', 'route' => 'admin.sliders.index', 'sort' => 7 ], [ 'key' => 'settings.taxes', - 'name' => 'Taxes', + 'name' => 'admin::app.acl.taxes', 'route' => 'admin.tax-categories.index', 'sort' => 8 ], [ 'key' => 'settings.taxes.tax-categories', - 'name' => 'Tax Categories', + 'name' => 'admin::app.acl.tax-categories', 'route' => 'admin.tax-categories.index', 'sort' => 1 ], [ 'key' => 'settings.taxes.tax-rates', - 'name' => 'Tax Rates', + 'name' => 'admin::app.acl.tax-rates', 'route' => 'admin.tax-rates.index', 'sort' => 2 ] diff --git a/packages/Webkul/Admin/src/Config/menu.php b/packages/Webkul/Admin/src/Config/menu.php index 326e1db13..47e0a11ea 100755 --- a/packages/Webkul/Admin/src/Config/menu.php +++ b/packages/Webkul/Admin/src/Config/menu.php @@ -3,176 +3,176 @@ return [ [ 'key' => 'dashboard', - 'name' => 'Dashboard', + 'name' => 'admin::app.layouts.dashboard', 'route' => 'admin.dashboard.index', 'sort' => 1, 'icon-class' => 'dashboard-icon', ], [ 'key' => 'sales', - 'name' => 'Sales', + 'name' => 'admin::app.layouts.sales', 'route' => 'admin.sales.orders.index', 'sort' => 2, 'icon-class' => 'sales-icon', ], [ 'key' => 'sales.orders', - 'name' => 'Orders', + 'name' => 'admin::app.layouts.orders', 'route' => 'admin.sales.orders.index', 'sort' => 1, 'icon-class' => '', ], [ 'key' => 'sales.shipments', - 'name' => 'Shipments', + 'name' => 'admin::app.layouts.shipments', 'route' => 'admin.sales.shipments.index', 'sort' => 2, 'icon-class' => '', ], [ 'key' => 'sales.invoices', - 'name' => 'Invoices', + 'name' => 'admin::app.layouts.invoices', 'route' => 'admin.sales.invoices.index', 'sort' => 3, 'icon-class' => '', ], [ 'key' => 'catalog', - 'name' => 'Catalog', + 'name' => 'admin::app.layouts.catalog', 'route' => 'admin.catalog.products.index', 'sort' => 3, 'icon-class' => 'catalog-icon', ], [ 'key' => 'catalog.products', - 'name' => 'Products', + 'name' => 'admin::app.layouts.products', 'route' => 'admin.catalog.products.index', 'sort' => 1, 'icon-class' => '', ], [ 'key' => 'catalog.categories', - 'name' => 'Categories', + 'name' => 'admin::app.layouts.categories', 'route' => 'admin.catalog.categories.index', 'sort' => 2, 'icon-class' => '', ], [ 'key' => 'catalog.attributes', - 'name' => 'Attributes', + 'name' => 'admin::app.layouts.attributes', 'route' => 'admin.catalog.attributes.index', 'sort' => 3, 'icon-class' => '', ], [ 'key' => 'catalog.families', - 'name' => 'Families', + 'name' => 'admin::app.layouts.attribute-families', 'route' => 'admin.catalog.families.index', 'sort' => 4, 'icon-class' => '', ], [ 'key' => 'customers', - 'name' => 'Customers', + 'name' => 'admin::app.layouts.customers', 'route' => 'admin.customer.index', 'sort' => 4, 'icon-class' => 'customer-icon', ], [ 'key' => 'customers.customers', - 'name' => 'Customers', + 'name' => 'admin::app.layouts.customers', 'route' => 'admin.customer.index', 'sort' => 1, 'icon-class' => '', ], [ 'key' => 'customers.groups', - 'name' => 'Groups', + 'name' => 'admin::app.layouts.groups', 'route' => 'admin.groups.index', 'sort' => 2, 'icon-class' => '', ], [ 'key' => 'customers.reviews', - 'name' => 'Reviews', + 'name' => 'admin::app.layouts.reviews', 'route' => 'admin.customer.review.index', 'sort' => 3, 'icon-class' => '', ], [ 'key' => 'customers.subscribers', - 'name' => 'Newsletter Subscription', + 'name' => 'admin::app.layouts.newsletter-subscriptions', 'route' => 'admin.customers.subscribers.index', 'sort' => 4, 'icon-class' => '', ], [ 'key' => 'configuration', - 'name' => 'Configure', + 'name' => 'admin::app.layouts.configure', 'route' => 'admin.configuration.index', 'sort' => 5, 'icon-class' => 'configuration-icon', ], [ 'key' => 'settings', - 'name' => 'Settings', + 'name' => 'admin::app.layouts.settings', 'route' => 'admin.locales.index', 'sort' => 6, 'icon-class' => 'settings-icon', ], [ 'key' => 'settings.locales', - 'name' => 'Locales', + 'name' => 'admin::app.layouts.locales', 'route' => 'admin.locales.index', 'sort' => 1, 'icon-class' => '', ], [ 'key' => 'settings.currencies', - 'name' => 'Currencies', + 'name' => 'admin::app.layouts.currencies', 'route' => 'admin.currencies.index', 'sort' => 2, 'icon-class' => '', ], [ 'key' => 'settings.exchange_rates', - 'name' => 'Exchange Rates', + 'name' => 'admin::app.layouts.exchange-rates', 'route' => 'admin.exchange_rates.index', 'sort' => 3, 'icon-class' => '', ], [ 'key' => 'settings.inventory_sources', - 'name' => 'Inventory Sources', + 'name' => 'admin::app.layouts.inventory-sources', 'route' => 'admin.inventory_sources.index', 'sort' => 4, 'icon-class' => '', ], [ 'key' => 'settings.channels', - 'name' => 'Channels', + 'name' => 'admin::app.layouts.channels', 'route' => 'admin.channels.index', 'sort' => 5, 'icon-class' => '', ], [ 'key' => 'settings.users', - 'name' => 'Users', + 'name' => 'admin::app.layouts.users', 'route' => 'admin.users.index', 'sort' => 6, 'icon-class' => '', ], [ 'key' => 'settings.users.users', - 'name' => 'Users', + 'name' => 'admin::app.layouts.users', 'route' => 'admin.users.index', 'sort' => 1, 'icon-class' => '', ], [ 'key' => 'settings.users.roles', - 'name' => 'Roles', + 'name' => 'admin::app.layouts.roles', 'route' => 'admin.roles.index', 'sort' => 2, 'icon-class' => '', ], [ 'key' => 'settings.sliders', - 'name' => 'Sliders', + 'name' => 'admin::app.layouts.sliders', 'route' => 'admin.sliders.index', 'sort' => 7, 'icon-class' => '', ], [ 'key' => 'settings.taxes', - 'name' => 'Taxes', + 'name' => 'admin::app.layouts.taxes', 'route' => 'admin.tax-categories.index', 'sort' => 8, 'icon-class' => '', ], [ 'key' => 'settings.taxes.tax-categories', - 'name' => 'Tax Categories', + 'name' => 'admin::app.layouts.tax-categories', 'route' => 'admin.tax-categories.index', 'sort' => 1, 'icon-class' => '', ], [ 'key' => 'settings.taxes.tax-rates', - 'name' => 'Tax Rates', + 'name' => 'admin::app.layouts.tax-rates', 'route' => 'admin.tax-rates.index', 'sort' => 2, 'icon-class' => '', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 5322928a0..b15556abb 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -8,6 +8,70 @@ return [ 'true' => 'True', 'false' => 'False' ], + + 'layouts' => [ + 'my-account' => 'My Account', + 'logout' => 'Logout', + 'visit-shop' => 'Visit Shop', + 'dashboard' => 'Dashboard', + 'sales' => 'Sales', + 'orders' => 'Orders', + 'shipments' => 'Shipments', + 'invoices' => 'Invoices', + 'catalog' => 'Catalog', + 'products' => 'Products', + 'categories' => 'Categories', + 'attributes' => 'Attributes', + 'attribute-families' => 'Attribute Families', + 'customers' => 'Customers', + 'groups' => 'Groups', + 'reviews' => 'Reviews', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', + 'configure' => 'Configure', + 'settings' => 'Settings', + 'locales' => 'Locales', + 'currencies' => 'Currencies', + 'exchange-rates' => 'Exchange Rates', + 'inventory-sources' => 'Inventory Sources', + 'channels' => 'Channels', + 'users' => 'Users', + 'roles' => 'Roles', + 'sliders' => 'Sliders', + 'taxes' => 'Taxes', + 'tax-categories' => 'Tax Categories', + 'tax-rates' => 'Tax Rates' + ], + + 'acl' => [ + 'dashboard' => 'Dashboard', + 'sales' => 'Sales', + 'orders' => 'Orders', + 'shipments' => 'Shipments', + 'invoices' => 'Invoices', + 'catalog' => 'Catalog', + 'products' => 'Products', + 'categories' => 'Categories', + 'attributes' => 'Attributes', + 'attribute-families' => 'Attribute Families', + 'customers' => 'Customers', + 'groups' => 'Groups', + 'reviews' => 'Reviews', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', + 'configure' => 'Configure', + 'settings' => 'Settings', + 'locales' => 'Locales', + 'currencies' => 'Currencies', + 'exchange-rates' => 'Exchange Rates', + 'inventory-sources' => 'Inventory Sources', + 'channels' => 'Channels', + 'users' => 'Users', + 'roles' => 'Roles', + 'sliders' => 'Sliders', + 'taxes' => 'Taxes', + 'tax-categories' => 'Tax Categories', + 'tax-rates' => 'Tax Rates' + ], + 'dashboard' => [ 'title' => 'Dashboard', 'from' => 'From', diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php index 90b463e3e..976634df9 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php @@ -6,7 +6,7 @@ @foreach(array_get($menu->items, current($keys) . '.children') as $item)
  • - {{ $item['name'] }} + {{ trans($item['name']) }} @if ($menu->getActive($item)) @@ -18,7 +18,7 @@ @foreach($config->items as $key => $item)
  • - {{ isset($item['name']) ? $item['name'] : '' }} + {{ isset($item['name']) ? trans($item['name']) : '' }} @if ($item['key'] == request()->route('slug')) diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php index 5abedf148..cd38938f8 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php @@ -5,7 +5,7 @@ - {{ $menuItem['name'] }} + {{ trans($menuItem['name']) }}
  • @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php index 46e72c591..53f228c82 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php @@ -31,13 +31,13 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php index 9c8c1c071..1ed6af365 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php @@ -12,7 +12,7 @@
  • - {{ $item['name'] }} + {{ trans($item['name']) }}
  • @@ -32,7 +32,7 @@
  • - {{ $item['name'] }} + {{ trans($item['name']) }}
  • diff --git a/packages/Webkul/Core/src/Tree.php b/packages/Webkul/Core/src/Tree.php index 7e3fd8d8a..f0059fa08 100755 --- a/packages/Webkul/Core/src/Tree.php +++ b/packages/Webkul/Core/src/Tree.php @@ -82,6 +82,7 @@ class Tree { $this->currentKey = $item['key']; } } else if ($type == 'acl') { + $item['name'] = trans($item['name']); $this->roles[$item['route']] = $item['key']; } diff --git a/packages/Webkul/Shop/src/Config/menu.php b/packages/Webkul/Shop/src/Config/menu.php index c453ee5bd..5782e0e4a 100755 --- a/packages/Webkul/Shop/src/Config/menu.php +++ b/packages/Webkul/Shop/src/Config/menu.php @@ -3,32 +3,32 @@ return [ [ 'key' => 'account', - 'name' => 'My Account', + 'name' => 'shop::app.layouts.my-account', 'route' =>'customer.profile.index', 'sort' => 1 ], [ 'key' => 'account.profile', - 'name' => 'Profile', + 'name' => 'shop::app.layouts.profile', 'route' =>'customer.profile.index', 'sort' => 1 ], [ 'key' => 'account.address', - 'name' => 'Address', + 'name' => 'shop::app.layouts.address', 'route' =>'customer.address.index', 'sort' => 2 ], [ 'key' => 'account.reviews', - 'name' => 'Reviews', + 'name' => 'shop::app.layouts.reviews', 'route' =>'customer.reviews.index', 'sort' => 3 ], [ 'key' => 'account.wishlist', - 'name' => 'Wishlist', + 'name' => 'shop::app.layouts.wishlist', 'route' =>'customer.wishlist.index', 'sort' => 4 ], [ 'key' => 'account.orders', - 'name' => 'Orders', + 'name' => 'shop::app.layouts.orders', 'route' =>'customer.orders.index', 'sort' => 5 ] diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index dcf8bc036..96221b69a 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -1,6 +1,15 @@ [ + 'my-account' => 'My Account', + 'profile' => 'Profile', + 'address' => 'Address', + 'reviews' => 'Reviews', + 'wishlist' => 'Wishlist', + 'orders' => 'Orders', + ], + 'common' => [ 'error' => 'Something went wrong, please try again later.' ], diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php index 20887bc22..c0b6c8742 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php @@ -8,7 +8,7 @@ @foreach($menu->items as $menuItem)