Merge pull request #6503 from kraktus/mes_forum

More translations for the forums

app/views/forum/topic.scala

@@ -27,18 +27,21 @@ object topic {
           categ.name
         ),
         st.section(cls := "warning")(
-          h2(dataIcon := "!", cls := "text")("Important"),
+          h2(dataIcon := "!", cls := "text")(trans.important()),
           p(
-            "Your question may already have an answer ",
-            strong(a(href := routes.Main.faq)("in the F.A.Q."))
+            trans.yourQuestionMayHaveBeenAnswered(
+              strong(a(href := routes.Main.faq)(trans.inTheFAQ()))
+            )
           ),
           p(
-            "To report a user for cheating or bad behaviour, ",
-            strong(a(href := routes.Report.form)("use the report form"))
+            trans.toReportSomeoneForCheatingOrBadBehavior(
+              strong(a(href := routes.Report.form)(trans.useTheReportForm()))
+            )
           ),
           p(
-            "To request support, ",
-            strong(a(href := routes.Main.contact())(raw("try the contact page")))
+            trans.toRequestSupport(
+              strong(a(href := routes.Main.contact())(trans.tryTheContactPage()))
+            )
           )
         ),
         postForm(cls := "form3", action := routes.ForumTopic.create(categ.slug))(
@@ -51,7 +54,7 @@ object topic {
             a(href := routes.ForumCateg.show(categ.slug))(trans.cancel()),
             isGranted(_.PublicMod) option
               form3.submit(
-                frag("Create as mod"),
+                frag("Create as a mod"),
                 nameValue = (form("post")("modIcon").name, "true").some,
                 icon = "".some
               ),
@@ -113,18 +116,18 @@ object topic {
         div(cls := "forum-topic__actions")(
           if (posts.hasNextPage) emptyFrag
           else if (topic.isOld)
-            p("This topic has been archived and can no longer be replied to.")
+            p(trans.thisTopicIsArchived())
           else if (formWithCaptcha.isDefined)
             h2(id := "reply")(trans.replyToThisTopic())
           else if (topic.closed) p(trans.thisTopicIsNowClosed())
           else
             teamOnly.map { teamId =>
               p(
-                "Join the ",
-                a(href := routes.Team.show(teamId))(teamIdToName(teamId), " team"),
-                " to post in this forum"
+                trans.joinTheTeamXToPost(
+                  a(href := routes.Team.show(teamId))(trans.teamNamedX(teamIdToName(teamId)))
+                )
               )
-            } getOrElse p("You can't post in the forums yet. Play some games!"),
+            } getOrElse p(trans.youCannotPostYetPlaySomeGames()),
           div(
             unsub.map { uns =>
               postForm(
@@ -132,10 +135,10 @@ object topic {
                 action := routes.Timeline.unsub(s"forum:${topic.id}")
               )(
                 button(cls := "button button-empty text on", dataIcon := "v", bits.dataUnsub := "off")(
-                  "Subscribe"
+                  trans.subscribe()
                 ),
                 button(cls := "button button-empty text off", dataIcon := "v", bits.dataUnsub := "on")(
-                  "Unsubscribe"
+                  trans.unsubscribe()
                 )
               )
             },
@@ -147,12 +150,14 @@ object topic {
               ),
             canModCateg option
               postForm(action := routes.ForumTopic.close(categ.slug, topic.slug))(
-                button(cls := "button button-empty button-red")(if (topic.closed) "Reopen" else "Close")
+                button(cls := "button button-empty button-red")(
+                  if (topic.closed) "Reopen" else "Close"
+                )
               ),
             canModCateg option
               postForm(action := routes.ForumTopic.sticky(categ.slug, topic.slug))(
                 button(cls := "button button-empty button-brag")(
-                  if (topic.isSticky) "Un-sticky" else "Sticky"
+                  if (topic.isSticky) "Unsticky" else "Sticky"
                 )
               )
           )
@@ -172,7 +177,7 @@ object topic {
                 a(href := routes.ForumCateg.show(categ.slug))(trans.cancel()),
                 isGranted(_.PublicMod) option
                   form3.submit(
-                    frag("Reply as mod"),
+                    frag("Reply as a mod"),
                     nameValue = (form("modIcon").name, "true").some,
                     icon = "".some
                   ),

modules/i18n/src/main/I18nKeys.scala

@@ -702,6 +702,19 @@ val `rapidDesc` = new I18nKey("rapidDesc")
 val `classicalDesc` = new I18nKey("classicalDesc")
 val `correspondenceDesc` = new I18nKey("correspondenceDesc")
 val `puzzleDesc` = new I18nKey("puzzleDesc")
+val `important` = new I18nKey("important")
+val `yourQuestionMayHaveBeenAnswered` = new I18nKey("yourQuestionMayHaveBeenAnswered")
+val `inTheFAQ` = new I18nKey("inTheFAQ")
+val `toReportSomeoneForCheatingOrBadBehavior` = new I18nKey("toReportSomeoneForCheatingOrBadBehavior")
+val `useTheReportForm` = new I18nKey("useTheReportForm")
+val `toRequestSupport` = new I18nKey("toRequestSupport")
+val `tryTheContactPage` = new I18nKey("tryTheContactPage")
+val `thisTopicIsArchived` = new I18nKey("thisTopicIsArchived")
+val `joinTheTeamXToPost` = new I18nKey("joinTheTeamXToPost")
+val `teamNamedX` = new I18nKey("teamNamedX")
+val `youCannotPostYetPlaySomeGames` = new I18nKey("youCannotPostYetPlaySomeGames")
+val `subscribe` = new I18nKey("subscribe")
+val `unsubscribe` = new I18nKey("unsubscribe")
 val `opponentLeftCounter` = new I18nKey("opponentLeftCounter")
 val `mateInXHalfMoves` = new I18nKey("mateInXHalfMoves")
 val `nextCaptureOrPawnMoveInXHalfMoves` = new I18nKey("nextCaptureOrPawnMoveInXHalfMoves")

translation/source/site.xml

@@ -851,4 +851,17 @@ computer analysis, game chat and shareable URL.</string>
   <string name="classicalDesc">Classical games: 25 minutes and more</string>
   <string name="correspondenceDesc">Correspondence games: one or several days per move</string>
   <string name="puzzleDesc">Chess tactics trainer</string>
+  <string name="important">Important</string>
+  <string name="yourQuestionMayHaveBeenAnswered">Your question may already have an answer %1$s</string>
+  <string name="inTheFAQ">in the F.A.Q.</string>
+  <string name="toReportSomeoneForCheatingOrBadBehavior">To report a user for cheating or bad behaviour, %1$s</string>
+  <string name="useTheReportForm">use the report form</string>
+  <string name="toRequestSupport">To request support, %1$s</string>
+  <string name="tryTheContactPage">try the contact page</string>
+  <string name="thisTopicIsArchived">This topic has been archived and can no longer be replied to.</string>
+  <string name="joinTheTeamXToPost">Join the %$1s, to post in this forum</string>
+  <string name="teamNamedX">%1$s team</string>
+  <string name="youCannotPostYetPlaySomeGames">You can't post in the forums yet. Play some games!</string>
+  <string name="subscribe">Subscribe</string>
+  <string name="unsubscribe">Unsubscribe</string>
 </resources>