Merge branch 'V20220228' into opt-notebook

templates/org/home.tmpl

@@ -78,7 +78,7 @@
 												{{if le .NumRepos 1}}
 													{{$.i18n.Tr "org.lower_repository"}}
 												{{else}}
-													{{$.i18n.Tr "org.lower_repository"}}
+													{{$.i18n.Tr "org.lower_repositories"}}
 												{{end}}
 											</a>
 										</p>

templates/org/home_courses.tmpl

@@ -232,7 +232,7 @@
 													{{if le .NumRepos 1}}
 														{{$.i18n.Tr "org.lower_repository"}}
 													{{else}}
-														{{$.i18n.Tr "org.lower_repository"}}
+														{{$.i18n.Tr "org.lower_repositories"}}
 													{{end}}
 												</a>
 											</p>

templates/org/team/courseTeams.tmpl

@@ -44,7 +44,19 @@
 							{{end}}
 						</div>
 						<div class="ui bottom attached header">
-							<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
+							<p class="team-meta">{{.NumMembers}} 
+								{{if le .NumMembers 1}}
+									{{$.i18n.Tr "org.lower_member"}}
+								{{else}}
+									{{$.i18n.Tr "org.lower_members"}}
+								{{end}}
+								· {{.NumRepos}} 
+								{{if le .NumRepos 1}}
+									{{$.i18n.Tr "org.lower_repository"}}
+								{{else}}
+									{{$.i18n.Tr "org.lower_repositories"}}
+								{{end}}
+							</p>
 						</div>
 					</div>
 			{{end}}

templates/org/team/teams.tmpl

@@ -36,7 +36,19 @@
 							{{end}}
 						</div>
 						<div class="ui bottom attached header">
-							<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
+							<p class="team-meta">{{.NumMembers}} 
+								{{if le .NumMembers 1}}
+									{{$.i18n.Tr "org.lower_member"}}
+								{{else}}
+									{{$.i18n.Tr "org.lower_members"}}
+								{{end}}
+								· {{.NumRepos}} 
+								{{if le .NumRepos 1}}
+									{{$.i18n.Tr "org.lower_repository"}}
+								{{else}}
+									{{$.i18n.Tr "org.lower_repositories"}}
+								{{end}}
+							</p>
 						</div>
 					</div>
 			{{end}}