fix: improve language resolution

Author: abichinger

core/src/locale/index.js

@@ -14,8 +14,8 @@ const locales = {
   pt,
   es,
   da,
-  zh_cn: cn,
-  zh: cn
+  zh: cn,
+  'zh-cn': cn
 }
 
 class Locale {
@@ -42,7 +42,7 @@ class Locale {
  */
 function getLocale (locale, mixin) {
   const [language] = locale.split('-')
-  const l = locales[locale] || locales[language] || locales.en
+  const l = locales[locale.toLowerCase()] || locales[language.toLowerCase()] || locales.en
   const dict = util.deepMerge(l, mixin || {})
   return new Locale(dict)
 }

core/test/locale.test.js

@@ -1,5 +1,20 @@
 import { getLocale } from '../src/locale'
 
+test('test getLocale', () => {
+  const testCases = [
+    { locale: 'en', expected: 'Hour' },
+    { locale: 'foo-bar', expected: 'Hour' },
+    { locale: 'de', expected: 'Stunde' },
+    { locale: 'DE-AT', expected: 'Stunde' },
+    { locale: 'de-li', expected: 'Stunde' }
+  ]
+
+  for (const test of testCases) {
+    const l = getLocale(test.locale)
+    expect(l.getLocaleStr('hour', 'text')).toBe(test.expected)
+  }
+})
+
 test('test getLocaleStr', () => {
   const l = getLocale('en', {
     custom: {