Merge pull request #6417 from kraktus/trad_join_req

Various translation improvements for teams

app/views/team/bits.scala

@@ -14,7 +14,7 @@ object bits {
     st.nav(cls := "page-menu__menu subnav")(
       (ctx.teamNbRequests > 0) option
         a(cls := tab.active("requests"), href := routes.Team.requests())(
-          xJoinRequests(ctx.teamNbRequests)
+          xJoinRequests.pluralSame(ctx.teamNbRequests)
         ),
       ctx.isAuth option
         a(cls := tab.active("mine"), href := routes.Team.mine())(

app/views/team/request.scala

@@ -42,7 +42,7 @@ object request {
   }
 
   def all(requests: List[lila.team.RequestWithUser])(implicit ctx: Context) = {
-    val title = s"${requests.size} join requests"
+    val title = xJoinRequests.pluralSameTxt(requests.size)
     bits.layout(title = title) {
       main(cls := "page-menu")(
         bits.menu("requests".some),

app/views/team/show.scala

@@ -58,7 +58,7 @@ object show {
                 frag(br, trans.location(), ": ", richText(loc))
               },
               info.hasRequests option div(cls := "requests")(
-                h2(xJoinRequests(info.requests.size)),
+                h2(xJoinRequests.pluralSame(info.requests.size)),
                 views.html.team.request.list(info.requests, t.some)
               )
             ),
@@ -83,7 +83,7 @@ object show {
                 )(
                   span(
                     strong(teamBattle()),
-                    em("A battle of multiple teams, each players scores points for their team")
+                    em(teamBattleOverview())
                   )
                 ),
                 a(
@@ -92,8 +92,8 @@ object show {
                   dataIcon := "g"
                 )(
                   span(
-                    strong("Team tournament"),
-                    em("An Arena tournament that only members of your team can join")
+                    strong(teamTournament()),
+                    em(teamTournamentOverview())
                   )
                 ),
                 a(
@@ -102,8 +102,8 @@ object show {
                   dataIcon := "e"
                 )(
                   span(
-                    strong("Message all members"),
-                    em("Send a private message to every member of the team")
+                    strong(messageAllMembers()),
+                    em(messageAllMembersOverview())
                   )
                 )
               )

modules/i18n/src/main/I18nKeys.scala

@@ -1529,6 +1529,11 @@ val `changeOwner` = new I18nKey("team:changeOwner")
 val `willBeReviewed` = new I18nKey("team:willBeReviewed")
 val `beingReviewed` = new I18nKey("team:beingReviewed")
 val `teamBattle` = new I18nKey("team:teamBattle")
+val `teamBattleOverview` = new I18nKey("team:teamBattleOverview")
+val `teamTournament` = new I18nKey("team:teamTournament")
+val `teamTournamentOverview` = new I18nKey("team:teamTournamentOverview")
+val `messageAllMembers` = new I18nKey("team:messageAllMembers")
+val `messageAllMembersOverview` = new I18nKey("team:messageAllMembersOverview")
 val `nbMembers` = new I18nKey("team:nbMembers")
 val `xJoinRequests` = new I18nKey("team:xJoinRequests")
 }

translation/source/team.xml

@@ -29,4 +29,9 @@
   <string name="willBeReviewed">Your join request will be reviewed by the team leader.</string>
   <string name="beingReviewed">Your join request is being reviewed by the team leader.</string>
   <string name="teamBattle">Team Battle</string>
+  <string name="teamBattleOverview">A battle of multiple teams, each players scores points for their team</string>
+  <string name="teamTournament">Team tournament</string>
+  <string name="teamTournamentOverview">An Arena tournament that only members of your team can join</string>
+  <string name="messageAllMembers">Message all members</string>
+  <string name="messageAllMembersOverview">Send a private message to every member of the team</string>
 </resources>