!507 补充多语言

Merge pull request !507 from 御宅男(YznCMS官方)/Branch_f804c8a6

application/api/controller/User.php

@@ -179,14 +179,14 @@ class User extends Api
         $bio = $this->request->post('bio');
         $avatar = $this->request->post('avatar', '', 'trim,strip_tags,htmlspecialchars');
         if ($username) {
-            $exists = \app\common\model\User::where('username', $username)->where('id', '<>', $this->auth->id)->find();
+            $exists = \app\common\model\User::where('username', $username)->where('id', '<>', $user->id)->find();
             if ($exists) {
                 $this->error(__('Username already exists'));
             }
             $user->username = $username;
         }
         if ($nickname) {
-            $exists = \app\common\model\User::where('nickname', $nickname)->where('id', '<>', $this->auth->id)->find();
+            $exists = \app\common\model\User::where('nickname', $nickname)->where('id', '<>', $user->id)->find();
             if ($exists) {
                 $this->error(__('Nickname already exists'));
             }

application/index/lang/zh-cn/user.php

@@ -8,6 +8,7 @@ return [
     'Mobile'                                     => '手机号',
     'Email'                                      => '邮箱',
     'Captcha'                                    => '验证码',
+    'Get code'                                   => '获取验证码',
     'Lv'                                         => 'Lv',
     'Score'                                      => '积分',
     'Day'                                        => '天',

application/index/view/user/profile.html

@@ -123,7 +123,7 @@
                     <div class="input-group">
                         <input type="text" name="captcha" id="email-captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});digits;remote({:url('api/validate/check_ems_correct')}, event=changeemail, email:#email)" />
                         <span class="input-group-btn" style="padding:0;border:none;">
-                            <a href="javascript:;" class="btn btn-info btn-captcha" data-url="{:url('api/ems/send')}" data-type="email" data-event="changeemail">获取验证码</a>
+                            <a href="javascript:;" class="btn btn-info btn-captcha" data-url="{:url('api/ems/send')}" data-type="email" data-event="changeemail">{:__('Get code')}</a>
                         </span>
                     </div>
                     <span class="msg-box"></span>
@@ -156,7 +156,7 @@
                     <div class="input-group">
                         <input type="text" name="captcha" id="mobile-captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});digits;remote({:url('api/validate/check_sms_correct')}, event=changemobile, mobile:#mobile)" />
                         <span class="input-group-btn" style="padding:0;border:none;">
-                            <a href="javascript:;" class="btn btn-info btn-captcha" data-url="{:url('api/sms/send')}" data-type="mobile" data-event="changemobile">获取验证码</a>
+                            <a href="javascript:;" class="btn btn-info btn-captcha" data-url="{:url('api/sms/send')}" data-type="mobile" data-event="changemobile">{:__('Get code')}</a>
                         </span>
                     </div>
                     <span class="msg-box"></span>

public/assets/js/require-table.js

@@ -725,7 +725,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                         if (top + 154 > $(window).height()) {
                             top = top - 154;
                         }
-                        if ($(window).width() < 480) {
+                        if (left < 0 || $(window).width() < 480) {
                             top = left = undefined;
                         }
                         Layer.confirm(