zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

working on translations

Browse Source
This commit is contained in:
printempw 2016-09-11 15:40:09 +08:00
parent 2c890730b6
commit a5a48789c5
9 changed files with 79 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/app.php
View File

@ -74,7 +74,7 @@ return [
|
*/
'locale' => 'zh-CN',
'locale' => 'en',
/*
|--------------------------------------------------------------------------

4
resources/assets/js/auth.js
View File

@ -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";

44
resources/lang/en/auth.yml
View File

@ -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

12
resources/views/auth/bind.tpl
View File

@ -1,6 +1,6 @@
@extends('auth.master')
@section('title', '绑定邮箱')
@section('title', trans('auth.bind.bind'))
@section('content')
@ -10,24 +10,24 @@
</div>
<!-- /.login-logo -->
<div class="login-box-body">
<p class="login-box-msg">欢迎！您需要填写邮箱以继续使用本站。</p>
<p class="login-box-msg">{{ trans('auth.bind.message') }}</p>
<form method="post" id="login-form">
<div class="form-group has-feedback">
<input name="email" type="email" class="form-control" placeholder="Email">
<input name="email" type="email" class="form-control" placeholder="{{ trans('auth.email') }}">
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
<p>邮箱仅用于重置密码，我们将不会向您发送任何垃圾邮件。</p>
<p>{{ trans('auth.bind.introduction') }}</p>
@if (isset($msg))
<div id="msg" class="alert alert-warning">{{ $msg }}</div>
<div id="msg" class="callout callout-warning">{{ $msg }}</div>
@endif
<div class="row">
<div class="col-xs-8"></div>
<div class="col-xs-4">
<button type="submit" class="btn btn-primary btn-block btn-flat">绑定</button>
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ trans('auth.bind.bind') }}</button>
</div><!-- /.col -->
</div>
</form>

14
resources/views/auth/forgot.tpl
View File

@ -1,6 +1,6 @@
@extends('auth.master')
@section('title', '找回密码')
@section('title', trans('auth.forgot.forgot'))
@section('content')
@ -10,23 +10,23 @@
</div>
<!-- /.login-logo -->
<div class="login-box-body">
<p class="login-box-msg">我们将会给您发送一封密码重置邮件</p>
<p class="login-box-msg">{{ trans('auth.forgot.message') }}</p>
<form id="login-form">
<div class="form-group has-feedback">
<input id="email" type="email" class="form-control" placeholder="Email">
<input id="email" type="email" class="form-control" placeholder="{{ trans('auth.email') }}">
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
<div class="row" id="captcha-form">
<div class="col-xs-8">
<div class="form-group has-feedback">
<input id="captcha" type="text" class="form-control" placeholder="输入验证码">
<input id="captcha" type="text" class="form-control" placeholder="{{ trans('auth.captcha') }}">
</div>
</div>
<!-- /.col -->
<div class="col-xs-4">
<img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="点击以更换图片" data-placement="top" data-toggle="tooltip">
<img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="{{ trans('auth.change-captcha') }}" data-placement="top" data-toggle="tooltip">
</div>
<!-- /.col -->
</div>
@ -35,11 +35,11 @@
<div class="row">
<div class="col-xs-8">
<a href="{{ url('auth/login') }}" class="text-center">我又想起来了</a>
<a href="{{ url('auth/login') }}" class="text-center">{{ trans('auth.forgot.login-link') }}</a>
</div>
<!-- /.col -->
<div class="col-xs-4">
<button id="forgot-button" class="btn btn-primary btn-block btn-flat">发送</button>
<button id="forgot-button" class="btn btn-primary btn-block btn-flat">{{ trans('auth.forgot.send') }}</button>
</div>
<!-- /.col -->
</div>

12
resources/views/auth/login.tpl
View File

@ -14,23 +14,23 @@
<form id="login-form">
<div class="form-group has-feedback">
<input id="email_or_username" type="email" class="form-control" placeholder="{{ trans('auth.login.identification') }}">
<input id="email_or_username" type="email" class="form-control" placeholder="{{ trans('auth.identification') }}">
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input id="password"type="password" class="form-control" placeholder="{{ trans('auth.login.password') }}">
<input id="password"type="password" class="form-control" placeholder="{{ trans('auth.password') }}">
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="row" id="captcha-form" style="{{ (session('login_fails') > 3) ? '' : 'display: none;' }}">
<div class="col-xs-8">
<div class="form-group has-feedback">
<input id="captcha" type="text" class="form-control" placeholder="{{ trans('auth.login.captcha') }}">
<input id="captcha" type="text" class="form-control" placeholder="{{ trans('auth.captcha') }}">
</div>
</div>
<!-- /.col -->
<div class="col-xs-4">
<img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="{{ trans('auth.login.change-captcha') }}" data-placement="top" data-toggle="tooltip">
<img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="{{ trans('auth.change-captcha') }}" data-placement="top" data-toggle="tooltip">
</div>
<!-- /.col -->
</div>
@ -53,8 +53,8 @@
</div>
</form>
<a href="{{ url('auth/forgot') }}">{{ trans('auth.login.forgot-link') }}</a><br>
<a href="{{ url('auth/register') }}" class="text-center">{{ trans('auth.login.register-link') }}</a>
<a href="{{ url('auth/forgot') }}">{{ trans('auth.forgot-link') }}</a><br>
<a href="{{ url('auth/register') }}" class="text-center">{{ trans('auth.register-link') }}</a>
</div>
<!-- /.login-box-body -->

8
resources/views/auth/mail.tpl
View File

@ -6,19 +6,19 @@
<h1 style="margin:0 40px;color:#999;border-bottom:1px dotted #ddd;padding:40px 0 30px;text-align:center;font-size: 35px;font-family:Minecraft,'Helvetica Neue',Arial,'Microsoft Yahei','Microsoft Jhenghei',sans-serif">
{{ Option::get('site_name') }}
</h1>
<div style="padding:30px 40px 40px">您收到这封邮件，是因为在 <a style="color:#009a61;text-decoration:none" href="{{ Option::get('site_url') }}">我们网站</a> 的用户重置密码功能使用了您的地址。<br><br>
<div style="padding:30px 40px 40px">{!! trans('auth.mail.message', ['sitename' => "<a style='color:#009a61;text-decoration:none' href='".Option::get('site_url')."'>".Option::get('site_name')."</a>"]) !!}<br><br>
<div style="border-left:5px solid #ddd;padding:0 0 0 24px;color:#888">
如果您并没有访问过我们的网站，或没有进行上述操作，请忽略这封邮件。 您不需要退订或进行其他进一步的操作。
{{ trans('auth.mail.ignore') }}
</div>
</div>
<div style="background:#eee;border-top:1px solid #ddd;text-align:center;min-height:90px;line-height:90px">
<a href="{{ $reset_url }}" style="padding:8px 18px;background:#009a61;color:#fff;text-decoration:none;border-radius:3px" target="_blank">
重置密码 ➔
{{ trans('auth.mail.reset') }} ➔
</a>
</div>
</div>
<div style="padding-top:30px;text-align:center;font-size:12px;color:#999">
* 本邮件由系统自动发送，就算你回复了我们也不会回复你哦 <br>
* {{ trans('auth.mail.notice') }} <br>
</div>
</center>
</div>

22
resources/views/auth/register.tpl
View File

@ -1,6 +1,6 @@
@extends('auth.master')
@section('title', '注册')
@section('title', trans('auth.register.register'))
@section('content')
@ -10,36 +10,36 @@
</div>
<div class="register-box-body">
<p class="login-box-msg">欢迎使用 {{ Option::get('site_name') }}！</p>
<p class="login-box-msg">{{ trans('auth.register.message', ['sitename' => Option::get('site_name')]) }}</p>
<form id="register-form">
<div class="form-group has-feedback">
<input id="email" type="email" class="form-control" placeholder="邮箱">
<input id="email" type="email" class="form-control" placeholder="{{ trans('auth.email') }}">
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input id="password" type="password" class="form-control" placeholder="密码">
<input id="password" type="password" class="form-control" placeholder="{{ trans('auth.password') }}">
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input id="confirm-pwd" type="password" class="form-control" placeholder="重复一遍密码">
<input id="confirm-pwd" type="password" class="form-control" placeholder="{{ trans('auth.register.repeat-pwd') }}">
<span class="glyphicon glyphicon-log-in form-control-feedback"></span>
</div>
<div class="form-group has-feedback" title="昵称可使用汉字，随时可以修改" data-placement="top" data-toggle="tooltip">
<input id="nickname" type="text" class="form-control" placeholder="昵称">
<div class="form-group has-feedback" title="{{ trans('auth.register.nickname-intro') }}" data-placement="top" data-toggle="tooltip">
<input id="nickname" type="text" class="form-control" placeholder="{{ trans('auth.nickname') }}">
<span class="glyphicon glyphicon-pencil form-control-feedback"></span>
</div>
<div class="row">
<div class="col-xs-8">
<div class="form-group has-feedback">
<input id="captcha" type="text" class="form-control" placeholder="输入验证码">
<input id="captcha" type="text" class="form-control" placeholder="{{ trans('auth.captcha') }}">
</div>
</div>
<!-- /.col -->
<div class="col-xs-4">
<img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="点击以更换图片" data-placement="top" data-toggle="tooltip">
<img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="{{ trans('auth.change-captcha') }}" data-placement="top" data-toggle="tooltip">
</div>
<!-- /.col -->
</div>
@ -48,11 +48,11 @@
<div class="row">
<div class="col-xs-8">
<a href="{{ url('auth/login') }}" class="text-center">已经有账号了？登录</a>
<a href="{{ url('auth/login') }}" class="text-center">{{ trans('auth.login-link') }}</a>
</div>
<!-- /.col -->
<div class="col-xs-4">
<button id="register-button" class="btn btn-primary btn-block btn-flat">注册</button>
<button id="register-button" class="btn btn-primary btn-block btn-flat">{{ trans('auth.register.register') }}</button>
</div>
<!-- /.col -->
</div>

10
resources/views/auth/reset.tpl
View File

@ -1,6 +1,6 @@
@extends('auth.master')
@section('title', '重置密码')
@section('title', trans('auth.forgot.reset'))
@section('content')
@ -10,17 +10,17 @@
</div>
<div class="login-box-body">
<p class="login-box-msg">{{ $user->getNickName() }}，在这重置你的密码</p>
<p class="login-box-msg">{{ trans('auth.reset.message', ['username' => $user->getNickName()]) }}</p>
<form id="login-form">
<input id="uid" type="hidden" value="{{ $user->uid }}" />
<div class="form-group has-feedback">
<input id="password" type="password" class="form-control" placeholder="密码">
<input id="password" type="password" class="form-control" placeholder="{{ trans('auth.password') }}">
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input id="confirm-pwd" type="password" class="form-control" placeholder="重复一遍密码">
<input id="confirm-pwd" type="password" class="form-control" placeholder="{{ trans('auth.register.repeat-pwd') }}">
<span class="glyphicon glyphicon-log-in form-control-feedback"></span>
</div>
@ -31,7 +31,7 @@
</div>
<!-- /.col -->
<div class="col-xs-4">
<button id="reset-button" class="btn btn-primary btn-block btn-flat">重置</button>
<button id="reset-button" class="btn btn-primary btn-block btn-flat">{{ trans('auth.reset.reset') }}</button>
</div>
<!-- /.col -->
</div>