From 602e52d9e60601a08b334207353a112dc49ec61d Mon Sep 17 00:00:00 2001 From: gplane Date: Wed, 26 Apr 2017 17:50:10 +0800 Subject: [PATCH] Fix displaying player name rule --- resources/assets/src/scripts/user.js | 4 ++-- resources/lang/en/locale.js | 1 - resources/lang/zh_CN/locale.js | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/assets/src/scripts/user.js b/resources/assets/src/scripts/user.js index fad8379d..43c44664 100644 --- a/resources/assets/src/scripts/user.js +++ b/resources/assets/src/scripts/user.js @@ -2,7 +2,7 @@ * @Author: printempw * @Date: 2016-07-16 10:02:24 * @Last Modified by: g-plane - * @Last Modified time: 2017-04-26 17:42:50 + * @Last Modified time: 2017-04-26 17:46:28 */ 'use strict'; @@ -354,7 +354,7 @@ $('body').on('change', '#preference', function() { function changePlayerName(pid, current_player_name) { swal({ title: trans('user.changePlayerName'), - text: trans('user.playerNameRule'), + text: $('#player_name').attr('placeholder'), inputValue: current_player_name, input: 'text', showCancelButton: true, diff --git a/resources/lang/en/locale.js b/resources/lang/en/locale.js index 5c5cd52f..f4f0bff6 100644 --- a/resources/lang/en/locale.js +++ b/resources/lang/en/locale.js @@ -82,7 +82,6 @@ // Player changePlayerName: 'Please enter the player name:', - playerNameRule: 'The player name should only contain letters, numbers, and dashes.', emptyPlayerName: 'Empty player name.', clearTexture: 'Sure to clear the skins & cape of this player?', deletePlayer: 'Sure to delete this player?', diff --git a/resources/lang/zh_CN/locale.js b/resources/lang/zh_CN/locale.js index 06099cdb..4994c04c 100644 --- a/resources/lang/zh_CN/locale.js +++ b/resources/lang/zh_CN/locale.js @@ -82,7 +82,6 @@ // Player changePlayerName: '请输入角色名：', - playerNameRule: '允许数字、字母以及下划线，是否支持中文角色名请参考本站设置', emptyPlayerName: '你还没有填写名称哦', clearTexture: '确定要重置该用户的皮肤/披风吗？', deletePlayer: '真的要删除该玩家吗？',