Merge pull request #65 from hideki0403/develop

release: v1.4.7
hideki0403 · Jul 14, 2022 · 3c863e3 · 3c863e3
2 parents 93f4da5 + 53d65d8
commit 3c863e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "better-japanese",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/src/common/main.js b/src/common/main.js
@@ -858,7 +858,8 @@ const betterJapanese = {
 
     locTicker: function(tickerText) {
         let baseTickerText = tickerText
-        let newsRegex = /N.*ws : /
+        let newsFormat = loc('News :').replace(' ', '&nbsp;')
+        let newsRegex = new RegExp(`N.*ws : |${newsFormat} `)
         let isStartWithHtmlTag = tickerText.startsWith('<')
         let isContainsNewsText = tickerText.match(newsRegex)
 
@@ -872,7 +873,7 @@ const betterJapanese = {
         let localizedStr = betterJapanese.replaceString(ticker)
 
         // 先程削除したNewsを追加 (含んでいなければ何もしない)
-        if (isContainsNewsText) localizedStr = loc('News :').replace(' ', '&nbsp;') + ' ' + localizedStr
+        if (isContainsNewsText) localizedStr = `${newsFormat} ${localizedStr}`
 
         // htmlタグが含まれている場合はタグを追加
         if (isStartWithHtmlTag) localizedStr = baseTickerText.replace(ticker, localizedStr)
@@ -895,7 +896,10 @@ const betterJapanese = {
             return betterJapanese.getReplacedRegex(text).test(str)
         })
 
-        if (!targetStr) return str
+        if (!targetStr) {
+            betterJapanese.log(`翻訳が見つかりませんでした。\nString: ${str}`)
+            return str
+        }
 
         let dynamicLocStr = dynamicLocList[targetStr]