@nuskin/ns-util 4.3.0 → 4.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-util",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "baseURL": "/",
   "main": "src/util.js",
   "scripts": {

package/src/urlService.js

@@ -82,6 +82,16 @@ function getLocaleFromUrl(url = window.location.href) {
         if (locale) {
             [language, country] = locale.split('_');
         }
+    } else {
+        href_locale = url.match(/\/([a-z]|[A-Z]){2}\/([a-z]|[A-Z]){2}\//);
+        if (href_locale) {
+            locale = href_locale[0].substring(1, href_locale[0].length-1);
+            if (locale) {
+                [country, language] = locale.split('/');
+                country = country.toUpperCase();
+                locale = `${language}_${country.toUpperCase()}`;
+            }
+        }
     }
     return locale ? [language, country, locale] : [];
 
@@ -93,7 +103,9 @@ function getLocaleFromUrl(url = window.location.href) {
  * @returns {boolean}
  */
 function isLocalePage() {
-    return window.location.href.includes(`/${getLocale()}/`);
+    const url = window.location.href;
+    const lowerUrl = window.location.href.toLowerCase();
+    return url.includes(`/${getLocale()}/`) || lowerUrl.includes(`/${getEqLocale()}/`);
 }
 
 function isAuthor() {
@@ -129,6 +141,12 @@ function getLocale() {
     return `${runConfig.language}_${runConfig.country}`;
 }
 
+function getEqLocale() {
+    let runConfig = RunConfigService.getRunConfig();
+
+    return `${runConfig.country.toLowerCase()}/${runConfig.language.toLowerCase()}`;
+}
+
 function checkUrlForExtension(url) {
     // only add .html to url path if it doesn't start with http or is the #
     if (url && !url.startsWith("http") && "#" !== url && !url.includes(".html")) {