diff --git a/app/models/message_template.rb b/app/models/message_template.rb index 0f1f3a580..c9812e511 100644 --- a/app/models/message_template.rb +++ b/app/models/message_template.rb @@ -65,7 +65,7 @@ class MessageTemplate < ApplicationRecord email_html = File.read("#{email_template_html_dir}/pull_request_merged.html") self.create(type: 'MessageTemplate::PullRequestMerged', sys_notice: '你提交的合并请求:{title} 已通过', email: email_html, email_title: 'GitLink: 合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}') email_html = File.read("#{email_template_html_dir}/team_joined.html") - self.create(type: 'MessageTemplate::TeamJoined', sys_notice: '你已被拉入组织 {organization} 的 {team} 团队,拥有 {role}', email: email_html, email_title: 'GitLink: 在 {organization} 组织你的账号有权限变更', notification_url: '{baseurl}/{login}') + self.create(type: 'MessageTemplate::TeamJoined', sys_notice: '你已被拉入组织 {organization} 的 {team} 团队,拥有{role}权限', email: email_html, email_title: 'GitLink: 在 {organization} 组织你的账号有权限变更', notification_url: '{baseurl}/{login}') email_html = File.read("#{email_template_html_dir}/team_left.html") self.create(type: 'MessageTemplate::TeamLeft', sys_notice: '你已被移出组织 {organization} 的 {team} 团队', email: email_html, email_title: 'GitLink: 在 {organization} 组织你的账号有权限变更', notification_url: '{baseurl}/{login}') end diff --git a/app/models/team.rb b/app/models/team.rb index 8cb94ac28..c2e633380 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -56,10 +56,10 @@ class Team < ApplicationRecord def authorize_name case self.authorize - when 'read' then '读取权限' - when 'write' then '写入权限' - when 'admin' then '管理员权限' - when 'owner' then '管理员权限' + when 'read' then '读取' + when 'write' then '写入' + when 'admin' then '管理员' + when 'owner' then '管理员' else '' end diff --git a/public/message_template/team_joined.html b/public/message_template/team_joined.html index 78496cced..231f8b795 100755 --- a/public/message_template/team_joined.html +++ b/public/message_template/team_joined.html @@ -31,7 +31,7 @@
{receiver},您好!
- 你已被拉入组织 {organization} 的 {team} 团队,拥有 {role}
+ 你已被拉入组织 {organization} 的 {team} 团队,拥有{role}权限