From c508aef67ac0b753fecf212458a6fa3ac6fcbaf6 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Wed, 15 Nov 2017 14:20:43 -0500
Subject: [PATCH] fix i18n issue with interval names

---
 js/block.js      |  4 ++--
 js/logo.js       |  2 +-
 js/musicutils.js | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/js/block.js b/js/block.js
index 68dc3c5cbc..7ec7cb1d83 100644
--- a/js/block.js
+++ b/js/block.js
@@ -544,10 +544,10 @@ function Block(protoblock, blocks, overrideName) {
                     this.value = getModeName(DEFAULTMODE);
                     break;
                 case 'intervalname':
-                    this.value = DEFAULTINTERVAL;
+                    this.value = getIntervalName(DEFAULTINTERVAL);
                     break;
                 case 'voicename':
-                    this.value = DEFAULTVOICE;
+                    this.value = getVoiceName(DEFAULTVOICE);
                     break;
                 case 'drumname':
                     this.value = getDrumName(DEFAULTDRUM);
diff --git a/js/logo.js b/js/logo.js
index c2ca26b2cc..ce0aeecb1e 100644
--- a/js/logo.js
+++ b/js/logo.js
@@ -7689,7 +7689,7 @@ function Logo () {
 
         if (that.blocks.blockList[blk].name === 'intervalname') {
             if (typeof(that.blocks.blockList[blk].value) === 'string') {
-                return INTERVALVALUES[that.blocks.blockList[blk].value];
+                return getIntervalNumber(that.blocks.blockList[blk].value);
             } else {
                 return 0;
             }
diff --git a/js/musicutils.js b/js/musicutils.js
index d78c269d77..5c11a74b42 100644
--- a/js/musicutils.js
+++ b/js/musicutils.js
@@ -526,6 +526,20 @@ function getIntervalName(name) {
 };
 
 
+function getIntervalNumber(name) {
+    for (var interval in INTERVALNAMES) {
+        if (INTERVALNAMES[interval][0] === name) {
+	    return INTERVALVALUES[INTERVALNAMES[interval][1]];
+	} else if (INTERVALNAMES[interval][1] === name) {
+	    return INTERVALVALUES[INTERVALNAMES[interval][1]];
+	}
+    }
+
+    console.log(name + ' not found in INTERVALNAMES');
+    return 0;
+};
+
+
 function getModeName(name) {
     for (var mode in MODENAMES) {
         if (MODENAMES[mode][0] === name || MODENAMES[mode][1].toLowerCase() === name.toLowerCase()) {