diff --git a/config/app.php b/config/app.php index addfd2ba..e48cebe8 100644 --- a/config/app.php +++ b/config/app.php @@ -74,7 +74,7 @@ return [ | */ - 'locale' => 'zh-CN', + 'locale' => 'en', /* |-------------------------------------------------------------------------- diff --git a/resources/assets/js/auth.js b/resources/assets/js/auth.js index 7b9cc677..4f3c935e 100644 --- a/resources/assets/js/auth.js +++ b/resources/assets/js/auth.js @@ -2,7 +2,7 @@ * @Author: printempw * @Date: 2016-07-17 10:54:22 * @Last Modified by: printempw - * @Last Modified time: 2016-09-05 22:24:33 + * @Last Modified time: 2016-09-11 15:26:09 */ 'use strict'; @@ -230,7 +230,7 @@ $('#reset-button').click(function() { success: function(json) { if (json.errno == 0) { swal({ - type: '重置成功，请重新登录~', + type: 'success', html: json.msg }).then(function() { window.location = "./login"; diff --git a/resources/lang/en/auth.yml b/resources/lang/en/auth.yml index 3ff8eca5..586f414e 100644 --- a/resources/lang/en/auth.yml +++ b/resources/lang/en/auth.yml @@ -1,11 +1,41 @@ login: login: Log In - message: Login in to manage your skin & players - identification: Email or Player Name - password: Password - captcha: Enter the CAPTCHA - change-captcha: Click to change another image. + message: Log in to manage your skin & players keep: Remember me - forgot-link: Forgot your password? - register-link: Register a new account +register: + register: Register + message: Welcome to :sitename + nickname-intro: Whatever you like expect special characters + repeat-pwd: Repeat your password + +forgot: + forgot: Reset Password + message: We will send you an E-mail to verify + send: Send + login-link: I do remember it + +mail: + message: You are receiving this email because this email address was used to reset your password on :sitename + ignore: If you haven't signed up on our site, please ignore this email. No unsubscribing is required. + reset: Reset your password + notice: This mail is sending automatically, no reponses will be sent if you reply. + +reset: + reset: Reset + message: :username, reset your email address here + +bind: + bind: Bind + message: You need to fill your email adderss to continue + introduction: Email addresses will be used for password resetting. We won't send you any spam. + +nickname: Nickname +email: Email Address +identification: Email or Player Name +password: Password +captcha: Enter the CAPTCHA +change-captcha: Click to change another image. +login-link: Already have an account? +forgot-link: Forgot your password? +register-link: Register a new account diff --git a/resources/views/auth/bind.tpl b/resources/views/auth/bind.tpl index b3001e72..b4ed2824 100644 --- a/resources/views/auth/bind.tpl +++ b/resources/views/auth/bind.tpl @@ -1,6 +1,6 @@ @extends('auth.master') -@section('title', '绑定邮箱') +@section('title', trans('auth.bind.bind')) @section('content') @@ -10,24 +10,24 @@
-

欢迎！您需要填写邮箱以继续使用本站。

+

{{ trans('auth.bind.message') }}

- +
-

邮箱仅用于重置密码，我们将不会向您发送任何垃圾邮件。

+

{{ trans('auth.bind.introduction') }}

@if (isset($msg)) -
{{ $msg }}
+
{{ $msg }}
@endif
- +
diff --git a/resources/views/auth/forgot.tpl b/resources/views/auth/forgot.tpl index 17104460..1974cd61 100644 --- a/resources/views/auth/forgot.tpl +++ b/resources/views/auth/forgot.tpl @@ -1,6 +1,6 @@ @extends('auth.master') -@section('title', '找回密码') +@section('title', trans('auth.forgot.forgot')) @section('content') @@ -10,23 +10,23 @@
-

我们将会给您发送一封密码重置邮件

+

{{ trans('auth.forgot.message') }}

- +
- +
- CAPTCHA + CAPTCHA
@@ -35,11 +35,11 @@
- 我又想起来了 + {{ trans('auth.forgot.login-link') }}
- +
diff --git a/resources/views/auth/login.tpl b/resources/views/auth/login.tpl index 06e2c73d..b18e9069 100644 --- a/resources/views/auth/login.tpl +++ b/resources/views/auth/login.tpl @@ -14,23 +14,23 @@
- +
- +
- +
- CAPTCHA + CAPTCHA
@@ -53,8 +53,8 @@
- {{ trans('auth.login.forgot-link') }}
- {{ trans('auth.login.register-link') }} + {{ trans('auth.forgot-link') }}
+ {{ trans('auth.register-link') }} diff --git a/resources/views/auth/mail.tpl b/resources/views/auth/mail.tpl index ed3e608d..bd849e45 100644 --- a/resources/views/auth/mail.tpl +++ b/resources/views/auth/mail.tpl @@ -6,19 +6,19 @@

{{ Option::get('site_name') }}

-
您收到这封邮件，是因为在 我们网站 的用户重置密码功能使用了您的地址。

+
{!! trans('auth.mail.message', ['sitename' => "".Option::get('site_name').""]) !!}

- 如果您并没有访问过我们的网站，或没有进行上述操作，请忽略这封邮件。 您不需要退订或进行其他进一步的操作。 + {{ trans('auth.mail.ignore') }}
- 重置密码 ➔ + {{ trans('auth.mail.reset') }} ➔
- * 本邮件由系统自动发送，就算你回复了我们也不会回复你哦
+ * {{ trans('auth.mail.notice') }}
diff --git a/resources/views/auth/register.tpl b/resources/views/auth/register.tpl index 89ff0fe3..a14d0253 100644 --- a/resources/views/auth/register.tpl +++ b/resources/views/auth/register.tpl @@ -1,6 +1,6 @@ @extends('auth.master') -@section('title', '注册') +@section('title', trans('auth.register.register')) @section('content') @@ -10,36 +10,36 @@
-

欢迎使用 {{ Option::get('site_name') }}！

+

{{ trans('auth.register.message', ['sitename' => Option::get('site_name')]) }}

- +
- +
- +
-
- +
+
- +
- CAPTCHA + CAPTCHA
@@ -48,11 +48,11 @@
- 已经有账号了？登录 + {{ trans('auth.login-link') }}
- +
diff --git a/resources/views/auth/reset.tpl b/resources/views/auth/reset.tpl index f75cd3ed..fcabd5e3 100644 --- a/resources/views/auth/reset.tpl +++ b/resources/views/auth/reset.tpl @@ -1,6 +1,6 @@ @extends('auth.master') -@section('title', '重置密码') +@section('title', trans('auth.forgot.reset')) @section('content') @@ -10,17 +10,17 @@
- +