diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index 420ab7cd57..6e17a4b9ce 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -1,37 +1,47 @@ gitlab = new stdclass; -$lang->gitlab->common = 'GitLab'; -$lang->gitlab->browse = 'GitLab Browse'; -$lang->gitlab->search = 'Search'; -$lang->gitlab->create = 'Create GitLab'; -$lang->gitlab->edit = 'Edit GitLab'; -$lang->gitlab->view = 'View GitLab'; -$lang->gitlab->bindUser = 'Bind User'; -$lang->gitlab->webhook = 'webhook'; -$lang->gitlab->bindProduct = 'Import Product'; -$lang->gitlab->importIssue = 'Import Issue'; -$lang->gitlab->delete = 'Delete GitLab'; -$lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; -$lang->gitlab->gitlabAccount = 'GitLab Account'; -$lang->gitlab->zentaoAccount = 'Zentao Account'; -$lang->gitlab->bindingStatus = 'Binding Status'; -$lang->gitlab->binded = 'Binded'; -$lang->gitlab->serverFail = 'Connect to GitLab server failed, please check the GitLab server.'; -$lang->gitlab->lastUpdate = 'Last Update'; -$lang->gitlab->confirmAddWebhook = 'Are you sure about creating Webhook?'; -$lang->gitlab->failCreateWebhook = 'Failed to create Webhook, please view the log'; -$lang->gitlab->manageProjectMembers = 'Manage project member'; -$lang->gitlab->placeholderSearch = 'Project name'; +$lang->gitlab->common = 'GitLab'; +$lang->gitlab->browse = 'GitLab Browse'; +$lang->gitlab->search = 'Search'; +$lang->gitlab->create = 'Create GitLab'; +$lang->gitlab->edit = 'Edit GitLab'; +$lang->gitlab->view = 'View GitLab'; +$lang->gitlab->bindUser = 'Bind User'; +$lang->gitlab->webhook = 'webhook'; +$lang->gitlab->bindProduct = 'Import Product'; +$lang->gitlab->importIssue = 'Import Issue'; +$lang->gitlab->delete = 'Delete GitLab'; +$lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; +$lang->gitlab->gitlabAccount = 'GitLab Account'; +$lang->gitlab->zentaoAccount = 'Zentao Account'; +$lang->gitlab->bindingStatus = 'Binding Status'; +$lang->gitlab->binded = 'Binded'; +$lang->gitlab->serverFail = 'Connect to GitLab server failed, please check the GitLab server.'; +$lang->gitlab->lastUpdate = 'Last Update'; +$lang->gitlab->confirmAddWebhook = 'Are you sure about creating Webhook?'; +$lang->gitlab->failCreateWebhook = 'Failed to create Webhook, please view the log'; +$lang->gitlab->placeholderSearch = 'Project name'; -$lang->gitlab->browseAction = 'GitLab List'; -$lang->gitlab->deleteAction = 'Delete GitLab'; -$lang->gitlab->gitlabProject = "GitLab Project"; -$lang->gitlab->browseProject = "GitLab Project List"; -$lang->gitlab->browseUser = "User List"; -$lang->gitlab->browseGroup = "Group List"; -$lang->gitlab->gitlabIssue = "GitLab Issue"; -$lang->gitlab->zentaoProduct = 'Zentao Product'; -$lang->gitlab->objectType = 'Type'; // task, bug, story +$lang->gitlab->browseAction = 'GitLab List'; +$lang->gitlab->deleteAction = 'Delete GitLab'; +$lang->gitlab->gitlabProject = "GitLab Project"; +$lang->gitlab->browseProject = "GitLab Project List"; +$lang->gitlab->browseUser = "User List"; +$lang->gitlab->browseGroup = "Group List"; +$lang->gitlab->gitlabIssue = "GitLab Issue"; +$lang->gitlab->zentaoProduct = 'Zentao Product'; +$lang->gitlab->objectType = 'Type'; // task, bug, story +$lang->gitlab->manageProjectMembers = 'Manage project member'; +$lang->gitlab->createProject = 'Create Gitlab project'; +$lang->gitlab->editProject = 'Eidt Gitlab project'; +$lang->gitlab->deleteProject = 'Delete Gitlab project'; +$lang->gitlab->createGroup = 'Create group'; +$lang->gitlab->editGroup = 'Edit group'; +$lang->gitlab->deleteGroup = 'Delete group'; +$lang->gitlab->createUser = 'Create user'; +$lang->gitlab->editUser = 'Edit user'; +$lang->gitlab->deleteUser = 'Delete user'; +$lang->gitlab->manageGroupMembers = 'Manage group member'; $lang->gitlab->id = 'ID'; $lang->gitlab->name = "GitLab Name"; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 64906056d2..d6bf4c0c5b 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -1,37 +1,47 @@ gitlab = new stdclass; -$lang->gitlab->common = 'GitLab'; -$lang->gitlab->browse = '浏览GitLab'; -$lang->gitlab->search = '搜索'; -$lang->gitlab->create = '添加GitLab'; -$lang->gitlab->edit = '编辑GitLab'; -$lang->gitlab->view = '查看GitLab'; -$lang->gitlab->bindUser = '绑定用户'; -$lang->gitlab->webhook = 'webhook'; -$lang->gitlab->bindProduct = '关联产品'; -$lang->gitlab->importIssue = '关联issue'; -$lang->gitlab->delete = '删除GitLab'; -$lang->gitlab->confirmDelete = '确认删除该GitLab吗?'; -$lang->gitlab->gitlabAccount = 'GitLab用户'; -$lang->gitlab->zentaoAccount = '禅道用户'; -$lang->gitlab->bindingStatus = '绑定状态'; -$lang->gitlab->binded = '已绑定'; -$lang->gitlab->serverFail = '连接GitLab服务器异常,请检查GitLab服务器。'; -$lang->gitlab->lastUpdate = '最后更新'; -$lang->gitlab->confirmAddWebhook = '您确定创建Webhook吗?'; -$lang->gitlab->failCreateWebhook = 'Webhook创建失败,请查看日志'; -$lang->gitlab->manageProjectMembers = '项目成员管理'; -$lang->gitlab->placeholderSearch = '请输入项目名称'; +$lang->gitlab->common = 'GitLab'; +$lang->gitlab->browse = '浏览GitLab'; +$lang->gitlab->search = '搜索'; +$lang->gitlab->create = '添加GitLab'; +$lang->gitlab->edit = '编辑GitLab'; +$lang->gitlab->view = '查看GitLab'; +$lang->gitlab->bindUser = '绑定用户'; +$lang->gitlab->webhook = 'webhook'; +$lang->gitlab->bindProduct = '关联产品'; +$lang->gitlab->importIssue = '关联issue'; +$lang->gitlab->delete = '删除GitLab'; +$lang->gitlab->confirmDelete = '确认删除该GitLab吗?'; +$lang->gitlab->gitlabAccount = 'GitLab用户'; +$lang->gitlab->zentaoAccount = '禅道用户'; +$lang->gitlab->bindingStatus = '绑定状态'; +$lang->gitlab->binded = '已绑定'; +$lang->gitlab->serverFail = '连接GitLab服务器异常,请检查GitLab服务器。'; +$lang->gitlab->lastUpdate = '最后更新'; +$lang->gitlab->confirmAddWebhook = '您确定创建Webhook吗?'; +$lang->gitlab->failCreateWebhook = 'Webhook创建失败,请查看日志'; +$lang->gitlab->placeholderSearch = '请输入项目名称'; -$lang->gitlab->browseAction = 'GitLab列表'; -$lang->gitlab->deleteAction = '删除GitLab'; -$lang->gitlab->gitlabProject = "{$lang->gitlab->common}项目"; -$lang->gitlab->browseProject = "{$lang->gitlab->common}项目列表"; -$lang->gitlab->browseUser = "用户列表"; -$lang->gitlab->browseGroup = "群组列表"; -$lang->gitlab->gitlabIssue = "{$lang->gitlab->common} issue"; -$lang->gitlab->zentaoProduct = '禅道产品'; -$lang->gitlab->objectType = '类型'; // task, bug, story +$lang->gitlab->browseAction = 'GitLab列表'; +$lang->gitlab->deleteAction = '删除GitLab'; +$lang->gitlab->gitlabProject = "{$lang->gitlab->common}项目"; +$lang->gitlab->browseProject = "{$lang->gitlab->common}项目列表"; +$lang->gitlab->browseUser = "用户列表"; +$lang->gitlab->browseGroup = "群组列表"; +$lang->gitlab->gitlabIssue = "{$lang->gitlab->common} issue"; +$lang->gitlab->zentaoProduct = '禅道产品'; +$lang->gitlab->objectType = '类型'; // task, bug, story +$lang->gitlab->manageProjectMembers = '项目成员管理'; +$lang->gitlab->createProject = '添加Gitlab项目'; +$lang->gitlab->editProject = '编辑Gitlab项目'; +$lang->gitlab->deleteProject = '删除Gitlab项目'; +$lang->gitlab->createGroup = '添加群组'; +$lang->gitlab->editGroup = '编辑群组'; +$lang->gitlab->deleteGroup = '删除群组'; +$lang->gitlab->createUser = '添加用户'; +$lang->gitlab->editUser = '编辑用户'; +$lang->gitlab->deleteUser = '删除用户'; +$lang->gitlab->manageGroupMembers = '群组成员管理'; $lang->gitlab->id = 'ID'; $lang->gitlab->name = "{$lang->gitlab->common}名称"; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 28f1996d28..88f24577ce 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1140,25 +1140,50 @@ $lang->svn->methodOrder[15] = 'apiSync'; /* GitLab. */ $lang->resource->gitlab = new stdclass(); -$lang->resource->gitlab->browse = 'browse'; -$lang->resource->gitlab->create = 'create'; -$lang->resource->gitlab->edit = 'edit'; -$lang->resource->gitlab->view = 'view'; -$lang->resource->gitlab->importIssue = 'importIssue'; -$lang->resource->gitlab->delete = 'delete'; -$lang->resource->gitlab->bindUser = 'bindUser'; -$lang->resource->gitlab->bindProduct = 'bindProduct'; +$lang->resource->gitlab->browse = 'browse'; +$lang->resource->gitlab->create = 'create'; +$lang->resource->gitlab->edit = 'edit'; +$lang->resource->gitlab->view = 'view'; +$lang->resource->gitlab->importIssue = 'importIssue'; +$lang->resource->gitlab->delete = 'delete'; +$lang->resource->gitlab->bindUser = 'bindUser'; +$lang->resource->gitlab->bindProduct = 'bindProduct'; +$lang->resource->gitlab->browseProject = 'browseProject'; +$lang->resource->gitlab->createProject = 'createProject'; +$lang->resource->gitlab->editProject = 'editProject'; +$lang->resource->gitlab->deleteProject = 'deleteProject'; +$lang->resource->gitlab->browseGroup = 'browseGroup'; +$lang->resource->gitlab->createGroup = 'createGroup'; +$lang->resource->gitlab->editGroup = 'editGroup'; +$lang->resource->gitlab->deleteGroup = 'deleteGroup'; +$lang->resource->gitlab->manageGroupMembers = 'manageGroupMembers'; +$lang->resource->gitlab->browseUser = 'browseUser'; +$lang->resource->gitlab->createUser = 'createUser'; +$lang->resource->gitlab->editUser = 'editUser'; +$lang->resource->gitlab->deleteUser = 'deleteUser'; +$lang->resource->gitlab->webhook = 'webhook'; -//$lang->resource->gitlab->webhook = 'webhook'; - -$lang->gitlab->methodOrder[5] = 'browse'; -$lang->gitlab->methodOrder[10] = 'create'; -$lang->gitlab->methodOrder[15] = 'edit'; -$lang->gitlab->methodOrder[20] = 'view'; -$lang->gitlab->methodOrder[25] = 'importIssue'; -$lang->gitlab->methodOrder[30] = 'delete'; -$lang->gitlab->methodOrder[35] = 'bindUser'; -//$lang->gitlab->methodOrder[45] = 'webhook'; +$lang->gitlab->methodOrder[5] = 'browse'; +$lang->gitlab->methodOrder[10] = 'create'; +$lang->gitlab->methodOrder[15] = 'edit'; +$lang->gitlab->methodOrder[20] = 'view'; +$lang->gitlab->methodOrder[25] = 'importIssue'; +$lang->gitlab->methodOrder[30] = 'delete'; +$lang->gitlab->methodOrder[35] = 'bindUser'; +$lang->gitlab->methodOrder[45] = 'browseProject'; +$lang->gitlab->methodOrder[50] = 'createProject'; +$lang->gitlab->methodOrder[55] = 'editProject'; +$lang->gitlab->methodOrder[60] = 'deleteProject'; +$lang->gitlab->methodOrder[65] = 'browseGroup'; +$lang->gitlab->methodOrder[70] = 'createGroup'; +$lang->gitlab->methodOrder[75] = 'editGroup'; +$lang->gitlab->methodOrder[80] = 'deleteGroup'; +$lang->gitlab->methodOrder[85] = 'manageGroupMembers'; +$lang->gitlab->methodOrder[90] = 'browseUser'; +$lang->gitlab->methodOrder[95] = 'createUser'; +$lang->gitlab->methodOrder[100] = 'editUser'; +$lang->gitlab->methodOrder[105] = 'deleteUser'; +$lang->gitlab->methodOrder[110] = 'webhook'; /* merge request. */ $lang->resource->mr = new stdclass();