deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

fix translation key collision - for #9251

Browse source
This commit is contained in:
Thibault Duplessis 2021-06-28 22:47:16 +02:00
parent 778e8a667e
commit 3ef906b98d
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/views/swiss/form.scala
View file

@ -87,7 +87,7 @@ object form {
)
}
private def condition(form: Form[_], fields: SwissFields, swiss: Option[Swiss])(implicit ctx: Context) =
private def condition(form: Form[_], fields: SwissFields, swiss: Option[Swiss])(implicit ctx: Context) =
frag(
form3.split(
form3.group(form("conditions.nbRatedGame.nb"), trans.minimumRatedGames(), half = true)(
@ -133,8 +133,8 @@ final private class SwissFields(form: Form[_], swiss: Option[Swiss])(implicit ct
def nbRounds =
form3.group(
form("nbRounds"),
trans.swiss.nbRounds(),
help = trans.swiss.nbRoundsHelp().some,
trans.swiss.numberOfRounds(),
help = trans.swiss.numberOfRoundsHelp().some,
half = true
)(
form3.input(_, typ = "number")
@ -183,7 +183,8 @@ final private class SwissFields(form: Form[_], swiss: Option[Swiss])(implicit ct
trans.startPosition(),
klass = "position",
half = true,
help = trans.positionInputHelp(a(href := routes.Editor.index, targetBlank)(trans.boardEditor.txt())).some
help =
trans.positionInputHelp(a(href := routes.Editor.index, targetBlank)(trans.boardEditor.txt())).some
)(form3.input(_))
def startsAt =
form3.group(

4
modules/i18n/src/main/I18nKeys.scala
View file

@ -1881,8 +1881,8 @@ val `roundsAreStartedManually` = new I18nKey("swiss:roundsAreStartedManually")
val `startingIn` = new I18nKey("swiss:startingIn")
val `nextRound` = new I18nKey("swiss:nextRound")
val `tournStartDate` = new I18nKey("swiss:tournStartDate")
val `nbRounds` = new I18nKey("swiss:nbRounds")
val `nbRoundsHelp` = new I18nKey("swiss:nbRoundsHelp")
val `numberOfRounds` = new I18nKey("swiss:numberOfRounds")
val `numberOfRoundsHelp` = new I18nKey("swiss:numberOfRoundsHelp")
val `roundInterval` = new I18nKey("swiss:roundInterval")
val `forbiddenPairings` = new I18nKey("swiss:forbiddenPairings")
val `forbiddenPairingsHelp` = new I18nKey("swiss:forbiddenPairingsHelp")

4
translation/source/swiss.xml
View file

@ -28,8 +28,8 @@
<item quantity="other">Ongoing games</item>
</plurals>
<string name="tournStartDate">Tournament start date</string>
<string name="nbRounds">Number of rounds</string>
<string name="nbRoundsHelp">An odd number of rounds allows optimal color balance.</string>
<string name="numberOfRounds">Number of rounds</string>
<string name="numberOfRoundsHelp">An odd number of rounds allows optimal color balance.</string>
<string name="roundInterval">Interval between rounds</string>
<string name="forbiddenPairings">Forbidden pairings</string>
<string name="forbiddenPairingsHelp">Usernames of players that must not play together (Siblings, for instance). Two usernames per line, separated by a space.</string>