Merge pull request #1031 from wknet123/dev-refine-messages

Updates for refining some i18n messages.
This commit is contained in:
Daniel Jiang 2016-11-08 14:39:00 +08:00 committed by GitHub
commit f715ec8ed3
3 changed files with 9 additions and 9 deletions

View File

@ -182,7 +182,7 @@
function deleteProjectFailed(data, status) {
$scope.$emit('modalTitle', $filter('tr')('error'));
if(status === 412) {
$scope.$emit('modalMessage', $filter('tr')('failed_to_delete_project_contains_repo'));
$scope.$emit('modalMessage', $filter('tr')('failed_to_delete_project'));
}
if(status === 403) {
$scope.$emit('modalMessage', $filter('tr')('failed_to_delete_project_insuffient_permissions'));

View File

@ -52,9 +52,9 @@ var locale_messages = {
'full_name_is_too_long': 'Full name is too long. (maximum 20 characters)',
'full_name_contains_illegal_chars': 'Full name contains illegal character(s).',
'password': 'Password',
'password_desc': 'At least 8 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.',
'password_desc': 'At least 8 characters, less than 20 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.',
'password_is_required': 'Password is required.',
'password_is_invalid': 'Password is invalid. At least 8 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.',
'password_is_invalid': 'Password is invalid. At least 8 characters, less than 20 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.',
'confirm_password': 'Confirm Password',
'password_does_not_match': 'Passwords do not match.',
'comments': 'Comments',
@ -120,7 +120,7 @@ var locale_messages = {
'old_password_is_required': 'Old password is required.',
'old_password_is_incorrect': 'Old password is incorrect.',
'new_password_is_required': 'New password is required.',
'new_password_is_invalid': 'New password is invalid. At least 8 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.',
'new_password_is_invalid': 'New password is invalid. At least 8 characters, less than 20 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.',
'new_password': 'New Password',
'username_already_exist': 'Username already exist.',
'username_does_not_exist': 'Username does not exist.',
@ -150,7 +150,7 @@ var locale_messages = {
'failed_to_add_member': 'Project member can not be added, insuffient permissions.',
'failed_to_change_member': 'Project member can not be changed, insuffient permissions.',
'failed_to_delete_member': 'Project member can not be deleted, insuffient permissions.',
'failed_to_delete_project_contains_repo': 'Project contains repositories, can not be deleted.',
'failed_to_delete_project': 'Project contains repositories or replication policies can not be deleted.',
'failed_to_delete_project_insuffient_permissions': 'Project can not be deleted, insuffient permissions.',
'confirm_delete_project_title': 'Project Deletion',
'confirm_delete_project': 'Are you sure to delete the project "$0" ?',

View File

@ -52,9 +52,9 @@ var locale_messages = {
'full_name_is_too_long' : '全名长度超出限制。最长为20个字符',
'full_name_contains_illegal_chars' : '全名包含不合法的字符。',
'password': '密码',
'password_desc': '至少输入 8个字符且包含 1个小写字母 1个大写字母和 1个数字。',
'password_desc': '至少输入 8个字符最长为20个字符且包含 1个小写字母 1个大写字母和 1个数字。',
'password_is_required' : '密码为必填项。',
'password_is_invalid' : '密码无效。至少输入 8个字符且包含 1个小写字母1个大写字母和 1个数字。',
'password_is_invalid' : '密码无效。至少输入 8个字符最长为20个字符且包含 1个小写字母1个大写字母和 1个数字。',
'confirm_password': '确认密码',
'password_does_not_match' : '两次密码输入不一致。',
'comments': '备注',
@ -120,7 +120,7 @@ var locale_messages = {
'old_password_is_required': '原密码为必填项。',
'old_password_is_incorrect': '原密码不正确。',
'new_password_is_required': '新密码为必填项。',
'new_password_is_invalid': '新密码无效。至少输入 8个字符且包含 1个小写字母1个大写字母和 1个数字。',
'new_password_is_invalid': '新密码无效。至少输入 8个字符最长20个字符且包含 1个小写字母1个大写字母和 1个数字。',
'new_password': '新密码',
'username_already_exist': '用户名已存在。',
'username_does_not_exist': '用户名不存在。',
@ -149,7 +149,7 @@ var locale_messages = {
'failed_to_add_member': '无法添加项目成员,权限不足。',
'failed_to_change_member': '无法修改项目成员,权限不足。',
'failed_to_delete_member': '无法删除项目成员,权限不足。',
'failed_to_delete_project_contains_repo': '项目包含镜像仓库,无法删除。',
'failed_to_delete_project': '项目包含镜像仓库或复制策略,无法删除。',
'failed_to_delete_project_insuffient_permissions': '无法删除项目,权限不足。',
'confirm_delete_project_title': '删除项目',
'confirm_delete_project': '确认删除项目 "$0" ?',