From bc5cbc7dfd724fcee21aa5fbbe74734cf7016430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Tue, 9 Jan 2018 00:13:49 -0800
Subject: [PATCH] Generalized unit keys

---
 data/core.yaml       |  2 +-
 dist/locales/en.json |  2 +-
 modules/ui/scale.js  | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index 3b0b30914..4e3c734f5 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1055,7 +1055,7 @@ en:
         history: "Toggle history panel"
         location: "Toggle location panel"
         measurement: "Toggle measurement panel"
-  scale:
+  units:
     miles: "{quantity} mi"
     feet: "{quantity} ft"
     kilometers: "{quantity} km"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7aeda0efe..f36bcb42f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1221,7 +1221,7 @@
                 }
             }
         },
-        "scale": {
+        "units": {
             "miles": "{quantity} mi",
             "feet": "{quantity} ft",
             "kilometers": "{quantity} km",
diff --git a/modules/ui/scale.js b/modules/ui/scale.js
index 11ec0f63b..7693a784a 100644
--- a/modules/ui/scale.js
+++ b/modules/ui/scale.js
@@ -16,7 +16,7 @@ export function uiScale(context) {
             conversion = (isImperial ? 3.28084 : 1),
             dist = geoLonToMeters(loc2[0] - loc1[0], lat) * conversion,
             scale = { dist: 0, px: 0, text: '' },
-            buckets, i, val, dLon, textKey;
+            buckets, i, val, dLon, unit;
 
         if (isImperial) {
             buckets = [5280000, 528000, 52800, 5280, 500, 50, 5, 1];
@@ -41,19 +41,19 @@ export function uiScale(context) {
         if (isImperial) {
             if (scale.dist >= 5280) {
                 scale.dist /= 5280;
-                textKey = 'scale.miles';
+                unit = 'miles';
             } else {
-                textKey = 'scale.feet';
+                unit = 'feet';
             }
         } else {
             if (scale.dist >= 1000) {
                 scale.dist /= 1000;
-                textKey = 'scale.kilometers';
+                unit = 'kilometers';
             } else {
-                textKey = 'scale.meters';
+                unit = 'meters';
             }
         }
-        scale.text = t(textKey, { quantity: scale.dist.toLocaleString(locale) });
+        scale.text = t('units.' + unit, { quantity: scale.dist.toLocaleString(locale) });
 
         return scale;
     }