perf: 优化国际化语言
This commit is contained in:
@@ -1034,7 +1034,7 @@ class ApproveController extends AbstractController
|
||||
// 更新审批 未读数量
|
||||
if ($type == 'approve_reviewer' && $toUser['userid']) {
|
||||
$params = [
|
||||
'userid' => [$toUser['userid'], User::auth()->userid()],
|
||||
'userid' => [$toUser['userid'], User::userid()],
|
||||
'msg' => [
|
||||
'type' => 'approve',
|
||||
'action' => 'unread',
|
||||
|
||||
@@ -7,6 +7,7 @@ use Request;
|
||||
use Redirect;
|
||||
use Carbon\Carbon;
|
||||
use App\Tasks\PushTask;
|
||||
use App\Module\Doo;
|
||||
use App\Models\File;
|
||||
use App\Models\User;
|
||||
use App\Module\Base;
|
||||
@@ -1556,18 +1557,7 @@ class DialogController extends AbstractController
|
||||
//
|
||||
$msg_id = intval(Request::input("msg_id"));
|
||||
$language = Base::inputOrHeader('language');
|
||||
$targetLanguage = match ($language) {
|
||||
"zh" => "简体中文",
|
||||
"zh-CHT" => "繁体中文",
|
||||
"en" => "英语",
|
||||
"ko" => "韩语",
|
||||
"ja" => "日语",
|
||||
"de" => "德语",
|
||||
"fr" => "法语",
|
||||
"id" => "印度尼西亚语",
|
||||
"ru" => "俄语",
|
||||
default => '',
|
||||
};
|
||||
$targetLanguage = Doo::getLanguages($language);
|
||||
//
|
||||
if (empty($targetLanguage)) {
|
||||
return Base::retError("参数错误");
|
||||
|
||||
@@ -331,8 +331,7 @@ class UsersController extends AbstractController
|
||||
$data = $user->toArray();
|
||||
$data['nickname_original'] = $user->getRawOriginal('nickname');
|
||||
$data['department_name'] = $user->getDepartmentName();
|
||||
// 适用默认部门下第1级负责人才能添加部门OKR
|
||||
$data['department_owner'] = UserDepartment::where('parent_id',0)->where('owner_userid', $user->userid())->exists();
|
||||
$data['department_owner'] = UserDepartment::where('parent_id',0)->where('owner_userid', $user->userid)->exists(); // 适用默认部门下第1级负责人才能添加部门OKR
|
||||
return Base::retSuccess('success', $data);
|
||||
}
|
||||
|
||||
@@ -348,6 +347,7 @@ class UsersController extends AbstractController
|
||||
* @apiParam {String} [tel] 电话
|
||||
* @apiParam {String} [nickname] 昵称
|
||||
* @apiParam {String} [profession] 职位/职称
|
||||
* @apiParam {String} [lang] 语言(比如:zh/en)
|
||||
*
|
||||
* @apiSuccess {Number} ret 返回状态码(1正确、0错误)
|
||||
* @apiSuccess {String} msg 返回信息(错误描述)
|
||||
@@ -410,6 +410,15 @@ class UsersController extends AbstractController
|
||||
$upLdap['employeeType'] = $profession;
|
||||
}
|
||||
}
|
||||
// 语言
|
||||
if (Arr::exists($data, 'lang')) {
|
||||
$lang = trim(Request::input('lang'));
|
||||
if (!Doo::checkLanguage($lang)) {
|
||||
return Base::retError('语言错误');
|
||||
} else {
|
||||
$user->lang = $lang;
|
||||
}
|
||||
}
|
||||
//
|
||||
$user->save();
|
||||
User::generateToken($user);
|
||||
|
||||
Reference in New Issue
Block a user