From 2a670c7023990461866ac514f1f99f0762e43201 Mon Sep 17 00:00:00 2001 From: mio <10892119+biuuu@users.noreply.github.com> Date: Mon, 1 May 2023 19:15:40 +0800 Subject: [PATCH] fix: i18n show empty string --- src/main/i18n.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/i18n.js b/src/main/i18n.js index 3d079ad..b33c751 100644 --- a/src/main/i18n.js +++ b/src/main/i18n.js @@ -42,14 +42,24 @@ const parseData = (data) => { return result } +const assignData = (objA, objB) => { + const temp = { ...objA } + for (let key in objB) { + if (objB[key]) { + temp[key] = objB[key] + } + } + return temp +} + const i18nMap = new Map() const prepareData = () => { for (let key in raw) { let temp = {} if (key === 'zh-tw') { - Object.assign(temp, raw['zh-cn'], raw[key]) + temp = assignData(raw['zh-cn'], raw[key]) } else { - Object.assign(temp, raw['zh-cn'], raw['en-us'], raw[key]) + temp = assignData(raw['zh-cn'], assignData(raw['en-us'], raw[key])) } i18nMap.set(key, parseData(temp)) }