变更英文版的cookie处理

Author: songyumeng

dist/include-leaflet.js

@@ -36,8 +36,8 @@
         var includes = (targetScript.getAttribute('include') || "").split(",");
         var excludes = (targetScript.getAttribute('exclude') || "").split(",");
         if (!inArray(excludes, 'leaflet')) {
-            inputCSS("http://cdn.bootcss.com/leaflet/1.0.3/leaflet.css");
-            inputScript("http://cdn.bootcss.com/leaflet/1.0.3/leaflet-src.js");
+            inputCSS("http://cdn.bootcss.com/leaflet/1.2.0/leaflet.css");
+            inputScript("http://cdn.bootcss.com/leaflet/1.2.0/leaflet-src.js");
         }
         if (inArray(includes, 'mapv')) {
             inputScript("http://mapv.baidu.com/build/mapv.min.js");
@@ -61,7 +61,7 @@
             inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");
         }
         if (!inArray(excludes, 'iclient9-leaflet')) {
-            inputScript("../../dist/iclient9-leaflet.js");
+            inputScript("../../dist/iclient9-leaflet.min.js");
         }
         if (inArray(includes, 'iclient9-leaflet-css')) {
             inputCSS("../../dist/iclient9-leaflet.min.css");

examples/js/common.js

@@ -10,7 +10,7 @@ $(document).ready(function () {
             .use(i18nextXHRBackend)
             .init({
                 lng: lan,
-                whitelist: ["zh-CN", "en"],//语言列表，跟locales下的目录名对应
+                whitelist: ["zh-CN", "en-US"],//语言列表，跟locales下的目录名对应
                 ns: "resources",//locales下的json文件名称
                 defaultNS: "resources",//locales下的json文件名称
                 fallbackLng: "zh-CN",//默认语言
@@ -76,15 +76,17 @@ $(document).ready(function () {
         var lang = utils.getLanguage();
         var pathname = window.location.pathname.replace("/en/", "/");
         var href = window.location.origin + pathname;
-        if (lang === "en") {
+        if (lang === "en-US") {
             var match = pathname.match(/([^\/]*\/){2}([^\/]*)/);
             if (match && match[2]) {
                 var versionReg = match[2].match(/dev|^(.*)\.(.*)$/);//匹配版本:dev/9.0.0
                 if (versionReg) {
                     // href = window.location.origin + pathname.replace(/([^\/]*\/){1}([^\/]*)/, '$1$2/en');
                     href = window.location.origin + pathname.replace(/([^\/]*\/){2}([^\/]*)/, '/$1$2/en');
                 }
-            } else {
+            } else if(window.isLocal) {
+                href = window.location.origin + pathname.replace(/(([^\/]*\/){3})([^\/]*)/,'$1$3/en')
+            }else {
                 //href = window.location.origin + pathname.replace(/([^\/]*\/){1}([^\/]*)/, '/en/$2');
                 href = window.location.origin + pathname.replace(/([^\/]*\/){1}([^\/]*)/, '/$2/en');
             }

examples/js/utils.js

@@ -1,5 +1,5 @@
 var utils = {
-    //设置语言。参数："zh_CN"，"en"
+    //设置语言。参数："zh_CN"，"en-US"
     setLanguage: null,
     //获取当前语言。默认从cookie读取，没有则读取浏览器默认语言
     getLanguage: null,
@@ -14,9 +14,9 @@
     loadTemplate: null
 };
 (function (utils) {
-    var cKey = "userLanguage";
+    var cKey = "language";
 
-    //设置语言。参数："zh_CN"，"en"
+    //设置语言。参数："zh_CN"，"en-US"
     function setLanguage(language) {
         //默认设置过期时间为1个小时
         setCookie(cKey, language, 60 * 60 * 1000);
@@ -67,8 +67,8 @@
     function getLocalKey(key) {
         var lang = getLanguage();
         var localKey = key;
-        if (lang === "en") {
-            localKey = key + "_" + lang;
+        if (lang === "en-US") {
+            localKey = key + "_" + "en";
         }
         return localKey;
     }

examples/locales/en/resources.json examples/locales/en-US/resources.jsonexamples/locales/en/resources.json renamed to examples/locales/en-US/resources.json

@@ -47,7 +47,7 @@
                     </a>
                     <ul class="dropdown-menu">
                         <li><a class="lang-option text-center" data-lang="zh-CN">中文</a></li>
-                        <li><a class="lang-option text-center" data-lang="en">English</a></li>
+                        <li><a class="lang-option text-center" data-lang="en-US">English</a></li>
                     </ul>
                 </li>
             </ul>