diff --git a/beike/Admin/Repositories/PermissionRepo.php b/beike/Admin/Repositories/PermissionRepo.php index 4ac4404d..2287a9a5 100644 --- a/beike/Admin/Repositories/PermissionRepo.php +++ b/beike/Admin/Repositories/PermissionRepo.php @@ -102,10 +102,8 @@ class PermissionRepo */ private function getSettingPermissions(): array { - $items = [ - ['code' => 'settings_index', 'name' => trans('setting.settings_index'), 'selected' => $this->hasPermission('settings_index')], - ['code' => 'design_index', 'name' => trans('setting.design_index'), 'selected' => $this->hasPermission('design_index')], - ]; + $routes = ['settings_index', 'design_index']; + $items = $this->getPermissionList('setting', $routes); return hook_filter('role.setting_permissions', $items); } @@ -199,7 +197,7 @@ class PermissionRepo { $items = []; foreach ($routes as $route) { - $items[] = ['code' => $route, 'name' => trans("{$module}.{$route}"), 'selected' => $this->hasPermission($route)]; + $items[] = ['code' => $route, 'name' => trans("admin/{$module}.{$route}"), 'selected' => $this->hasPermission($route)]; } return $items; } diff --git a/resources/beike/admin/views/pages/home.blade.php b/resources/beike/admin/views/pages/home.blade.php index e26117ec..dfffacb5 100644 --- a/resources/beike/admin/views/pages/home.blade.php +++ b/resources/beike/admin/views/pages/home.blade.php @@ -192,4 +192,4 @@ } }); -@endpush \ No newline at end of file +@endpush diff --git a/resources/lang/en/currency.php b/resources/lang/en/admin/currency.php similarity index 100% rename from resources/lang/en/currency.php rename to resources/lang/en/admin/currency.php diff --git a/resources/lang/en/customer.php b/resources/lang/en/admin/customer.php similarity index 100% rename from resources/lang/en/customer.php rename to resources/lang/en/admin/customer.php diff --git a/resources/lang/en/order.php b/resources/lang/en/admin/order.php similarity index 100% rename from resources/lang/en/order.php rename to resources/lang/en/admin/order.php diff --git a/resources/lang/en/plugin.php b/resources/lang/en/admin/plugin.php similarity index 100% rename from resources/lang/en/plugin.php rename to resources/lang/en/admin/plugin.php diff --git a/resources/lang/en/product.php b/resources/lang/en/admin/product.php similarity index 100% rename from resources/lang/en/product.php rename to resources/lang/en/admin/product.php diff --git a/resources/lang/en/region.php b/resources/lang/en/admin/region.php similarity index 100% rename from resources/lang/en/region.php rename to resources/lang/en/admin/region.php diff --git a/resources/lang/en/setting.php b/resources/lang/en/admin/setting.php similarity index 100% rename from resources/lang/en/setting.php rename to resources/lang/en/admin/setting.php diff --git a/resources/lang/en/tax_class.php b/resources/lang/en/admin/tax_class.php similarity index 100% rename from resources/lang/en/tax_class.php rename to resources/lang/en/admin/tax_class.php diff --git a/resources/lang/en/tax_rate.php b/resources/lang/en/admin/tax_rate.php similarity index 100% rename from resources/lang/en/tax_rate.php rename to resources/lang/en/admin/tax_rate.php diff --git a/resources/lang/en/admin/user.php b/resources/lang/en/admin/user.php new file mode 100644 index 00000000..de00c107 --- /dev/null +++ b/resources/lang/en/admin/user.php @@ -0,0 +1,18 @@ + + * @created 2022-08-02 19:03:19 + * @modified 2022-08-02 19:03:19 + */ + +return [ + 'admin_users_index' => 'Index', + 'admin_users_create' => 'Create', + 'admin_users_edit' => 'Detail', + 'admin_users_update' => 'Edit', + 'admin_users_delete' => 'Delete' +]; diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php new file mode 100644 index 00000000..f749b251 --- /dev/null +++ b/resources/lang/en/shop/account.php @@ -0,0 +1,15 @@ + + * @created 2022-08-04 10:59:15 + * @modified 2022-08-04 10:59:15 + */ + +return [ + 'login' => 'Login', + 'new_account' => 'New Account', +]; diff --git a/resources/lang/zh_cn/currency.php b/resources/lang/en/shop/currency.php similarity index 99% rename from resources/lang/zh_cn/currency.php rename to resources/lang/en/shop/currency.php index 7e31abd4..8da2da48 100644 --- a/resources/lang/zh_cn/currency.php +++ b/resources/lang/en/shop/currency.php @@ -11,5 +11,4 @@ return [ 'decimal_point' => '.', 'thousand_point' => ',', - ]; diff --git a/resources/lang/zh_cn/admin/admin_roles.php b/resources/lang/zh_cn/admin/admin_roles.php index 3412a8d3..be109741 100644 --- a/resources/lang/zh_cn/admin/admin_roles.php +++ b/resources/lang/zh_cn/admin/admin_roles.php @@ -10,6 +10,6 @@ */ return [ - 'select_all' => '选中所有', - 'unselect_all' => '取消选中', + 'select_all' => 'Select All', + 'unselect_all' => 'Unselect All', ]; diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php index 3c38c7ff..625694dd 100644 --- a/resources/lang/zh_cn/admin/common.php +++ b/resources/lang/zh_cn/admin/common.php @@ -10,5 +10,5 @@ */ return [ - 'edit' => '编辑', + 'edit' => 'Edit', ]; diff --git a/resources/lang/zh_cn/admin/currency.php b/resources/lang/zh_cn/admin/currency.php new file mode 100644 index 00000000..1885633e --- /dev/null +++ b/resources/lang/zh_cn/admin/currency.php @@ -0,0 +1,19 @@ + + * @created 2022-07-28 17:21:38 + * @modified 2022-07-28 17:21:38 + */ +return [ + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => 'Index', + 'currencies_create' => 'Create', + 'currencies_edit' => 'Detail', + 'currencies_update' => 'Edit', + 'currencies_delete' => 'Delete' +]; diff --git a/resources/lang/zh_cn/admin/customer.php b/resources/lang/zh_cn/admin/customer.php new file mode 100644 index 00000000..e2785851 --- /dev/null +++ b/resources/lang/zh_cn/admin/customer.php @@ -0,0 +1,18 @@ + + * @created 2022-08-02 14:22:41 + * @modified 2022-08-02 14:22:41 + */ + +return [ + 'customers_index' => 'Index', + 'customers_create' => 'Create', + 'customers_edit' => 'Detail', + 'customers_update' => 'Edit', + 'customers_delete' => 'Delete' +]; diff --git a/resources/lang/zh_cn/admin/header.php b/resources/lang/zh_cn/admin/header.php index 80cc8922..0cfb0ab1 100644 --- a/resources/lang/zh_cn/admin/header.php +++ b/resources/lang/zh_cn/admin/header.php @@ -10,9 +10,9 @@ */ return [ - 'home' => '管理首页', - 'order' => '订单管理', - 'product' => '商品管理', - 'customer' => '会员管理', - 'setting' => '系统设置', + 'home' => 'Home', + 'order' => 'Orders', + 'product' => 'Products', + 'customer' => 'Customers', + 'setting' => 'Settings', ]; diff --git a/resources/lang/zh_cn/order.php b/resources/lang/zh_cn/admin/order.php similarity index 57% rename from resources/lang/zh_cn/order.php rename to resources/lang/zh_cn/admin/order.php index c46708a5..8401e88b 100644 --- a/resources/lang/zh_cn/order.php +++ b/resources/lang/zh_cn/admin/order.php @@ -10,9 +10,9 @@ */ return [ - 'orders_index' => '订单列表', - 'orders_create' => '创建订单', - 'orders_edit' => '订单详情', - 'orders_update' => '更新订单', - 'orders_delete' => '删除订单', + 'orders_index' => 'Index', + 'orders_create' => 'Create', + 'orders_edit' => 'Detail', + 'orders_update' => 'Update', + 'orders_delete' => 'Delete', ]; diff --git a/resources/lang/zh_cn/admin/plugin.php b/resources/lang/zh_cn/admin/plugin.php new file mode 100644 index 00000000..17b53612 --- /dev/null +++ b/resources/lang/zh_cn/admin/plugin.php @@ -0,0 +1,20 @@ + + * @created 2022-08-02 14:22:41 + * @modified 2022-08-02 14:22:41 + */ + +return [ + 'plugins_index' => 'Index', + 'plugins_import' => 'Import', + 'plugins_edit' => 'Detail', + 'plugins_update' => 'Update', + 'plugins_update_status' => 'Delete', + 'plugins_install' => 'Install', + 'plugins_uninstall' => 'Uninstall', +]; diff --git a/resources/lang/zh_cn/product.php b/resources/lang/zh_cn/admin/product.php similarity index 56% rename from resources/lang/zh_cn/product.php rename to resources/lang/zh_cn/admin/product.php index fc665874..4c42c71e 100644 --- a/resources/lang/zh_cn/product.php +++ b/resources/lang/zh_cn/admin/product.php @@ -10,9 +10,9 @@ */ return [ - 'products_index' => '产品列表', - 'products_create' => '创建产品', - 'products_edit' => '产品详情', - 'products_update' => '更新产品', - 'products_delete' => '删除产品', + 'products_index' => 'Index', + 'products_create' => 'Create', + 'products_edit' => 'Detail', + 'products_update' => 'Edit', + 'products_delete' => 'Delete' ]; diff --git a/resources/lang/zh_cn/admin/region.php b/resources/lang/zh_cn/admin/region.php new file mode 100644 index 00000000..d84c52c5 --- /dev/null +++ b/resources/lang/zh_cn/admin/region.php @@ -0,0 +1,18 @@ + + * @created 2022-08-02 14:22:41 + * @modified 2022-08-02 14:22:41 + */ + +return [ + 'regions_index' => 'Index', + 'regions_create' => 'Create', + 'regions_edit' => 'Detail', + 'regions_update' => 'Edit', + 'regions_delete' => 'Delete' +]; diff --git a/resources/lang/zh_cn/admin/setting.php b/resources/lang/zh_cn/admin/setting.php new file mode 100644 index 00000000..80129e55 --- /dev/null +++ b/resources/lang/zh_cn/admin/setting.php @@ -0,0 +1,15 @@ + + * @created 2022-08-02 14:22:41 + * @modified 2022-08-02 14:22:41 + */ + +return [ + 'settings_index' => 'Setting', + 'design_index' => 'Design Builder', +]; diff --git a/resources/lang/zh_cn/admin/tax_class.php b/resources/lang/zh_cn/admin/tax_class.php new file mode 100644 index 00000000..467efdcb --- /dev/null +++ b/resources/lang/zh_cn/admin/tax_class.php @@ -0,0 +1,18 @@ + + * @created 2022-08-02 14:22:41 + * @modified 2022-08-02 14:22:41 + */ + +return [ + 'tax_classes_index' => 'Index', + 'tax_classes_create' => 'Create', + 'tax_classes_edit' => 'Detail', + 'tax_classes_update' => 'Edit', + 'tax_classes_delete' => 'Delete' +]; diff --git a/resources/lang/zh_cn/admin/tax_rate.php b/resources/lang/zh_cn/admin/tax_rate.php new file mode 100644 index 00000000..d379cbdb --- /dev/null +++ b/resources/lang/zh_cn/admin/tax_rate.php @@ -0,0 +1,18 @@ + + * @created 2022-08-02 14:22:41 + * @modified 2022-08-02 14:22:41 + */ + +return [ + 'tax_rates_index' => 'Index', + 'tax_rates_create' => 'Create', + 'tax_rates_edit' => 'Detail', + 'tax_rates_update' => 'Edit', + 'tax_rates_delete' => 'Delete' +]; diff --git a/resources/lang/zh_cn/admin/user.php b/resources/lang/zh_cn/admin/user.php new file mode 100644 index 00000000..de00c107 --- /dev/null +++ b/resources/lang/zh_cn/admin/user.php @@ -0,0 +1,18 @@ + + * @created 2022-08-02 19:03:19 + * @modified 2022-08-02 19:03:19 + */ + +return [ + 'admin_users_index' => 'Index', + 'admin_users_create' => 'Create', + 'admin_users_edit' => 'Detail', + 'admin_users_update' => 'Edit', + 'admin_users_delete' => 'Delete' +]; diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php new file mode 100644 index 00000000..f749b251 --- /dev/null +++ b/resources/lang/zh_cn/shop/account.php @@ -0,0 +1,15 @@ + + * @created 2022-08-04 10:59:15 + * @modified 2022-08-04 10:59:15 + */ + +return [ + 'login' => 'Login', + 'new_account' => 'New Account', +]; diff --git a/resources/lang/zh_cn/shop/currency.php b/resources/lang/zh_cn/shop/currency.php new file mode 100644 index 00000000..8da2da48 --- /dev/null +++ b/resources/lang/zh_cn/shop/currency.php @@ -0,0 +1,14 @@ + + * @created 2022-07-28 17:21:38 + * @modified 2022-07-28 17:21:38 + */ +return [ + 'decimal_point' => '.', + 'thousand_point' => ',', +];