Include tag translations via modulekit

modulekit.php

@@ -5,6 +5,7 @@ $depend = array(
   'html',
   'modulekit-lang',
   'openstreetbrowser-categories-main',
+  'openstreetmap-tag-translations',
 );
 $include = array(
 );

package.json

@@ -13,7 +13,7 @@
     "leaflet-geosearch": "^2.4.0",
     "leaflet.locatecontrol": "^0.61.0",
     "openstreetbrowser-categories-main": "https://github.com/plepe/openstreetbrowser-categories-main#branch-3.x",
-    "openstreetmap-tag-translations": "^1.0.0",
+    "openstreetmap-tag-translations": "https://github.com/plepe/openstreetmap-tag-translations",
     "overpass-layer": "https://github.com/plepe/overpass-layer#marker",
     "sheet-router": "^4.2.3"
   },

src/index.js

@@ -105,12 +105,6 @@ window.onload = function() {
   })
 
   tagTranslations.setTagLanguage(ui_lang)
-  tagTranslations.load('node_modules/openstreetmap-tag-translations', ui_lang, function (err) {
-    if (err) {
-      alert('Error loading translations: ' + err)
-      return
-    }
-  })
 }
 
 function show (id, options, callback) {

src/tagTranslations.js

@@ -16,28 +16,6 @@ OverpassLayer.twig.extendFunction('localizedTag', function (tags, id) {
   return tags[id]
 })
 
-function tagTranslationsLoad (path, lang, callback) {
-  var req = new XMLHttpRequest()
-
-  req.addEventListener('load', function () {
-    if (req.status === 200) {
-      translations = JSON.parse(req.responseText)
-      callback(null)
-    } else {
-      callback(req.statusText)
-    }
-  })
-
-  req.addEventListener('error', function () {
-    console.log(req)
-    callback('error')
-  })
-
-  req.open('GET', path + '/tags/' + lang + '.json')
-
-  req.send()
-}
-
 function tagTranslationsTrans () {
   var ret = null
   var fallback = null
@@ -53,41 +31,9 @@ function tagTranslationsTrans () {
   }
 
   if (typeof value === 'undefined') {
-    fallback = tag
-
-    if (translations && 'tag:' + tag in translations) {
-      ret = translations['tag:' + tag]
-    }
-  } else {
-    fallback = value
-
-    if (translations && 'tag:' + tag + '=' + value in translations) {
-      ret = translations['tag:' + tag + '=' + value]
-    }
-  }
-
-  if (ret && typeof ret === 'object') {
-    if (typeof count !== 'undefined') {
-      if (count > 1 && '!=1' in ret) {
-        return ret['!=1']
-      } else if ('message' in ret) {
-        return ret['message']
-      } else {
-        return fallback
-      }
-    } else {
-      if ('message' in ret) {
-        return ret['message']
-      } else {
-        return fallback
-      }
-    }
+    return lang('tag:' + tag, count)
   } else {
-    if (ret !== null) {
-      return ret
-    } else {
-      return fallback
-    }
+    return lang('tag:' + tag + '=' + value, count)
   }
 }
 
@@ -110,7 +56,6 @@ function tagTranslationsTransList (key, values) {
 }
 
 module.exports = {
-  load: tagTranslationsLoad,
   trans: tagTranslationsTrans,
   setTagLanguage: function (lang) {
     tagLang = lang