Browse Source

fix-1453 修改国际化组织成员数 项目数为1时,改为单数

pull/1511/head
wangjr 3 years ago
parent
commit
11d80da292
4 changed files with 33 additions and 4 deletions
  1. +3
    -0
      options/locale/locale_en-US.ini
  2. +2
    -0
      options/locale/locale_zh-CN.ini
  3. +14
    -2
      templates/org/home.tmpl
  4. +14
    -2
      templates/org/home_courses.tmpl

+ 3
- 0
options/locale/locale_en-US.ini View File

@@ -2059,6 +2059,9 @@ people = People
teams = Teams teams = Teams
lower_members = members lower_members = members
lower_repositories = repositories lower_repositories = repositories
lower_member=member
lower_repository = repository

create_new_team = New Team create_new_team = New Team
create_team = Create Team create_team = Create Team
org_desc = Description org_desc = Description


+ 2
- 0
options/locale/locale_zh-CN.ini View File

@@ -2069,6 +2069,8 @@ people=组织成员
teams=组织团队 teams=组织团队
lower_members=名成员 lower_members=名成员
lower_repositories=个项目 lower_repositories=个项目
lower_member=名成员
lower_repository=个项目
create_new_team=新建团队 create_new_team=新建团队
create_team=创建团队 create_team=创建团队
org_desc=组织描述 org_desc=组织描述


+ 14
- 2
templates/org/home.tmpl View File

@@ -67,8 +67,20 @@
<div class="item"> <div class="item">
<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a> <a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
<p class="text grey"> <p class="text grey">
<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> ·
<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a>
<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong>
{{if le .NumMembers 1}}
{{$.i18n.Tr "org.lower_member"}}
{{else}}
{{$.i18n.Tr "org.lower_members"}}
{{end}}
</a> ·
<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong>
{{if le .NumRepos 1}}
{{$.i18n.Tr "org.lower_repository"}}
{{else}}
{{$.i18n.Tr "org.lower_repository"}}
{{end}}
</a>
</p> </p>
</div> </div>
{{end}} {{end}}


+ 14
- 2
templates/org/home_courses.tmpl View File

@@ -221,8 +221,20 @@
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a> <a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
<p class="text grey"> <p class="text grey">
<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> ·
<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a>
<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong>
{{if le .NumMembers 1}}
{{$.i18n.Tr "org.lower_member"}}
{{else}}
{{$.i18n.Tr "org.lower_members"}}
{{end}}
</a> ·
<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong>
{{if le .NumRepos 1}}
{{$.i18n.Tr "org.lower_repository"}}
{{else}}
{{$.i18n.Tr "org.lower_repository"}}
{{end}}
</a>
</p> </p>
</div> </div>
{{end}} {{end}}


Loading…
Cancel
Save