finish i18n of setup

This commit is contained in:
printempw 2016-12-30 17:44:53 +08:00
parent 866ce9a04f
commit dbef0b0efd
9 changed files with 63 additions and 67 deletions

View File

@ -83,11 +83,19 @@ class SetupController extends Controller
public function info()
{
if (self::checkTablesExist()) {
return view('setup.locked');
}
return view('setup.wizard.info');
}
public function finish(Request $request)
{
if (self::checkTablesExist()) {
return view('setup.locked');
}
$this->validate($request, [
'email' => 'required|email',
'password' => 'required|min:6|max:16|confirmed',

View File

@ -1,6 +1,6 @@
database:
connection-error: Unable to connect to MySQL server, please check your configuration. :msg
connection-success: Successfully connected to :server , just click NEXT to start installation.
connection-error: Unable to connect to the target database, please check your configuration. The server replied with this :msg.
connection-success: Connect to the target database [:server] successfully, just click NEXT to start installation.
file:
permission-error: Unable to create textures folder, please check the directory permissions or place one manually.
@ -10,9 +10,9 @@ permissions:
storage: Unable to write to storage directory, please check the permissions.
locked:
title: Installed
title: Already installed
text: You appear to have already installed Blessing Skin Server. To reinstall please clear your old database tables first, or use a new database table prefix.
back-to-index: Back to index
button: Back to homepage
updates:
master:
@ -30,29 +30,27 @@ updates:
tip-update: Tips of updating
wizard:
info:
title: Providing information
button: Start installation
tip-info: Please provide the following information. Don't worry, you can always change these settings later.
admin-email: E-mail address of administrator
super-admin: This is the only one administrator account, which can ADD or CANCEL other administrators.
password: Password
tip-important: 'Important:'
password-saving: You will need this password to log in. Please store it in a secure location.
password-confirmation: Confirm password
site-name: Site name
site-name-show: will be showed in index and title.
master:
title: Install Wizard - Blessing Skin Server
welcome:
title: Welcom
title: Welcome
button: Next
welcome: Welcome to Blessing Skin Server
text: Welcome to Blessing Skin Server v:version!
master:
title: Blessing Skin Server Installation
info:
title: Information needed
button: Run install
text: To proceed with the installation fill this form with the details of the initial admin account. Don't worry, you can always change these settings later.
admin-email: Admin Email
admin-notice: This is the <b>UNIQUE</b> super admin account who can GIVE or CANCEL other users' admin privilege.
password: Password
pwd-notice: <b>Attention:</b> You will need the password to log in. Please keep it at a secure place.
confirm-pwd: Confirm password
site-name: Site name
site-name-notice: This will be shown at title bar and homepage.
finish:
title: Success!
success: Blessing Skin Server has been installed. Thank you, and enjoy!
email: E-mail
password: Password
title: Installation complete
text: Blessing Skin Server has been installed. Thank you, and enjoy!

View File

@ -1,6 +1,6 @@
database:
connection-error: 无法连接至 MySQL 服务器,请检查你的配置 :msg
connection-success: 成功连接至 MySQL 服务器 :server ,点击下一步以开始安装。
connection-success: 成功连接至 MySQL 服务器 [:server] ,点击下一步以开始安装。
file:
permission-error: textures 文件夹创建失败,请确认目录权限是否正确,或者手动放置一个。
@ -11,8 +11,8 @@ permissions:
locked:
title: 已安装过
text: 看起来已经安装妥当。如果想重新安装,请删除数据库中的旧数据表,或者换一个数据表前缀。
back-to-index: 返回首页
text: Blessing Skin Server 看起来已经安装妥当。如果想重新安装,请删除数据库中的旧数据表,或者换一个数据表前缀。
button: 返回首页
updates:
master:
@ -30,29 +30,27 @@ updates:
tip-update: 升级提示:
wizard:
info:
title: 填写信息
button: 开始安装
tip-info: 您需要填写一些基本信息。无需担心填错,这些信息以后可以再次修改。
admin-email: 管理员邮箱
super-admin: 这是唯一的超级管理员账号,可 添加/取消 其他管理员。
password: 密码
tip-important: 重要:
password-saving: 您将需要此密码来登录管理皮肤站,请将其保存在安全的位置。
password-confirmation: 重复密码
site-name: 站点名称
site-name-show: 将会显示在首页以及标题栏
master:
title: Blessing Skin Server 安装程序
welcome:
title: 欢迎
button: 下一步
welcome: 欢迎使用 Blessing Skin Server
text: 欢迎使用 Blessing Skin Server v:version
master:
title: Blessing Skin Server 安装程序
info:
title: 填写信息
button: 开始安装
text: 您需要填写一些基本信息。无需担心填错,这些信息以后可以再次修改。
admin-email: 管理员邮箱
admin-notice: 这是<b>唯一</b>的超级管理员账号,可 添加/取消 其他管理员。
password: 密码
pwd-notice: <b>重要:</b>您将需要此密码来登录管理皮肤站,请将其保存在安全的位置。
confirm-pwd: 重复密码
site-name: 站点名称
site-name-notice: 将会显示在首页以及标题栏
finish:
title: 成功!
title: 安装成功!
success: Blessing Skin Server 安装完成。您是否还沉浸在愉悦的安装过程中?很遗憾,一切皆已完成! :)
email: 邮箱
password: 密码

View File

@ -37,7 +37,7 @@ td#description {
<th>{{ trans('admin.plugins.author') }}</th>
<th>{{ trans('admin.plugins.version') }}</th>
<th>{{ trans('admin.plugins.status') }}</th>
<th>{{ trans('admin.plugins.opration') }}</th>
<th>{{ trans('admin.plugins.operation') }}</th>
</tr>
</thead>

View File

@ -18,7 +18,7 @@
<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.password') }}">
<input id="password" type="password" class="form-control" placeholder="{{ trans('auth.password') }}">
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>

View File

@ -3,8 +3,8 @@
@section('content')
<h1>{{ trans('setup.locked.title') }}</h1>
<p>Blessing Skin Server {{ trans('setup.locked.text') }}</p>
<p>{{ trans('setup.locked.text') }}</p>
<p class="step">
<a href="{{ url('/') }}" class="button button-large">{{ trans('setup.locked.back-to-index') }}</a>
<a href="{{ url('/') }}" class="button button-large">{{ trans('setup.locked.button') }}</a>
</p>
@endsection

View File

@ -2,15 +2,15 @@
@section('content')
<h1>{{ trans('setup.wizard.finish.title') }}</h1>
<p>{{ trans('setup.wizard.finish.text') }}</p>
<p>{{ trans('setup.wizard.finish.success') }}</p>
<table class="form-table install-success">
<tr>
<th>{{ trans('setup.wizard.finish.email') }}</th>
<th>{{ trans('auth.email') }}</th>
<td>{{ $email }}</td>
</tr>
<tr>
<th>{{ trans('setup.wizard.finish.password') }}</th>
<th>{{ trans('auth.password') }}</th>
<td><p><em>{{ $password }}</em></p></td>
</tr>
</table>

View File

@ -2,7 +2,7 @@
@section('content')
<h1>{{ trans('setup.wizard.info.title') }}</h1>
<p>{{ trans('setup.wizard.info.tip-info') }}</p>
<p>{{ trans('setup.wizard.info.text') }}</p>
<form id="setup" method="post" action="{{ url('setup/finish') }}" novalidate="novalidate">
<table class="form-table">
@ -10,22 +10,18 @@
<th scope="row"><label for="email">{{ trans('setup.wizard.info.admin-email') }}</label></th>
<td>
<input name="email" type="email" id="email" size="25" value="" />
<p>{{ trans('setup.wizard.info.super-admin') }}</p>
<p>{!! trans('setup.wizard.info.admin-notice') !!}</p>
</td>
</tr>
<tr class="form-field form-required">
<th scope="row"><label for="password">{{ trans('setup.wizard.info.password') }}</label></th>
<td>
<input type="password" name="password" id="password" class="regular-text" autocomplete="off" />
<p>
<span class="description important">
<b>{{ trans('setup.wizard.info.tip-important') }}</b>{{ trans('setup.wizard.info.password-saving') }}
</span>
</p>
<p>{!! trans('setup.wizard.info.pwd-notice') !!}</p>
</td>
</tr>
<tr class="form-field form-required">
<th scope="row"><label for="password_confirmation">{{ trans('setup.wizard.info.password-confirmation') }}</label></th>
<th scope="row"><label for="password_confirmation">{{ trans('setup.wizard.info.confirm-pwd') }}</label></th>
<td>
<input type="password" name="password_confirmation" id="password_confirmation" autocomplete="off" />
</td>
@ -34,11 +30,7 @@
<th scope="row"><label for="site_name">{{ trans('setup.wizard.info.site-name') }}</label></th>
<td>
<input name="site_name" type="text" id="site_name" size="25" value="Blessing Skin Server" />
<p>
<span class="description important">
{{ trans('setup.wizard.info.site-name-show') }}
</span>
</p>
<p>{{ trans('setup.wizard.info.site-name-notice') }}</p>
</td>
</tr>
</table>

View File

@ -3,8 +3,8 @@
@section('content')
<h1>{{ trans('setup.wizard.welcome.title') }}</h1>
<p>{{ trans('setup.wizard.welcome.welcome') }} v{{ config('app.version') }}</p>
<p>{{ trans('setup.wizard.database.connection-success', ['server' => $server]) }}</p>
<p>{{ trans('setup.wizard.welcome.text', ['version' => config('app.version')]) }}</p>
<p>{{ trans('setup.database.connection-success', ['server' => $server]) }}</p>
<p class="step">
<a href="{{ url('setup/info') }}" class="button button-large">{{ trans('setup.wizard.welcome.button') }}</a>