From 02654c8327d7c70f6f06a8a82537291f8545bbb4 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Wed, 6 Nov 2024 20:26:43 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/UserBot.php | 7 ++-- language/original-api.txt | 5 +++ language/translate.json | 38 ++++++++++++++++++- .../js/pages/manage/approve/details.vue | 6 ++- .../DialogView/template/approve-notifier.vue | 4 +- .../DialogView/template/approve-reviewer.vue | 4 +- .../DialogView/template/approve-submitter.vue | 4 +- 7 files changed, 56 insertions(+), 12 deletions(-) diff --git a/app/Models/UserBot.php b/app/Models/UserBot.php index 7f5d264d4..f617a24b4 100644 --- a/app/Models/UserBot.php +++ b/app/Models/UserBot.php @@ -260,14 +260,15 @@ class UserBot extends AbstractModel } // if ($checkins && $botUser = User::botGetOrCreate('check-in')) { - $getJokeSoup = function($type) { + $getJokeSoup = function($type, $userid) { $pre = $type == "up" ? "每日开心：" : "心灵鸡汤："; $key = $type == "up" ? "jokes" : "soups"; $array = Base::json2array(Cache::get(JokeSoupTask::keyName($key))); if ($array) { $item = $array[array_rand($array)]; if ($item) { - return $pre . $item; + Doo::setLanguage($userid); + return Doo::translate($pre . $item); } } return null; @@ -291,7 +292,7 @@ class UserBot extends AbstractModel if ($dialog = WebSocketDialog::checkUserDialog($botUser, $checkin['userid'])) { $hi = date("H:i"); $remark = $checkin['remark'] ? " ({$checkin['remark']})": ""; - $subcontent = $getJokeSoup($type); + $subcontent = $getJokeSoup($type, $checkin['userid']); $title = "{$typeContent}打卡成功，打卡时间: {$hi}{$remark}"; WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [ 'type' => 'content', diff --git a/language/original-api.txt b/language/original-api.txt index 329ad36e9..906bb6b0a 100644 --- a/language/original-api.txt +++ b/language/original-api.txt @@ -709,3 +709,8 @@ webhook地址最长仅支持255个字符。 婚假 丧假 哺乳假 + +语言错误 +动画表情 +每日开心：(*) +心灵鸡汤：(*) diff --git a/language/translate.json b/language/translate.json index 7c15689f5..fb7701ee6 100644 --- a/language/translate.json +++ b/language/translate.json @@ -25930,5 +25930,41 @@ "fr": "Mettre à jour maintenant", "id": "Perbarui sekarang", "ru": "Обновить сейчас" + }, + { + "key": "语言错误", + "zh": "", + "zh-CHT": "語言錯誤", + "en": "Language Error", + "ko": "언어 오류", + "ja": "言語エラー", + "de": "Sprachfehler", + "fr": "Erreur de langue", + "id": "Kesalahan Bahasa", + "ru": "Ошибка языка" + }, + { + "key": "每日开心：(%T1)", + "zh": "", + "zh-CHT": "每日開心：(%T1)", + "en": "Daily Joy: (%T1)", + "ko": "일일 행복: (%T1)", + "ja": "毎日の喜び: (%T1)", + "de": "Tägliche Freude: (%T1)", + "fr": "Joie quotidienne : (%T1)", + "id": "Keceriaan Harian: (%T1)", + "ru": "Ежедневная радость: (%T1)" + }, + { + "key": "心灵鸡汤：(%T1)", + "zh": "", + "zh-CHT": "心靈雞湯：(%T1)", + "en": "Soulful Quote: (%T1)", + "ko": "마음의 비타민: (%T1)", + "ja": "心のスープ: (%T1)", + "de": "Seelenstärkung: (%T1)", + "fr": "Citation inspirante : (%T1)", + "id": "Kata Bijak: (%T1)", + "ru": "Душеподъемная цитата: (%T1)" } -] +] \ No newline at end of file diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue index a1c4edd8d..fb01fb6cb 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -96,8 +96,10 @@

{{item.approver}}

-

待审批

-

+

+ {{$L('待审批')}} +

+

{{$L('审批中')}} {{$L('已通过')}} {{$L('已拒绝')}} diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue index af177f8f0..960befb43 100644 --- a/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue +++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue @@ -5,8 +5,8 @@

{{$L("申请人")}}：@{{ msg.data.nickname }} {{ msg.data.department }}

{{$L("详情")}}

{{$L("假期类型")}}：{{ $L(msg.data.type) }}

-

{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ msg.data.start_day_of_week }})

-

{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ msg.data.end_day_of_week }})

+

{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ $L(msg.data.start_day_of_week) }})

+

{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ $L(msg.data.end_day_of_week) }})

{{$L("事由")}}：{{ msg.data.description }}

diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue index 90a83b121..c0a3f4579 100644 --- a/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue +++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue @@ -5,8 +5,8 @@

{{$L("申请人")}}：@{{ msg.data.nickname }} {{ msg.data.department }}

{{$L("详情")}}

{{$L("假期类型")}}：{{ $L(msg.data.type) }}

-

{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ msg.data.start_day_of_week }})

-

{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ msg.data.end_day_of_week }})

+

{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ $L(msg.data.start_day_of_week) }})

+

{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ $L(msg.data.end_day_of_week) }})

{{$L("事由")}}：{{ msg.data.description }}

diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue index 2656a1a22..78c2b9572 100644 --- a/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue +++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue @@ -5,8 +5,8 @@

{{$L("申请人")}}：@{{ msg.data.start_nickname }} {{ msg.data.department }}

{{$L("详情")}}

{{$L("假期类型")}}：{{ $L(msg.data.type) }}

-

{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ msg.data.start_day_of_week }})

-

{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ msg.data.end_day_of_week }})

+

{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ $L(msg.data.start_day_of_week) }})

+

{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ $L(msg.data.end_day_of_week) }})

{{$L("事由")}}：{{ msg.data.description }}