Merge branch 'feature/ru' into develop

# Conflicts:
#	app/controller/UserController.php
#	config/constants/Constants.php
This commit is contained in:
2025-04-07 14:20:08 +08:00
3 changed files with 5 additions and 2 deletions
+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','ru'])) {
if (!in_array($language, Constants::LANGUAGE)) {
return Util::fail([], trans('param_error'));
}
$data = [