Merge branch 'feature/ru' into develop
# Conflicts: # app/controller/UserController.php # config/constants/Constants.php
This commit is contained in:
@@ -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 = [
|
||||
|
||||
Reference in New Issue
Block a user