From 5be159eedeffb6c4697e16676ae6dad235e19828 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Thu, 6 Sep 2018 22:18:07 +0800 Subject: [PATCH] Prevent from replacing i18n data directly --- resources/lang/en/front-end.js | 2 +- resources/lang/zh_CN/front-end.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/en/front-end.js b/resources/lang/en/front-end.js index 9a574f33..62fb6ea6 100644 --- a/resources/lang/en/front-end.js +++ b/resources/lang/en/front-end.js @@ -1,3 +1,3 @@ import lang from './front-end.yml'; -window.__bs_i18n__ = lang; +window.__bs_i18n__ = Object.assign(window.__bs_i18n__ || {}, lang); diff --git a/resources/lang/zh_CN/front-end.js b/resources/lang/zh_CN/front-end.js index 9a574f33..62fb6ea6 100644 --- a/resources/lang/zh_CN/front-end.js +++ b/resources/lang/zh_CN/front-end.js @@ -1,3 +1,3 @@ import lang from './front-end.yml'; -window.__bs_i18n__ = lang; +window.__bs_i18n__ = Object.assign(window.__bs_i18n__ || {}, lang);