Improved locale setting, fix build issue

Author: mkevinosullivan

src/core/loaders/Loader.ts

@@ -259,28 +259,28 @@ export abstract class Loader extends Disposable {
     return new LocaleNode({ keypath: key, shadow: true })
   }
 
-  getNodeByKey(key: string, shadow = false): LocaleNode | undefined {
+  getNodeByKey(key: string, shadow = false, locale?: string): LocaleNode | undefined {
     const node = resolveFlattenRoot(this.getTreeNodeByKey(key))
     if (!node && shadow)
       return this.getShadowNodeByKey(key)
     if (node && node.type !== 'tree')
       return node
 
-    // TODO: maybe use something other than Config.displayLanguage?
+    const language = locale || Config.sourceLanguage
     if (
       node
       && node.type === 'tree'
       && Config._keyStyle !== 'flat'
-      && this.treeNodeValueHasPluralizationKeys(node.values[Config.displayLanguage])
+      && this.treeNodeValueHasPluralizationKeys(node.values[language])
     ) {
-      const subkey = this.firstPluralizationKey(node.values[Config.displayLanguage])
+      const subkey = this.firstPluralizationKey(node.values[language])
       if (subkey && node.children[subkey] && node.children[subkey].type === 'node')
-        return node.children[subkey]
+        return node.children[subkey] as LocaleNode
     }
   }
 
-  getTranslationsByKey(key: string, shadow = true) {
-    const node = this.getNodeByKey(key, shadow)
+  getTranslationsByKey(key: string, shadow = true, locale?: string) {
+    const node = this.getNodeByKey(key, shadow, locale)
     if (!node)
       return {}
     if (shadow)
@@ -290,7 +290,7 @@ export abstract class Loader extends Disposable {
   }
 
   getRecordByKey(key: string, locale: string, shadow = false): LocaleRecord | undefined {
-    const trans = this.getTranslationsByKey(key, shadow)
+    const trans = this.getTranslationsByKey(key, shadow, locale)
     return trans[locale]
   }