From ef0b3c78440ea3eba886a6e74a260dd54c772dd7 Mon Sep 17 00:00:00 2001 From: Niklas Fiekas Date: Tue, 5 Dec 2017 13:42:15 +0100 Subject: [PATCH] translate advantage and movetime charts --- app/views/analyse/jsI18n.scala.html | 8 +++++++- modules/i18n/src/main/I18nKeys.scala | 5 +++++ public/javascripts/chart/acpl.js | 8 ++++---- public/javascripts/chart/division.js | 8 ++++---- public/javascripts/chart/movetime.js | 6 +++--- translation/source/site.xml | 8 ++++++++ ui/analyse/src/boot.js | 4 ++-- 7 files changed, 33 insertions(+), 14 deletions(-) diff --git a/app/views/analyse/jsI18n.scala.html b/app/views/analyse/jsI18n.scala.html index d939db1c17..aa419fe36c 100644 --- a/app/views/analyse/jsI18n.scala.html +++ b/app/views/analyse/jsI18n.scala.html @@ -129,5 +129,11 @@ trans.noGameFound, trans.maybeIncludeMoreGamesFromThePreferencesMenu, trans.winPreventedBy50MoveRule, trans.lossSavedBy50MoveRule, -trans.allSet +trans.allSet, +// advantage and movetime charts +trans.advantage, +trans.nbSeconds, +trans.opening, +trans.middlegame, +trans.endgame )) diff --git a/modules/i18n/src/main/I18nKeys.scala b/modules/i18n/src/main/I18nKeys.scala index 63c1f354b1..4e2b5724d9 100644 --- a/modules/i18n/src/main/I18nKeys.scala +++ b/modules/i18n/src/main/I18nKeys.scala @@ -675,6 +675,10 @@ val `doneReviewingBlackMistakes` = new Translated("doneReviewingBlackMistakes", val `doItAgain` = new Translated("doItAgain", Site) val `reviewWhiteMistakes` = new Translated("reviewWhiteMistakes", Site) val `reviewBlackMistakes` = new Translated("reviewBlackMistakes", Site) +val `advantage` = new Translated("advantage", Site) +val `opening` = new Translated("opening", Site) +val `middlegame` = new Translated("middlegame", Site) +val `endgame` = new Translated("endgame", Site) val `mateInXHalfMoves` = new Translated("mateInXHalfMoves", Site) val `nextCaptureOrPawnMoveInXHalfMoves` = new Translated("nextCaptureOrPawnMoveInXHalfMoves", Site) val `nbPlayers` = new Translated("nbPlayers", Site) @@ -706,6 +710,7 @@ val `blocks` = new Translated("blocks", Site) val `nbForumPosts` = new Translated("nbForumPosts", Site) val `nbPerfTypePlayersThisWeek` = new Translated("nbPerfTypePlayersThisWeek", Site) val `availableInNbLanguages` = new Translated("availableInNbLanguages", Site) +val `nbSeconds` = new Translated("nbSeconds", Site) object arena { val `isItRated` = new Translated("isItRated", Arena) diff --git a/public/javascripts/chart/acpl.js b/public/javascripts/chart/acpl.js index 821cd14bc9..8d3ac1c99e 100644 --- a/public/javascripts/chart/acpl.js +++ b/public/javascripts/chart/acpl.js @@ -1,7 +1,7 @@ function toBlurArray(player) { return player.blurs && player.blurs.bits ? player.blurs.bits.split('') : []; } -lichess.advantageChart = function(data) { +lichess.advantageChart = function(data, trans) { lichess.loadScript('/assets/javascripts/chart/common.js').done(function() { lichess.loadScript('/assets/javascripts/chart/division.js').done(function() { lichess.chartCommon('highchart').done(function() { @@ -62,7 +62,7 @@ lichess.advantageChart = function(data) { credits: disabled, legend: disabled, series: [{ - name: 'Advantage', + name: trans('advantage'), data: serieData }], chart: { @@ -112,7 +112,7 @@ lichess.advantageChart = function(data) { }, tooltip: { pointFormatter: function(format) { - format = format.replace('{series.name}', 'Advantage'); + format = format.replace('{series.name}', trans('advantage')); var eval = data.treeParts[this.x + 1].eval; if (!eval) return; else if (eval.mate) return format.replace('{point.y}', '#' + eval.mate); @@ -129,7 +129,7 @@ lichess.advantageChart = function(data) { labels: disabled, lineWidth: 0, tickWidth: 0, - plotLines: lichess.divisionLines(data.game.division) + plotLines: lichess.divisionLines(data.game.division, trans) }, yAxis: { title: noText, diff --git a/public/javascripts/chart/division.js b/public/javascripts/chart/division.js index 17d5c04b13..a6dc51dca2 100644 --- a/public/javascripts/chart/division.js +++ b/public/javascripts/chart/division.js @@ -1,9 +1,9 @@ -lichess.divisionLines = function(div) { +lichess.divisionLines = function(div, trans) { var divisionLines = []; if (div.middle) { divisionLines.push({ label: { - text: 'Opening', + text: trans('opening'), verticalAlign: 'top', align: 'left', y: 0, @@ -17,7 +17,7 @@ lichess.divisionLines = function(div) { }); divisionLines.push({ label: { - text: 'Middlegame', + text: trans('middlegame'), verticalAlign: 'top', align: 'left', y: 0, @@ -32,7 +32,7 @@ lichess.divisionLines = function(div) { } if (div.end) divisionLines.push({ label: { - text: 'Endgame', + text: trans('endgame'), verticalAlign: 'top', align: 'left', y: 0, diff --git a/public/javascripts/chart/movetime.js b/public/javascripts/chart/movetime.js index 8c14c25712..0726fe0c91 100644 --- a/public/javascripts/chart/movetime.js +++ b/public/javascripts/chart/movetime.js @@ -1,7 +1,7 @@ function toBlurArray(player) { return player.blurs && player.blurs.bits ? player.blurs.bits.split('') : []; } -lichess.movetimeChart = function(data) { +lichess.movetimeChart = function(data, trans) { lichess.loadScript('/assets/javascripts/chart/common.js').done(function() { lichess.loadScript('/assets/javascripts/chart/division.js').done(function() { lichess.chartCommon('highchart').done(function() { @@ -81,7 +81,7 @@ lichess.movetimeChart = function(data) { formatter: function() { var seconds = moveCentis[this.x] / 100; if (seconds) seconds = seconds.toFixed(seconds >= 2 ? 1 : 2); - return this.point.name + '
' + seconds + ' seconds'; + return this.point.name + '
' + trans('nbSeconds', '' + seconds + ''); } }, plotOptions: { @@ -133,7 +133,7 @@ lichess.movetimeChart = function(data) { labels: disabled, lineWidth: 0, tickWidth: 0, - plotLines: lichess.divisionLines(data.game.division) + plotLines: lichess.divisionLines(data.game.division, trans) }, yAxis: { title: noText, diff --git a/translation/source/site.xml b/translation/source/site.xml index ea23fa1132..fab63125ce 100644 --- a/translation/source/site.xml +++ b/translation/source/site.xml @@ -793,4 +793,12 @@ in %3$s Do it again Review white mistakes Review black mistakes + Advantage + + %s second + %s seconds + + Opening + Middlegame + Endgame diff --git a/ui/analyse/src/boot.js b/ui/analyse/src/boot.js index cb409daba2..e8a086827f 100644 --- a/ui/analyse/src/boot.js +++ b/ui/analyse/src/boot.js @@ -104,7 +104,7 @@ module.exports = function(element, cfg) { if (!$("#adv_chart").length) $panel.html('
' + (loading ? chartLoader() : '')); else if (loading && !$("#adv_chart_loader").length) $panel.append(chartLoader()); lichess.loadScript('/assets/javascripts/chart/acpl.js').then(function() { - lichess.advantageChart(data); + lichess.advantageChart(data, cfg.trans); }); }; @@ -116,7 +116,7 @@ module.exports = function(element, cfg) { $panels.removeClass('active').filter('.' + panel).addClass('active'); if (panel === 'move_times' && !lichess.movetimeChart) try { lichess.loadScript('/assets/javascripts/chart/movetime.js').then(function() { - lichess.movetimeChart(data); + lichess.movetimeChart(data, cfg.trans); }); } catch (e) {} if (panel === 'computer_analysis' && $("#adv_chart").length)