xinyouhe/crm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/ru' into develop

Browse Source 
# Conflicts:
#	config/constants/Constants.php
This commit is contained in:
HESU\HESU
2025-04-07 11:54:29 +08:00
parent 40fff988ce 6247d8cf4d
commit 6baf3dd44f
7 changed files with 90 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controller/CarTypeController.php
+5 -1
View File
@@ -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);
app/controller/CustomerController.php
+9 -1
View File
@@ -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[] = [
@@ -74,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);
app/controller/UserController.php
+1 -1
View File
@@ -330,7 +330,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 = [