warframe-worldstate-parser 2.25.1 → 2.25.3

package/lib/News.js

@@ -5,6 +5,7 @@ const WorldstateObject = require('./WorldstateObject');
 const updateReg = /(update|hotfix)/i;
 const primeAccessReg = /(access)/i;
 const streamReg = /(devstream|prime-time|warframeinternational|stream)/i;
+const langString = /(\/Lotus\/Language\/)/i;
 
 /**
  * Represents a game news item
@@ -15,10 +16,11 @@ class News extends WorldstateObject {
    * @param   {Object}             data            The news data
    * @param   {Dependency}         deps            The dependencies object
    * @param   {MarkdownSettings}   deps.mdConfig   The markdown settings
+   * @param   {Translator}         deps.translator The string translator
    * @param   {TimeDateFunctions}  deps.timeDate   The time and date functions
    * @param   {locale}             deps.locale     Locale to use for determining language
    */
-  constructor(data, { mdConfig, timeDate, locale }) {
+  constructor(data, { mdConfig, translator, timeDate, locale }) {
     super(data, { timeDate });
 
     /**
@@ -42,6 +44,9 @@ class News extends WorldstateObject {
      * @type {string}
      */
     this.message = (data.Messages.find((msg) => msg.LanguageCode === locale) || { Message: '' }).Message;
+    if (langString.test(this.message)) {
+      this.message = translator.languageString(this.message, locale);
+    }
 
     /**
      * The link to the forum post
@@ -115,6 +120,10 @@ class News extends WorldstateObject {
      */
     this.translations = {};
     data.Messages.forEach((message) => {
+      if (langString.test(message)) {
+        this.translations[message.LanguageCode] = translator.languageString(message, message.LanguageCode);
+      }
+
       this.translations[message.LanguageCode] = message.Message;
     });
 

package/lib/translation.js

@@ -57,6 +57,9 @@ function languageString(key, dataOverride) {
   if (lowerKey in i18n(dataOverride).languages) {
     return i18n(dataOverride).languages[lowerKey].value;
   }
+  if (key in i18n(dataOverride).languages) {
+    return i18n(dataOverride).languages[key].value;
+  }
   if (key) {
     return toTitleCase(splitResourceName(String(key).split('/').slice(-1)[0]));
   }
@@ -68,6 +71,9 @@ function languageDesc(key, dataOverride) {
   if (lowerKey in i18n(dataOverride).languages) {
     return i18n(dataOverride).languages[lowerKey].desc;
   }
+  if (key in i18n(dataOverride).languages) {
+    return i18n(dataOverride).languages[key].desc;
+  }
   if (key) {
     return `[PH] ${toTitleCase(splitResourceName(String(key).split('/').slice(-1)[0]))} Desc`;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "warframe-worldstate-parser",
-  "version": "2.25.1",
+  "version": "2.25.3",
   "description": "An Open parser for Warframe's Worldstate in Javascript",
   "types": "./types/main.d.ts",
   "main": "main.js",

package/types/lib/News.d.ts

@@ -8,10 +8,11 @@ declare class News extends WorldstateObject {
      * @param   {Object}             data            The news data
      * @param   {Dependency}         deps            The dependencies object
      * @param   {MarkdownSettings}   deps.mdConfig   The markdown settings
+     * @param   {Translator}         deps.translator The string translator
      * @param   {TimeDateFunctions}  deps.timeDate   The time and date functions
      * @param   {locale}             deps.locale     Locale to use for determining language
      */
-    constructor(data: any, { mdConfig, timeDate, locale }: Dependency);
+    constructor(data: any, { mdConfig, translator, timeDate, locale }: Dependency);
     /**
      * The markdown settings
      * @type {MarkdownSettings}