后台控制器中语言提取到语言包

2022-08-16 18:36:54 +08:00 · 2022-08-16 18:36:54 +08:00 · 0405a9a855
parent 2790fe648f
commit 0405a9a855
26 changed files with 90 additions and 68 deletions
--- a/beike/Admin/Http/Controllers/AddressController.php
+++ b/beike/Admin/Http/Controllers/AddressController.php
@ -31,20 +31,20 @@ class AddressController extends Controller
    public function store(Request $request, int $customerId)
    {
        $address = AddressService::addForCustomer($customerId, $request->all());
-        return json_success("地址创建成功", $address);
+        return json_success(trans('common.created_success'), $address);
    }

    public function update(Request $request, int $customerId, int $addressId)
    {
        $address = AddressService::update($addressId, $request->all());

-        return json_success("地址成功修改", $address);
+        return json_success(trans('common.updated_success'), $address);
    }

    public function destroy(Request $request, int $customerId, int $addressId)
    {
        AddressRepo::delete($addressId);

-        return json_success("已成功删除");
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/AdminRoleController.php
+++ b/beike/Admin/Http/Controllers/AdminRoleController.php
@ -60,18 +60,18 @@ class AdminRoleController extends Controller
    public function store(AdminRoleRequest $request): array
    {
        $adminUser = AdminRoleRepo::createAdminRole($request->toArray());
-        return json_success('保存成功', $adminUser);
+        return json_success(trans('common.created_success'), $adminUser);
    }

    public function update(Request $request, int $adminUserId)
    {
        $adminUser = AdminRoleRepo::updateAdminRole($request->toArray());
-        return json_success('更新成功', $adminUser);
+        return json_success(trans('common.updated_success'), $adminUser);
    }

    public function destroy(Request $request, int $adminUserId)
    {
        AdminRoleRepo::deleteAdminRole($adminUserId);
-        return json_success('删除成功');
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/AdminUserController.php
+++ b/beike/Admin/Http/Controllers/AdminUserController.php
@ -42,7 +42,7 @@ class AdminUserController extends Controller
    public function store(AdminUserRequest $request)
    {
        $adminUser = AdminUserRepo::createAdminUser($request->toArray());
-        return json_success('保存成功', $adminUser);
+        return json_success(trans('common.created_success'), $adminUser);
    }


@ -56,13 +56,13 @@ class AdminUserController extends Controller
    public function update(AdminUserRequest $request, int $adminUserId)
    {
        $adminUser = AdminUserRepo::updateAdminUser($adminUserId, $request->toArray());
-        return json_success('更新成功', $adminUser);
+        return json_success(trans('common.updated_success'), $adminUser);
    }


    public function destroy(Request $request, int $adminUserId)
    {
        AdminUserRepo::deleteAdminUser($adminUserId);
-        return json_success('删除成功');
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/BrandController.php
+++ b/beike/Admin/Http/Controllers/BrandController.php
@ -38,7 +38,7 @@ class BrandController extends Controller
        ];

        if ($request->expectsJson()) {
-            return json_success('成功', $data);
+            return json_success(trans('common.success'), $data);
        }

        return view('admin::pages.brands.index', $data);
@ -54,7 +54,7 @@ class BrandController extends Controller
    public function store(Request $request): array
    {
        $brand = BrandRepo::create($request->all());
-        return json_success("创建成功", $brand);
+        return json_success(trans('common.created_success'), $brand);
    }

    /**
@ -64,21 +64,21 @@ class BrandController extends Controller
    {
        $brand = BrandRepo::update($id, $request->all());

-        return json_success("成功修改", $brand);
+        return json_success(trans('common.updated_success'), $brand);
    }

    public function destroy(int $addressId): array
    {
        BrandRepo::delete($addressId);

-        return json_success("已成功删除");
+        return json_success(trans('common.deleted_success'));
    }

    public function autocomplete(Request $request): array
    {
        $brands = BrandRepo::autocomplete($request->get('name') ?? '', 0);

-        return json_success('获取成功！', $brands);
+        return json_success(trans('common.get_success'), $brands);
    }


@ -86,7 +86,7 @@ class BrandController extends Controller
    {
        $name = BrandRepo::getName($id);

-        return json_success('获取成功', $name);
+        return json_success(trans('common.get_success'), $name);
    }


@ -101,6 +101,6 @@ class BrandController extends Controller
        $ids = explode(',', $request->get('ids'));
        $name = BrandRepo::getNames($ids);

-        return json_success('获取成功', $name);
+        return json_success(trans('common.get_success'), $name);
    }
 }
--- a/beike/Admin/Http/Controllers/CategoryController.php
+++ b/beike/Admin/Http/Controllers/CategoryController.php
@ -57,7 +57,7 @@ class CategoryController extends Controller
    public function destroy(Request $request, Category $category): array
    {
        CategoryRepo::delete($category);
-        return json_success('删除成功');
+        return json_success(trans('common.deleted_success'));
    }


@ -65,7 +65,7 @@ class CategoryController extends Controller
    {
        $name = CategoryRepo::getName($id);

-        return json_success('获取成功', $name);
+        return json_success(trans('common.get_success'), $name);
    }

    protected function form(Request $request, Category $category = null)
@ -94,6 +94,6 @@ class CategoryController extends Controller
    {
        $categories = CategoryRepo::autocomplete($request->get('name') ?? '');

-        return json_success('获取成功！', $categories);
+        return json_success(trans('common.get_success'), $categories);
    }
 }
--- a/beike/Admin/Http/Controllers/CurrencyController.php
+++ b/beike/Admin/Http/Controllers/CurrencyController.php
@ -43,7 +43,7 @@ class CurrencyController extends Controller
        ];
        $currency = CurrencyRepo::create($data);

-        return json_success('货币创建成功！', $currency);
+        return json_success(trans('common.created_success'), $currency);
    }

    public function update(CurrencyRequest $request, int $id)
@ -59,13 +59,13 @@ class CurrencyController extends Controller
        ];
        $currency = CurrencyRepo::update($id, $data);

-        return json_success('货币更新成功！', $currency);
+        return json_success(trans('common.updated_success'), $currency);
    }

    public function destroy(Request $request, int $currencyId)
    {
        CurrencyRepo::delete($currencyId);

-        return json_success('删除成功！');
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/CustomerController.php
+++ b/beike/Admin/Http/Controllers/CustomerController.php
@ -36,7 +36,7 @@ class CustomerController extends Controller
        ];

        if ($request->expectsJson()) {
-            return json_success('成功', $data);
+            return json_success(trans('success'), $data);
        }

        return view('admin::pages.customers.index', $data);
@ -47,7 +47,7 @@ class CustomerController extends Controller
        $data = $request->only(['email', 'name', 'password', 'status', 'customer_group_id']);
        $customer = CustomerService::create($data);

-        return json_success('创建成功！', new CustomerResource($customer));
+        return json_success(trans('common.success'), new CustomerResource($customer));
    }

    public function edit(Request $request, int $customerId)
@ -74,20 +74,20 @@ class CustomerController extends Controller
        }
        $customer = CustomerRepo::update($customerId, $data);

-        return json_success('创建成功！', $customer);
+        return json_success(trans('common.updated_success'), $customer);
    }

    public function destroy(Request $request, int $customerId)
    {
        CustomerRepo::delete($customerId);

-        return json_success('删除成功！');
+        return json_success(trans('common.deleted_success'));
    }

    public function restore(Request $request, int $customerId)
    {
        CustomerRepo::restore($customerId);

-        return json_success('恢复成功！');
+        return json_success(trans('common.restored_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/CustomerGroupController.php
+++ b/beike/Admin/Http/Controllers/CustomerGroupController.php
@ -38,7 +38,7 @@ class CustomerGroupController extends Controller
        $customerGroup = CustomerGroupService::create($request->all());
        $customerGroup->load('descriptions', 'description');

-        return json_success('创建成功！', $customerGroup);
+        return json_success(trans('common.created_success'), $customerGroup);
    }

    public function update(CustomerGroupRequest $request, int $id)
@ -46,13 +46,13 @@ class CustomerGroupController extends Controller
        $customerGroup = CustomerGroupService::update($id, $request->all());
        $customerGroup->load('descriptions', 'description');

-        return json_success('更新成功！', $customerGroup);
+        return json_success(trans('common.updated_success'), $customerGroup);
    }

    public function destroy(Request $request, int $id)
    {
        CustomerGroupRepo::delete($id);

-        return json_success('删除成功');
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/DesignController.php
+++ b/beike/Admin/Http/Controllers/DesignController.php
@ -71,6 +71,6 @@ class DesignController extends Controller
            'json' => 1
        ];
        SettingRepo::createOrUpdate($data);
-        return json_success("保存成功");
+        return json_success(trans('common.updated_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/DesignFooterController.php
+++ b/beike/Admin/Http/Controllers/DesignFooterController.php
@ -63,6 +63,6 @@ class DesignFooterController extends Controller
            'json' => 1
        ];
        SettingRepo::createOrUpdate($data);
-        return json_success("保存成功");
+        return json_success(trans('common.updated_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/DesignMenuController.php
+++ b/beike/Admin/Http/Controllers/DesignMenuController.php
@ -42,6 +42,6 @@ class DesignMenuController extends Controller
            'json' => 1
        ];
        SettingRepo::createOrUpdate($data);
-        return json_success("保存成功");
+        return json_success(trans('common.updated_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/FileManagerController.php
+++ b/beike/Admin/Http/Controllers/FileManagerController.php
@ -57,7 +57,7 @@ class FileManagerController extends Controller
    {
        $folderName = $request->get('name');
        (new FileManagerService)->createDirectory($folderName);
-        return json_success('创建成功');
+        return json_success(trans('common.created_success'));
    }


@ -71,7 +71,7 @@ class FileManagerController extends Controller
        $originPath = $request->get('origin_name');
        $newPath = $request->get('new_name');
        (new FileManagerService)->updateName($originPath, $newPath);
-        return json_success('修改成功');
+        return json_success(trans('common.updated_success'));
    }


@ -86,7 +86,7 @@ class FileManagerController extends Controller
        $basePath = $requestData['path'] ?? '';
        $files = $requestData['files'] ?? [];
        (new FileManagerService)->deleteFiles($basePath, $files);
-        return json_success('删除成功');
+        return json_success(trans('common.deleted_success'));
    }


@ -101,7 +101,7 @@ class FileManagerController extends Controller
    {
        $folderName = $request->get('name');
        (new FileManagerService)->deleteDirectoryOrFile($folderName);
-        return json_success('文件夹删除成功');
+        return json_success(trans('common.deleted_success'));
    }


--- a/beike/Admin/Http/Controllers/ForgottenController.php
+++ b/beike/Admin/Http/Controllers/ForgottenController.php
@ -46,6 +46,6 @@ class ForgottenController
    {
        UserService::verifyAndChangePassword($request->get('code'), $request->get('email'), $request->get('password'));

-        return json_success('密码已修改');
+        return json_success(trans('common.updated_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/LanguageController.php
+++ b/beike/Admin/Http/Controllers/LanguageController.php
@ -35,7 +35,7 @@ class LanguageController extends Controller
    {
        $language = LanguageRepo::create($request->only('name', 'code', 'locale', 'image', 'sort_order', 'status'));

-        return json_success('创建成功', $language);
+        return json_success(trans('common.created_success'), $language);
    }

    /**
@ -48,13 +48,13 @@ class LanguageController extends Controller
    {
        $language = LanguageRepo::update($id, $request->only('name', 'code', 'locale', 'image', 'sort_order', 'status'));

-        return json_success('更新成功！', $language);
+        return json_success(trans('common.updated_success'), $language);
    }

    public function destroy(int $currencyId): array
    {
        LanguageRepo::delete($currencyId);

-        return json_success('删除成功！');
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/OrderController.php
+++ b/beike/Admin/Http/Controllers/OrderController.php
@ -69,6 +69,6 @@ class OrderController extends Controller
        $notify = $request->get('notify');
        $stateMachine = new StateMachineService($order);
        $stateMachine->changeStatus($status, $comment, $notify);
-        return json_success('更新成功');
+        return json_success(trans('common.updated_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/PagesController.php
+++ b/beike/Admin/Http/Controllers/PagesController.php
@ -114,7 +114,7 @@ class PagesController
    public function autocomplete(Request $request): array
    {
        $products = PageRepo::autocomplete($request->get('name') ?? '');
-        return json_success('获取成功！', $products);
+        return json_success(trans('common.get_success'), $products);
    }


@ -126,6 +126,6 @@ class PagesController
    public function name(Page $page): array
    {
        $name = $page->description->title ?? '';
-        return json_success('获取成功', $name);
+        return json_success(trans('common.get_success'), $name);
    }
 }
--- a/beike/Admin/Http/Controllers/PluginController.php
+++ b/beike/Admin/Http/Controllers/PluginController.php
@ -39,7 +39,7 @@ class PluginController extends Controller
    {
        $zipFile = $request->file('file');
        app('plugin')->import($zipFile);
-        return json_success("导入成功");
+        return json_success(trans('common.success'));
    }


@ -53,7 +53,7 @@ class PluginController extends Controller
    {
        $plugin = app('plugin')->getPluginOrFail($code);
        PluginRepo::installPlugin($plugin);
-        return json_success("安装成功");
+        return json_success(trans('common.success'));
    }


@ -67,7 +67,7 @@ class PluginController extends Controller
    {
        $plugin = app('plugin')->getPluginOrFail($code);
        PluginRepo::uninstallPlugin($plugin);
-        return json_success("卸载成功");
+        return json_success(trans('common.success'));
    }


@ -103,7 +103,7 @@ class PluginController extends Controller
        }

        SettingRepo::update('plugin', $code, $fields);
-        return redirect($this->getRedirect())->with('success', '修改成功');
+        return redirect($this->getRedirect())->with('success', trans('common.updated_success'));
    }


@ -118,6 +118,6 @@ class PluginController extends Controller
        app('plugin')->getPluginOrFail($code);
        $status = $request->get('status');
        SettingRepo::update('plugin', $code, ['status' => $status]);
-        return json_success("编辑成功");
+        return json_success(trans('common.updated_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/ProductController.php
+++ b/beike/Admin/Http/Controllers/ProductController.php
@ -125,7 +125,7 @@ class ProductController extends Controller
    {
        $name = ProductRepo::getName($id);

-        return json_success('获取成功', $name);
+        return json_success(trans('common.get_success'), $name);
    }


@ -140,7 +140,7 @@ class ProductController extends Controller
        $productIds = explode(',', $request->get('product_ids'));
        $name = ProductRepo::getNames($productIds);

-        return json_success('获取成功', $name);
+        return json_success(trans('common.get_success'), $name);
    }


@ -148,6 +148,6 @@ class ProductController extends Controller
    {
        $products = ProductRepo::autocomplete($request->get('name') ?? '');

-        return json_success('获取成功！', $products);
+        return json_success(trans('common.get_success'), $products);
    }
 }
--- a/beike/Admin/Http/Controllers/RegionController.php
+++ b/beike/Admin/Http/Controllers/RegionController.php
@ -32,7 +32,7 @@ class RegionController
    {
        $requestData = json_decode($request->getContent(), true);
        $region = RegionRepo::createOrUpdate($requestData);
-        return json_success('保存成功', $region);
+        return json_success(trans('common.created_success'), $region);
    }

    public function update(Request $request, int $regionId)
@ -40,12 +40,12 @@ class RegionController
        $requestData = json_decode($request->getContent(), true);
        $requestData['id'] = $regionId;
        $region = RegionRepo::createOrUpdate($requestData);
-        return json_success('更新成功', $region);
+        return json_success(trans('common.updated_success'), $region);
    }

    public function destroy(Request $request, int $regionId)
    {
        RegionRepo::deleteById($regionId);
-        return json_success('删除成功');
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/RmaController.php
+++ b/beike/Admin/Http/Controllers/RmaController.php
@ -51,13 +51,13 @@ class RmaController extends Controller
            'rma' => RmaRepo::find($id),
            'statuses' => RmaRepo::getStatuses(),
        ];
-       return json_success('更新成功', $data);
+       return json_success(trans('common.updated_success'), $data);
    }

    public function destroy(int $id): array
    {
        RmaRepo::delete($id);

-        return json_success("已成功删除");
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/RmaReasonController.php
+++ b/beike/Admin/Http/Controllers/RmaReasonController.php
@ -30,7 +30,7 @@ class RmaReasonController extends Controller
    public function store(Request $request): array
    {
        $rmaReason = RmaReasonRepo::create($request->only('name'));
-        return json_success("创建成功", $rmaReason);
+        return json_success(trans('common.created_success'), $rmaReason);
    }

    /**
@ -40,13 +40,13 @@ class RmaReasonController extends Controller
    {
        $rmaReason = RmaReasonRepo::update($id, $request->only('name'));

-        return json_success("成功修改", $rmaReason);
+        return json_success(trans('common.updated_success'), $rmaReason);
    }

    public function destroy(int $id): array
    {
        RmaReasonRepo::delete($id);

-        return json_success("已成功删除");
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/SettingController.php
+++ b/beike/Admin/Http/Controllers/SettingController.php
@ -69,6 +69,6 @@ class SettingController extends Controller
        $oldAdminName = admin_name();
        $newAdminName = $settings['admin_name'] ?: 'admin';
        $settingUrl = str_replace($oldAdminName, $newAdminName, admin_route('settings.index'));
-        return redirect($settingUrl)->with('success', '修改成功');
+        return redirect($settingUrl)->with('success', trans('common.updated_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/TaxClassController.php
+++ b/beike/Admin/Http/Controllers/TaxClassController.php
@ -32,7 +32,7 @@ class TaxClassController extends Controller
    {
        $requestData = json_decode($request->getContent(), true);
        $taxClass = TaxClassRepo::createOrUpdate($requestData);
-        return json_success('保存成功', $taxClass);
+        return json_success(trans('common.created_success'), $taxClass);
    }

    public function update(Request $request, int $taxClassId)
@ -40,12 +40,12 @@ class TaxClassController extends Controller
        $requestData = json_decode($request->getContent(), true);
        $requestData['id'] = $taxClassId;
        $taxClass = TaxClassRepo::createOrUpdate($requestData);
-        return json_success('更新成功', $taxClass);
+        return json_success(trans('common.updated_success'), $taxClass);
    }

    public function destroy(Request $request, int $taxClassId)
    {
        TaxClassRepo::deleteById($taxClassId);
-        return json_success('删除成功');
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/TaxRateController.php
+++ b/beike/Admin/Http/Controllers/TaxRateController.php
@ -32,7 +32,7 @@ class TaxRateController
        $requestData = json_decode($request->getContent(), true);
        $taxRate = TaxRateRepo::createOrUpdate($requestData);
        $taxRate->load('region');
-        return json_success('保存成功', $taxRate);
+        return json_success(trans('common.created_success'), $taxRate);
    }

    public function update(Request $request, int $taxRateId)
@ -41,12 +41,12 @@ class TaxRateController
        $requestData['id'] = $taxRateId;
        $taxRate = TaxRateRepo::createOrUpdate($requestData);
        $taxRate->load('region');
-        return json_success('更新成功', $taxRate);
+        return json_success(trans('common.updated_success'), $taxRate);
    }

    public function destroy(Request $request, int $taxRateId)
    {
        TaxRateRepo::deleteById($taxRateId);
-        return json_success('删除成功');
+        return json_success(trans('common.deleted_success'));
    }
 }
--- a/beike/Admin/Http/Controllers/ZoneController.php
+++ b/beike/Admin/Http/Controllers/ZoneController.php
@ -29,6 +29,6 @@ class ZoneController extends Controller
            'zones' => ZoneRepo::listByCountry($countryId),
        ];

-        return json_success('成功!', $data);
+        return json_success(trans('common.success'), $data);
    }
 }
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@ -0,0 +1,22 @@
+<?php
+/**
+ * common.php
+ *
+ * @copyright  2022 opencart.cn - All Rights Reserved
+ * @link       http://www.guangdawangluo.com
+ * @author     TL <mengwb@opencart.cn>
+ * @created    2022-08-16 18:16:09
+ * @modified   2022-08-16 18:16:09
+ */
+
+return [
+    // action
+    'success' => 'Success',
+    'created_success' => 'Created Successfully!',
+    'deleted_success' => 'Deleted Successfully!',
+    'restored_success' => 'Restore Successfully!',
+    'updated_success' => 'Updated Successfully!',
+    'created_success' => 'Created Successfully!',
+    'get_success' => 'Get Successfully!',
+
+];