use 'mul' instead of 'local' to support the local language

mapbox · Jul 5, 2018 · a996bed · a996bed
1 parent 400f21f
commit a996bed
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -108,9 +108,9 @@ Showcasing the languages supported by Mapbox Streets.
 - [English](https://mapbox.github.io/mapbox-gl-language/examples/en.html)
 - [French](https://mapbox.github.io/mapbox-gl-language/examples/fr.html)
 - [German](https://mapbox.github.io/mapbox-gl-language/examples/de.html)
-- [Local language](https://mapbox.github.io/mapbox-gl-language/examples/local.html)
 - [Japanese](https://mapbox.github.io/mapbox-gl-language/examples/ja.html)
 - [Korean](https://mapbox.github.io/mapbox-gl-language/examples/ko.html)
+- [Multilingual](https://mapbox.github.io/mapbox-gl-language/examples/multilingual.html)
 - [Portuguese](https://mapbox.github.io/mapbox-gl-language/examples/pt.html)
 - [Russian](https://mapbox.github.io/mapbox-gl-language/examples/ru.html)
 - [Spanish](https://mapbox.github.io/mapbox-gl-language/examples/es.html)

diff --git a/examples/local.html → examples/multilingual.html b/examples/local.html → examples/multilingual.html
@@ -26,7 +26,7 @@
 });
 mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.1.0/mapbox-gl-rtl-text.js');
 map.addControl(new MapboxLanguage({
-  defaultLanguage: 'local'
+  defaultLanguage: 'mul'
 }));
 </script>
 

diff --git a/index.js b/index.js
@@ -23,7 +23,7 @@ function MapboxLanguage(options) {
   this._defaultLanguage = options.defaultLanguage;
   this._isLanguageField = options.languageField || /^\{name/;
   this._getLanguageField = options.getLanguageField || function nameField(language) {
-    return language === 'local' ? '{name}' : '{name_' + language + '}';
+    return language === 'mul' ? '{name}' : '{name_' + language + '}';
   };
   this._languageSource = options.languageSource || null;
   this._languageTransform = options.languageTransform || function (style, language) {
@@ -34,7 +34,7 @@ function MapboxLanguage(options) {
     }
   };
   this._excludedLayerIds = options.excludedLayerIds || [];
-  this.supportedLanguages = options.supportedLanguages || ['ar', 'en', 'es', 'fr', 'de', 'local', 'ja', 'ko', 'pt', 'ru', 'zh'];
+  this.supportedLanguages = options.supportedLanguages || ['ar', 'en', 'es', 'fr', 'de', 'ja', 'ko', 'mul', 'pt', 'ru', 'zh'];
 }
 
 function standardSpacing(style) {

diff --git a/test/index.test.js b/test/index.test.js
@@ -55,8 +55,8 @@ test('setLanguage for different text fields', (assert) => {
     }
   }, 'switch style to arabic name field');
 
-  var localStyle = language.setLanguage(style, 'local');
-  assert.deepEqual(localStyle.layers[0].layout, {
+  var mulStyle = language.setLanguage(style, 'mul');
+  assert.deepEqual(mulStyle.layers[0].layout, {
     'text-letter-spacing': 0.15,
     'text-field': {
       'base': 1,
@@ -65,7 +65,7 @@ test('setLanguage for different text fields', (assert) => {
         [6, '{name}']
       ]
     }
-  }, 'switch style to local name field');
+  }, 'switch style to multilingual name field');
 
   assert.end();
 });