Fixes #1052 Moment locale incorrectly set to zh-tw

47bde925 · JC Brand · 27378068 · 47bde925 · 47bde925
Commit 47bde925 authored Sep 07, 2018 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

dist/converse.js dist/converse.js +1 -1

src/i18n.js src/i18n.js +1 -1

No files found.
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -77317,7 +77317,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
  }
  function isMomentLocale(locale) {
-    return _.isString(locale) && moment.locale(locale) === moment.locale();
+    return _.includes(moment.locales(), locale);
  }
  function isConverseLocale(locale, supported_locales) {
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -71,7 +71,7 @@
    }
    function isMomentLocale (locale) {
-        return _.isString(locale) && moment.locale(locale) === moment.locale() ;
+        return _.includes(moment.locales(), locale);
    }
    function isConverseLocale (locale, supported_locales) {