plain-design 1.0.0-beta.60 → 1.0.0-beta.62

Sign up to get free protection for your applications and to get access to all the features.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "plain-design",
3
- "version": "1.0.0-beta.60",
3
+ "version": "1.0.0-beta.62",
4
4
  "description": "",
5
5
  "main": "dist/plain-design.min.js",
6
6
  "module": "dist/plain-design.commonjs.min.js",
@@ -203,7 +203,11 @@ export const i18n = (() => {
203
203
  const val1 = lang1[key];
204
204
  const val2 = lang2[key];
205
205
  if (!!val1 && !!val2) {
206
- result[key] = merge(val1, val2);
206
+ if (typeof val1 === "object" && typeof val2 === "object") {
207
+ result[key] = merge(val1, val2);
208
+ } else {
209
+ result[key] = val2;
210
+ }
207
211
  } else {
208
212
  result[key] = val1 || val2;
209
213
  }