Merge remote-tracking branch 'refs/remotes/origin/development'

gruppler · Jun 20, 2016 · 9ce4fb3 · 9ce4fb3
2 parents 45bb7f5 + 70f1b2e
commit 9ce4fb3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/dist/js/app.js b/dist/js/app.js
diff --git a/js/app/board.js b/js/app/board.js
@@ -684,8 +684,8 @@ define(['app/messages', 'i18n!nls/main', 'lodash'], function (Messages, t, _) {
       return;
     }
 
-    if (ply && ply.evaluation && /'/.test(ply.evaluation)) {
-      m['player'+ply.player](t.Tak);
+    if (ply && ply.evaluation && /['"]/.test(ply.evaluation)) {
+      m['player'+ply.player](/"|''/.test(ply.evaluation) ? t.Tinue : t.Tak);
     }
 
     if (ply && ply.evaluation && /[!?]/.test(ply.evaluation)) {

diff --git a/js/app/grammar.js b/js/app/grammar.js
@@ -49,7 +49,7 @@ define(['lodash'], function (_) {
     comment_grouped: '(\\s*\\{\\s*)([^}]*[^}\\s])?(\\s*\\}?)',
     result: '(?:[\\s-]*(?:R-0|0-R|F-0|0-F|1-0|0-1|1\\/2-1\\/2))',
     result_grouped: '([\\s-]*)(R-0|0-R|F-0|0-F|1-0|0-1|1\\/2-1\\/2)',
-    evaluation: '[?!\']*',
+    evaluation: '[?!\'"]*',
     ply: '(?:\\s*(?:<slide>|<place>)<evaluation>)',
     ply_grouped: '(\\s*)(?:(<slide>)|(<place>))(<evaluation>)',
     linenum: '\\s+\\d+\\.?',

diff --git a/js/app/nls/main.js b/js/app/nls/main.js
@@ -30,6 +30,7 @@ define({
     TPS: "TPS",
     Tak: "Tak",
     Time: "Time",
+    Tinue: "Tinuë",
     n_characters: "<%=n%> characters",
 
     result: {