deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

Merge pull request #7311 from greg-finley/timeout-draw-separator 

Change timeout draw separator
cash.js
Thibault Duplessis 2020-09-13 17:05:23 +02:00 committed by GitHub
parent 1e0a1964bc 0eec907886
commit a779099b63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/templating/GameHelper.scala
View File

@ -182,9 +182,9 @@ trait GameHelper { self: I18nHelper with UserHelper with AiHelper with StringHel
case S.Draw => trans.draw.txt()
case S.Outoftime => (game.turnColor, game.loser) match {
case (White, Some(_)) => trans.whiteTimeOut.txt()
case (White, None) => trans.whiteTimeOut.txt() + ". " + trans.draw.txt() + "."
case (White, None) => trans.whiteTimeOut.txt() + " • " + trans.draw.txt()
case (Black, Some(_)) => trans.blackTimeOut.txt()
case (Black, None) => trans.blackTimeOut.txt() + ". " + trans.draw.txt() + "."
case (Black, None) => trans.blackTimeOut.txt() + " • " + trans.draw.txt()
}
case S.NoStart =>
val color = game.loser.fold(Color.white)(_.color).name.capitalize

2
ui/game/src/view/status.ts
View File

@ -24,7 +24,7 @@ export default function status(ctrl: Ctrl): string {
case 'draw':
return noarg('draw');
case 'outoftime':
return `${d.game.turns % 2 === 0 ? noarg('whiteTimeOut') : noarg('blackTimeOut')}${!!d.game.winner ? '' : `. ${noarg('draw')}.`}`;
return `${d.game.turns % 2 === 0 ? noarg('whiteTimeOut') : noarg('blackTimeOut')}${!!d.game.winner ? '' : ` • ${noarg('draw')}`}`;
case 'noStart':
return (d.game.winner == 'white' ? 'Black' : 'White') + ' didn\'t move';
case 'cheat':