From ba4561deb7cacb6dd22124a76cc7635eac0091e5 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 22 Feb 2012 10:12:39 +0000 Subject: [PATCH] * add 3.0.bate2 version for group. + add admin new method name. --- module/admin/lang/en.php | 18 +++++++++++------- module/admin/lang/zh-cn.php | 18 +++++++++++------- module/admin/lang/zh-tw.php | 10 +++++----- module/admin/view/register.html.php | 10 +++++----- module/group/lang/en.php | 1 + module/group/lang/zh-cn.php | 1 + 6 files changed, 34 insertions(+), 24 deletions(-) diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index d5ce819ad2..78957a2220 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -16,6 +16,10 @@ $lang->admin->user = 'User'; $lang->admin->group = 'Group'; $lang->admin->welcome = 'Welcome to ZenTaoPMS.'; +$lang->admin->register = 'Register'; +$lang->admin->bind = 'Bind'; +$lang->admin->ignoreNotice = 'Ignore notice'; + $lang->admin->browseCompany = 'Browse Company'; $lang->admin->info->caption = 'ZentaoPMS information'; @@ -34,13 +38,13 @@ $lang->admin->info->account = 'Community account'; $lang->admin->notice->join = "Tips: You have not registered in Zentao community (www.zentao.net), %s to register and get the latest information about ZentaoPMS."; $lang->admin->notice->ignore = "ignore"; -$lang->admin->register->caption = 'Register zentao community'; -$lang->admin->register->join = 'click'; -$lang->admin->register->lblAccount = 'Numbers and letters, at least three'; -$lang->admin->register->lblPasswd = 'Numbers and letters, at least six'; -$lang->admin->register->submit = 'Register'; -$lang->admin->register->login = "If you have community account, %s to associate it"; -$lang->admin->register->success = "Register success"; +$lang->admin->reg->caption = 'Register zentao community'; +$lang->admin->reg->join = 'click'; +$lang->admin->reg->lblAccount = 'Numbers and letters, at least three'; +$lang->admin->reg->lblPasswd = 'Numbers and letters, at least six'; +$lang->admin->reg->submit = 'Register'; +$lang->admin->reg->login = "If you have community account, %s to associate it"; +$lang->admin->reg->success = "Register success"; $lang->admin->login->caption = 'Associated with community account'; $lang->admin->login->join = 'associate'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 4ed5566696..a8cb0ff081 100644 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -16,6 +16,10 @@ $lang->admin->user = '用户管理'; $lang->admin->group = '分组管理'; $lang->admin->welcome = '欢迎使用禅道管理软件后台管理系统'; +$lang->admin->register = '注册'; +$lang->admin->bind = '绑定'; +$lang->admin->ignoreNotice = '不再提示'; + $lang->admin->browseCompany = '浏览公司'; $lang->admin->info->caption = '禅道系统信息'; @@ -34,13 +38,13 @@ $lang->admin->info->account = '社区账号'; $lang->admin->notice->join = "友情提示：您还未在禅道社区(www.zentao.net)登记，%s进行登记，以及时获得禅道最新信息。"; $lang->admin->notice->ignore = "不再提示"; -$lang->admin->register->caption = '禅道社区登记'; -$lang->admin->register->join = '点击此处'; -$lang->admin->register->lblAccount = '请设置您的用户名，英文字母和数字的组合，三位以上。'; -$lang->admin->register->lblPasswd = '请设置您的密码。数字和字母的组合，六位以上。'; -$lang->admin->register->submit = '登记'; -$lang->admin->register->login = "如果您已经拥有社区账号，%s关联账户"; -$lang->admin->register->success = "登记账户成功"; +$lang->admin->reg->caption = '禅道社区登记'; +$lang->admin->reg->join = '点击此处'; +$lang->admin->reg->lblAccount = '请设置您的用户名，英文字母和数字的组合，三位以上。'; +$lang->admin->reg->lblPasswd = '请设置您的密码。数字和字母的组合，六位以上。'; +$lang->admin->reg->submit = '登记'; +$lang->admin->reg->login = "如果您已经拥有社区账号，%s关联账户"; +$lang->admin->reg->success = "登记账户成功"; $lang->admin->login->caption = '关联社区账号'; $lang->admin->login->join = '关联'; diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php index c15437a622..29c6b962fb 100644 --- a/module/admin/lang/zh-tw.php +++ b/module/admin/lang/zh-tw.php @@ -34,11 +34,11 @@ $lang->admin->info->account = '社區賬號'; $lang->admin->notice->join = "您的賬號未關聯到禪道社區，點擊%s可以新建社區賬號，系統贈送200積分。您還可以點擊%s社區賬號，系統贈送150積分。"; $lang->admin->notice->ignore = "不再提示"; -$lang->admin->register->caption = '註冊禪道社區'; -$lang->admin->register->join = '註冊'; -$lang->admin->register->lblAccount = '請設置您的用戶名，英文字母和數字的組合。'; -$lang->admin->register->lblPasswd = '請設置您的密碼。數字和字母的組合，六位以上。'; -$lang->admin->register->success = "登記成功"; +$lang->admin->reg->caption = '註冊禪道社區'; +$lang->admin->reg->join = '註冊'; +$lang->admin->reg->lblAccount = '請設置您的用戶名，英文字母和數字的組合。'; +$lang->admin->reg->lblPasswd = '請設置您的密碼。數字和字母的組合，六位以上。'; +$lang->admin->reg->success = "登記成功"; $lang->admin->login->caption = '關聯社區賬號'; $lang->admin->login->join = '關聯'; diff --git a/module/admin/view/register.html.php b/module/admin/view/register.html.php index 50f6acaa23..6cd1ab733c 100644 --- a/module/admin/view/register.html.php +++ b/module/admin/view/register.html.php @@ -13,10 +13,10 @@
- + - + @@ -36,7 +36,7 @@ - + diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 6682b306f1..911d421963 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -41,6 +41,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge'; $lang->group->copyOptions['copyUser'] = 'Copy user'; $lang->group->versions[''] = 'Show methods added in every release'; +$lang->group->versions['3.0.beta2'] = '3.0.beta2'; $lang->group->versions['3.0.beta1'] = '3.0.beta1'; $lang->group->versions['2.4'] = '2.4'; $lang->group->versions['2.3'] = '2.3'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 897b1b1851..3228f630d5 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -41,6 +41,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限'; $lang->group->copyOptions['copyUser'] = '复制用户'; $lang->group->versions[''] = '显示各版本新增权限'; +$lang->group->versions['3.0.beta2'] = '禅道3.0.beta2'; $lang->group->versions['3.0.beta1'] = '禅道3.0.beta1'; $lang->group->versions['2.4'] = '禅道2.4'; $lang->group->versions['2.3'] = '禅道2.3';
admin->register->caption;?>admin->reg->caption;?>
user->account;?>*' . $lang->admin->register->lblAccount;?>*' . $lang->admin->reg->lblAccount;?>
user->realname;?>
user->password;?>*' . $lang->admin->register->lblPasswd;?>*' . $lang->admin->reg->lblPasswd;?>
user->password2;?> @@ -46,8 +46,8 @@ admin->register->submit) . html::hidden('sn', $sn); - echo sprintf($lang->admin->register->login, html::a(inlink('bind'), $lang->admin->register->join)); + echo html::submitButton($lang->admin->reg->submit) . html::hidden('sn', $sn); + echo sprintf($lang->admin->reg->login, html::a(inlink('bind'), $lang->admin->reg->join)); ?>