deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

i18n: split xVsYinZ (fixes #5486)

pre-lobbyRemoteSocket
Niklas Fiekas 2019-09-04 10:27:57 +02:00
parent 2021392bb4
commit f32198ae62
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/timeline.scala
View File

@ -63,7 +63,11 @@ object timeline {
a(href := routes.Simul.show(simulId))(simulName) a(href := routes.Simul.show(simulId))(simulName)
) )
case GameEnd(playerId, opponent, win, perfKey) => lila.rating.PerfType(perfKey) map { perf => case GameEnd(playerId, opponent, win, perfKey) => lila.rating.PerfType(perfKey) map { perf =>
trans.xVsYinZ( (win match {
case Some(true) => trans.victoryVsYInZ
case Some(false) => trans.defeatVsYInZ
case None => trans.drawVsYInZ
})(
a( a(
href := routes.Round.player(playerId), href := routes.Round.player(playerId),
dataIcon := perf.iconChar, dataIcon := perf.iconChar,
@ -71,7 +75,7 @@ object timeline {
)(win match { )(win match {
case Some(true) => trans.victory() case Some(true) => trans.victory()
case Some(false) => trans.defeat() case Some(false) => trans.defeat()
case _ => trans.draw() case None => trans.draw()
}), }),
userIdLink(opponent, withOnline = false), userIdLink(opponent, withOnline = false),
perf.name perf.name

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

@ -484,7 +484,9 @@ val `xAnsweredY` = new Translated("xAnsweredY", Site)
val `xCommentedY` = new Translated("xCommentedY", Site) val `xCommentedY` = new Translated("xCommentedY", Site)
val `victory` = new Translated("victory", Site) val `victory` = new Translated("victory", Site)
val `defeat` = new Translated("defeat", Site) val `defeat` = new Translated("defeat", Site)
val `xVsYinZ` = new Translated("xVsYinZ", Site) val `victoryVsYInZ` = new Translated("victoryVsYInZ", Site)
val `defeatVsYInZ` = new Translated("defeatVsYInZ", Site)
val `drawVsYInZ` = new Translated("drawVsYInZ", Site)
val `timeline` = new Translated("timeline", Site) val `timeline` = new Translated("timeline", Site)
val `starting` = new Translated("starting", Site) val `starting` = new Translated("starting", Site)
val `allInformationIsPublicAndOptional` = new Translated("allInformationIsPublicAndOptional", Site) val `allInformationIsPublicAndOptional` = new Translated("allInformationIsPublicAndOptional", Site)

4
translation/source/site.xml
View File

@ -589,7 +589,9 @@ computer analysis, game chat and shareable URL.</string>
<string name="xCommentedY">%1$s commented %2$s</string> <string name="xCommentedY">%1$s commented %2$s</string>
<string name="victory">Victory</string> <string name="victory">Victory</string>
<string name="defeat">Defeat</string> <string name="defeat">Defeat</string>
<string name="xVsYinZ">%1$s vs %2$s in %3$s</string> <string name="victoryVsYInZ">%1$s vs %2$s in %3$s</string>
<string name="defeatVsYInZ">%1$s vs %2$s in %3$s</string>
<string name="drawVsYInZ">%1$s vs %2$s in %3$s</string>
<string name="timeline">Timeline</string> <string name="timeline">Timeline</string>
<string name="starting">Starting:</string> <string name="starting">Starting:</string>
<string name="allInformationIsPublicAndOptional">All information is public and optional.</string> <string name="allInformationIsPublicAndOptional">All information is public and optional.</string>