Forráskód Böngészése

Merge branch 'master' of github.com:meolu/walle-web

wushuiyong 9 éve
szülő
commit
590928ee1f

+ 16 - 0
messages/en/w.php

@@ -2,6 +2,7 @@
 
 return [
     'w' => 'Walle Platform',
+    'w platform' => 'Platform',
 
     'bool_0' => 'No',
     'bool_1' => 'Yes',
@@ -56,4 +57,19 @@ return [
 
     'need login' => 'login first :)',
     'something went wrong' => 'Something Wrong',
+
+    'log-platform' => 'Login',
+    'login username' => 'Username',
+    'login password' => 'Password',
+    'login forgot password' => 'Forgot password',
+    'login register user' => 'Signup',
+
+    'login resend email' => 'Please confirm your email',
+
+    'register-platform' => 'Register',
+    'register email' => 'Email',
+    'register firstname' => 'First name',
+    'register password' => 'Password',
+    'register role' => 'Role',
+    'back' => 'Back',
 ];

+ 16 - 1
messages/zh/w.php

@@ -2,6 +2,7 @@
 
 return [
     'w' => 'Walle 瓦力平台',
+    'w platform' => '平台',
 
     'bool_0' => 'No',
     'bool_1' => 'Yes',
@@ -43,7 +44,6 @@ return [
     'delete failed' => '删除失败',
     'update failed' => '更新失败',
 
-
     'dropdown message' => '消息通知',
     'dropdown project apply' => '项目管理员申请',
     'dropdown profile' => '个人资料',
@@ -57,4 +57,19 @@ return [
 
     'need login' => '请先登录,再操作:)',
     'something went wrong' => '出错',
+
+    'log-platform' => '登录平台',
+    'login username' => '用户名' ,
+    'login password' => '密码',
+    'login forgot password' => '忘记密码',
+    'login register user' => '注册账号',
+
+    'login resend email' => '请确认你的邮箱',
+
+    'register-platform' => '注册平台',
+    'register email' => '邮箱',
+    'register firstname' => '名字',
+    'register password' => '密码',
+    'register role' => '角色',
+    'back' => '返回登录',
 ];

+ 2 - 2
views/layouts/site.php

@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = $this->title;
 <html lang="en">
 <head>
     <meta charset="utf-8" />
-    <title>登录 - 瓦力平台</title>
+    <title><?= yii::t("w","log-platform")?> - <?= yii::t("w","w")?></title>
     <!-- basic styles -->
 
     <link href="/dist/css/bootstrap.min.css" rel="stylesheet" />
@@ -63,7 +63,7 @@ $this->params['breadcrumbs'][] = $this->title;
                         <h1>
                             <i class="icon-leaf green"></i>
                             <span class="red">Walle</span>
-                            <span class="white">瓦力平台</span>
+                            <span class="white"><?= yii::t("w","w platform") ?></span>
                         </h1>
                     </div>
 

+ 6 - 6
views/site/login.php

@@ -17,17 +17,17 @@ $this->params['breadcrumbs'][] = $this->title;
         <div class="widget-main">
             <h4 class="header blue lighter bigger">
                 <i class="icon-coffee green"></i>
-                登录平台
+                <?= yii::t('w','log-platform')?>
             </h4>
 
             <div class="space-6"></div>
             <?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
-            <?= $form->field($model, 'username')->label('用户名') ?>
-            <?= $form->field($model, 'password')->label('密码')->passwordInput() ?>
+            <?= $form->field($model, 'username')->label(yii::t('w','login username')) ?>
+            <?= $form->field($model, 'password')->label(yii::t('w','login password'))->passwordInput() ?>
             <?= $form->field($model, 'rememberMe')->label('记住我')->checkbox() ?>
 
             <div class="form-group">
-                <?= Html::submitButton('登录', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+                <?= Html::submitButton(yii::t('w','submit'), ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
             </div>
             <?php ActiveForm::end(); ?>
 
@@ -37,13 +37,13 @@ $this->params['breadcrumbs'][] = $this->title;
             <div>
                 <a href="/site/request-password-reset" class="forgot-password-link">
                     <i class="icon-arrow-left"></i>
-                    忘记密码
+                    <?= yii::t('w','login forgot password')?>
                 </a>
             </div>
 
             <div>
                 <a href="/site/signup" class="user-signup-link">
-                    注册账号
+                    <?= yii::t('w','login register user')?>
                     <i class="icon-arrow-right"></i>
                 </a>
             </div>

+ 4 - 4
views/site/requestPasswordResetToken.php

@@ -19,21 +19,21 @@ $this->params['breadcrumbs'][] = $this->title;
             <div class="widget-main">
                 <h4 class="header red lighter bigger">
                     <i class="icon-key"></i>
-                    忘记密码
+                    <?= yii::t("w","login forgot password")?>
                 </h4>
 
                 <div class="space-6"></div>
                 <?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
-                <?= $form->field($model, 'email')->label('请确认你的邮箱') ?>
+                <?= $form->field($model, 'email')->label(yii::t("w",'login resend email')) ?>
                 <div class="form-group">
-                    <?= Html::submitButton('发送', ['class' => 'btn btn-primary']) ?>
+                    <?= Html::submitButton(yii::t("w","submit"), ['class' => 'btn btn-primary']) ?>
                 </div>
                 <?php ActiveForm::end(); ?>
             </div><!-- /widget-main -->
 
             <div class="toolbar center">
                 <a href="/site/login" class="back-to-login-link">
-                    返回登录<i class="icon-arrow-right"></i>
+                    <?= yii::t("w","back")?><i class="icon-arrow-right"></i>
                 </a>
             </div>
         </div><!-- /widget-body -->

+ 7 - 7
views/site/signup.php

@@ -17,27 +17,27 @@ $this->params['breadcrumbs'][] = $this->title;
             <div class="widget-main">
                 <h4 class="header green lighter bigger">
                     <i class="icon-group blue"></i>
-                    注册平台
+                    <?= yii::t('w','register-platform')?>
                 </h4>
 
                 <div class="space-6"></div>
                 <?php $form = ActiveForm::begin(['id' => 'form-signup']); ?>
-                <?= $form->field($model, 'email')->label('邮箱') ?>
-                <?= $form->field($model, 'username')->label('名字') ?>
-                <?= $form->field($model, 'password')->passwordInput() ?>
-                <?= $form->field($model, 'role')->dropDownList([
+                <?= $form->field($model, 'email')->label(yii::t('w','register email')) ?>
+                <?= $form->field($model, 'username')->label(yii::t('w','register firstname')) ?>
+                <?= $form->field($model, 'password')->label(yii::t('w','register password'))->passwordInput() ?>
+                <?= $form->field($model, 'role')->label(yii::t('w','register role'))->dropDownList([
                     User::ROLE_DEV => \Yii::t('w', 'user_role_' . User::ROLE_DEV),
                     User::ROLE_ADMIN => \Yii::t('w', 'user_role_' . User::ROLE_ADMIN),
                 ]) ?>
                 <div class="form-group">
-                    <?= Html::submitButton('提交', ['class' => 'btn btn-primary', 'name' => 'signup-button']) ?>
+                    <?= Html::submitButton(yii::t('w','register-platform'), ['class' => 'btn btn-primary', 'name' => 'signup-button']) ?>
                 </div>
                 <?php ActiveForm::end(); ?>
             </div>
 
             <div class="toolbar center">
                 <a href="/site/login" class="back-to-login-link">
-                    返回登录<i class="icon-arrow-right"></i>
+                    <?= yii::t('w','back')?><i class="icon-arrow-right"></i>
                 </a>
             </div>
         </div>

+ 1 - 1
views/user/resetPassword.php

@@ -17,7 +17,7 @@ $this->params['breadcrumbs'][] = $this->title;
             <?php $form = ActiveForm::begin(['id' => 'reset-password-form']); ?>
                 <?= $form->field($model, 'password')->passwordInput() ?>
                 <div class="form-group">
-                    <?= Html::submitButton('更新', ['class' => 'btn btn-primary']) ?>
+                    <?= Html::submitButton(yii::t('w','submit'), ['class' => 'btn btn-primary']) ?>
                 </div>
             <?php ActiveForm::end(); ?>
         </div>