|
|
@ -16,7 +16,6 @@ function initI18n(locale, fallback) { |
|
|
|
locale, |
|
|
|
locale, |
|
|
|
fallbackLocale: fallback, |
|
|
|
fallbackLocale: fallback, |
|
|
|
silentFallbackWarn: true, |
|
|
|
silentFallbackWarn: true, |
|
|
|
messages: routesI18n.messages |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return new VueI18n(i18nOptions) |
|
|
|
return new VueI18n(i18nOptions) |
|
|
|
} |
|
|
|
} |
|
|
@ -66,6 +65,10 @@ function mergeI18nFromRoutes(i18n, routes) { |
|
|
|
const US = generateI18n(new Object(), routes, 'path') |
|
|
|
const US = generateI18n(new Object(), routes, 'path') |
|
|
|
i18n.mergeLocaleMessage('CN', CN) |
|
|
|
i18n.mergeLocaleMessage('CN', CN) |
|
|
|
i18n.mergeLocaleMessage('US', US) |
|
|
|
i18n.mergeLocaleMessage('US', US) |
|
|
|
|
|
|
|
const messages = routesI18n.messages |
|
|
|
|
|
|
|
Object.keys(messages).forEach(lang => { |
|
|
|
|
|
|
|
i18n.mergeLocaleMessage(lang, messages[lang]) |
|
|
|
|
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
export { |
|
|
|
export { |
|
|
|