Merge branch 'feature/ru' into develop
This commit is contained in:
@@ -69,8 +69,8 @@ class Customer extends Model
|
|||||||
{
|
{
|
||||||
$language = $request->user['language'] ?: 'en';
|
$language = $request->user['language'] ?: 'en';
|
||||||
$customer['grade_txt'] = Util::language($language, Constants::GRADE_EN[$customer['grade']], Constants::GRADE[$customer['grade']], Constants::GRADE_RU[$customer['grade']]);
|
$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['magnitude_txt'] = Util::language($language, Constants::MAGNITUDE_EN[$customer['magnitude']], Constants::MAGNITUDE[$customer['magnitude']], Constants::MAGNITUDE_RU[$customer['magnitude']]);
|
||||||
$customer['sex_txt'] = Util::language($language, Constants::SEX_EN[$customer['grade']], Constants::SEX[$customer['grade']], Constants::SEX_RU[$customer['grade']]);
|
$customer['sex_txt'] = Util::language($language, Constants::SEX_EN[$customer['sex']], Constants::SEX[$customer['sex']], Constants::SEX_RU[$customer['sex']]);
|
||||||
|
|
||||||
if ($customer['grade']<=2) {
|
if ($customer['grade']<=2) {
|
||||||
$customer['follow'] = 0;
|
$customer['follow'] = 0;
|
||||||
|
|||||||
+1
-1
@@ -108,7 +108,7 @@ class Util
|
|||||||
/**
|
/**
|
||||||
* 格式化创建时间
|
* 格式化创建时间
|
||||||
*/
|
*/
|
||||||
public static function language($language = 'en',$en,$zh_CN,$ru)
|
public static function language($language,$en,$zh_CN,$ru)
|
||||||
{
|
{
|
||||||
if ($language == 'zh_CN'){
|
if ($language == 'zh_CN'){
|
||||||
return $zh_CN;
|
return $zh_CN;
|
||||||
|
|||||||
Reference in New Issue
Block a user