From 0011443a04ad7cdbdf74873541b026d27365e54f Mon Sep 17 00:00:00 2001 From: "HESU\\HESU" <1696136552@qq.com> Date: Tue, 1 Apr 2025 14:41:55 +0800 Subject: [PATCH 1/4] 1 --- app/controller/CustomerController.php | 4 +++ config/constants/Constants.php | 14 +++++++++++ resource/translations/ru/messages.php | 35 +++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 resource/translations/ru/messages.php diff --git a/app/controller/CustomerController.php b/app/controller/CustomerController.php index 635b2dc..c19eb4b 100644 --- a/app/controller/CustomerController.php +++ b/app/controller/CustomerController.php @@ -33,6 +33,8 @@ class CustomerController $gradeConstants = Constants::GRADE_EN; if($request->user['language'] == 'zh_CN'){ $gradeConstants = Constants::GRADE; + }elseif ($request->user['language'] == 'ru'){ + $gradeConstants = Constants::GRADE_RU; } foreach ($gradeConstants as $key => $value) { $grade[] = [ @@ -54,6 +56,8 @@ class CustomerController $magnitudeConstants = Constants::MAGNITUDE_EN; if($request->user['language'] == 'zh_CN'){ $magnitudeConstants = Constants::MAGNITUDE; + }elseif ($request->user['language'] == 'ru'){ + $magnitudeConstants = Constants::MAGNITUDE_RU; } foreach ($magnitudeConstants as $key => $value) { $grade[] = [ diff --git a/config/constants/Constants.php b/config/constants/Constants.php index 36a21e5..e922ef1 100644 --- a/config/constants/Constants.php +++ b/config/constants/Constants.php @@ -27,6 +27,14 @@ class Constants self::CUSTOMER_GRADE_SALES => 'After Sales', self::CUSTOMER_GRADE_LOSS => 'Stagnation or loss', ]; + public const GRADE_RU = [ + self::CUSTOMER_GRADE_INITIAL => 'Первоначальные контакты', + self::CUSTOMER_GRADE_COMMUNICATE => 'Потребности в общении', + self::CUSTOMER_GRADE_PLAN => 'Продвижение программы', + self::CUSTOMER_GRADE_DEAL => 'Этап сделки', + self::CUSTOMER_GRADE_SALES => 'Послепродажный этап', + self::CUSTOMER_GRADE_LOSS => 'Застой или потеря', + ]; //客户重要性 public const CUSTOMER_MAGNITUDE_INITIAL = 0; // 金牌商机 @@ -44,6 +52,12 @@ class Constants self::CUSTOMER_MAGNITUDE_PLAN => 'Bronze Medal', ]; + public const MAGNITUDE_RU = [ + self::CUSTOMER_MAGNITUDE_INITIAL => 'Золотой бизнес', + self::CUSTOMER_MAGNITUDE_COMMUNICATE => 'Серебряный бизнес', + self::CUSTOMER_MAGNITUDE_PLAN => 'Бронзовый бизнес.', + ]; + //跟进类型 public const CUSTOMER_FOLLOW_VISIT = 0; // 线下拜访 diff --git a/resource/translations/ru/messages.php b/resource/translations/ru/messages.php new file mode 100644 index 0000000..c96f0ab --- /dev/null +++ b/resource/translations/ru/messages.php @@ -0,0 +1,35 @@ + ' Успех', + 'fail' => ' Неудача', + 'login_success' => ' Регистрация завершена', + 'password_error' => ' Ошибка пароля', + 'user_none' => ' Пользователь не существует', + 'user_id' => ' Идентификатор пользователя', + 'user_login' => ' Пожалуйста, войдите.', + 'not_null' => ' Нельзя быть пустым', + 'code_error' => ' Ошибка кода проверки', + 'format_error' => ' Ошибка формата', + 'email_repeat' => ' Почтовый ящик повторяется', + 'email_error' => ' Ошибка формата почтового ящика', + 'save_success' => ' Сохранить успешно', + 'save_fail' => ' Ошибка сохранения', + 'register_success' => ' Регистрация успешно', + 'register_fail' => ' Ошибка регистрации', + 'language_success' => ' Переключить язык успешно', + 'language_fail' => ' Ошибка переключения языка', + 'param_error' => ' Ошибка параметра', + 'required_not_null' => ' Обязательное заполнение не может быть пустым.', + 'picture_not_null' => ' Фотографии не могут быть пустыми', + 'contacts_not_null' => ' Контакты, почтовый ящик, телефон не может быть одновременно пустым', + 'car_type_not_null' => ' Предпочтения не могут быть пустыми', + 'channel_not_null' => ' Каналы не могут быть пустыми', + 'email_consistent' => ' Почтовый ящик не совпадает', + 'sign_not_null' => ' Компания не создана', + 'password_short' => ' Пароль не может быть меньше 6.', + 'id_empty' => ' ID не может быть пустым', + 'customer_id' => ' Идентификатор клиента', + 'tag_group_id' => ' Идентификатор группы меток', + 'claim_fail' => ' Невозможность получения принадлежащего клиенту', +]; \ No newline at end of file From 76466db0fba5a6e0191521c090c870f51c9d5532 Mon Sep 17 00:00:00 2001 From: "HESU\\HESU" <1696136552@qq.com> Date: Tue, 1 Apr 2025 16:09:47 +0800 Subject: [PATCH 2/4] ru --- app/model/Customer.php | 12 ++++++------ app/util/Util.php | 13 +++++++++++++ config/constants/Constants.php | 6 +++++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/model/Customer.php b/app/model/Customer.php index 52d30b0..d4bd4fa 100644 --- a/app/model/Customer.php +++ b/app/model/Customer.php @@ -68,19 +68,19 @@ class Customer extends Model public static function getCustomer($customer, $request, $tag = false) { $language = $request->user['language'] ?: 'en'; - $customer['grade_txt'] = $language=='en'?Constants::GRADE_EN[$customer['grade']]:Constants::GRADE[$customer['grade']]; - $customer['magnitude_txt'] = $language=='en'?Constants::MAGNITUDE_EN[$customer['magnitude']]:Constants::MAGNITUDE[$customer['magnitude']]; - $customer['sex_txt'] = $language=='en'?Constants::SEX_EN[$customer['sex']]:Constants::SEX[$customer['sex']]; + $customer['grade_txt'] = Util::language($language, Constants::GRADE_EN[$customer['grade']], Constants::GRADE[$customer['grade']], Constants::GRADE_RU[$customer['grade']]); + $customer['magnitude_txt'] = Util::language($language, Constants::MAGNITUDE_EN[$customer['grade']], Constants::MAGNITUDE[$customer['grade']], Constants::MAGNITUDE_RU[$customer['grade']]); + $customer['sex_txt'] = Util::language($language, Constants::SEX_EN[$customer['grade']], Constants::SEX[$customer['grade']], Constants::SEX_RU[$customer['grade']]); if ($customer['grade']<=2) { $customer['follow'] = 0; - $customer['follow_txt'] = ($language == 'en' ? 'Following' : '跟进中'); + $customer['follow_txt'] = Util::language($language,'Following','跟进中','Продолжение'); }elseif ($customer['grade']<5) { $customer['follow'] = 1; - $customer['follow_txt'] = ($language == 'en' ? 'transacted' : '已成交'); + $customer['follow_txt'] = Util::language($language,'transacted','已成交','Транзакция завершена'); }else{ $customer['follow'] = 2; - $customer['follow_txt'] = ($language == 'en' ? 'lost' : '已流失'); + $customer['follow_txt'] = Util::language($language,'lost','已流失','Потерянный'); } $where = [ diff --git a/app/util/Util.php b/app/util/Util.php index 77a5e81..e5c07dc 100644 --- a/app/util/Util.php +++ b/app/util/Util.php @@ -105,4 +105,17 @@ class Util return $value; } + /** + * 格式化创建时间 + */ + public static function language($language = 'en',$en,$zh_CN,$ru) + { + if ($language == 'zh_CN'){ + return $zh_CN; + }elseif ($language == 'ru'){ + return $ru; + } + return $en; + } + } \ No newline at end of file diff --git a/config/constants/Constants.php b/config/constants/Constants.php index e922ef1..40e3a16 100644 --- a/config/constants/Constants.php +++ b/config/constants/Constants.php @@ -82,10 +82,14 @@ class Constants self::CUSTOMER_SEX_MAN => '男', self::CUSTOMER_SEX_WOMAN => '女', ]; - public const SEX_EN = [ self::CUSTOMER_SEX_UNKNOWN => 'unknown', self::CUSTOMER_SEX_MAN => 'man', self::CUSTOMER_SEX_WOMAN => 'woman', ]; + public const SEX_RU = [ + self::CUSTOMER_SEX_UNKNOWN => 'неизвестный', + self::CUSTOMER_SEX_MAN => 'мужской', + self::CUSTOMER_SEX_WOMAN => 'женский', + ]; } \ No newline at end of file From de7dcdf011573be397754a385a9c4b447ad79d3b Mon Sep 17 00:00:00 2001 From: "HESU\\HESU" <1696136552@qq.com> Date: Wed, 2 Apr 2025 17:04:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=84=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/CarTypeController.php | 6 +++++- app/controller/CustomerController.php | 6 +++++- app/model/Customer.php | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/controller/CarTypeController.php b/app/controller/CarTypeController.php index bb022a0..1dec007 100644 --- a/app/controller/CarTypeController.php +++ b/app/controller/CarTypeController.php @@ -18,9 +18,13 @@ class CarTypeController $list = CarType::getAll(); if($request->user['language'] != 'zh_CN'){ - foreach ($list as $key => &$value) { + foreach ($list as &$value) { $value['name'] = $value['name_en']; } + }elseif ($request->user['language'] == 'ru'){ + foreach ($list as &$value) { + $value['name'] = $value['name_ru']; + } } return Util::success($list); diff --git a/app/controller/CustomerController.php b/app/controller/CustomerController.php index c19eb4b..9024264 100644 --- a/app/controller/CustomerController.php +++ b/app/controller/CustomerController.php @@ -78,9 +78,13 @@ class CustomerController $list = Channel::getAll(); if($request->user['language'] != 'zh_CN'){ - foreach ($list as $key => &$value) { + foreach ($list as &$value) { $value['name'] = $value['name_en']; } + }elseif ($request->user['language'] == 'ru'){ + foreach ($list as &$value) { + $value['name'] = $value['name_ru']; + } } return Util::success($list); diff --git a/app/model/Customer.php b/app/model/Customer.php index d4bd4fa..6c3d2b7 100644 --- a/app/model/Customer.php +++ b/app/model/Customer.php @@ -96,7 +96,7 @@ class Customer extends Model // $customer['updated_at'] = Util::timeTotDate($customer['updated_at']); $customer = Util::formatDate($customer,['follow_last']); - $nameLang = $language=='en'?'name_en':'name'; + $nameLang = $language=='en'?'name_en':($language=='ru'?'name_ru':'name'); $countryLang = $language=='en'?'en_addr':'cn_addr'; $customer['car_type_name'] = empty($customer['car_type_id'])?'':CarType::where(['id'=>$customer['car_type_id']])->value($nameLang); $customer['country_name'] = empty($customer['country_id'])?'':Country::where(['id'=>$customer['country_id']])->value($countryLang); From 6247d8cf4d99693919fa18bd8fde8c63441c28b7 Mon Sep 17 00:00:00 2001 From: "HESU\\HESU" <1696136552@qq.com> Date: Mon, 7 Apr 2025 11:52:11 +0800 Subject: [PATCH 4/4] ru --- app/controller/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controller/UserController.php b/app/controller/UserController.php index a52cd7c..f7cfc22 100644 --- a/app/controller/UserController.php +++ b/app/controller/UserController.php @@ -283,7 +283,7 @@ class UserController if (Util::isEmpty($language)) { return Util::fail([], 'language' . trans('not_null')); } - if (!in_array($language, ['en', 'zh_CN'])) { + if (!in_array($language, ['en', 'zh_CN','ru'])) { return Util::fail([], trans('param_error')); } $data = [