Skip to content

fix for function mergeLocaleMessage, and modify some tests #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2021
Merged

fix for function mergeLocaleMessage, and modify some tests #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions packages/vue-i18n/src/composer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,10 +1423,8 @@ export function createComposer<
locale: Locale,
message: LocaleMessageDictionary<Message>
): void {
_messages.value[locale] = Object.assign(
_messages.value[locale] || {},
message
)
_messages.value[locale] = _messages.value[locale] || {}
deepCopy(message, _messages.value[locale])
_context.messages = _messages.value as typeof _context.messages
}

Expand Down
12 changes: 7 additions & 5 deletions packages/vue-i18n/test/composer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,13 +875,15 @@ describe('getLocaleMessage / setLocaleMessage / mergeLocaleMessage', () => {
})
expect(getLocaleMessage('en')).toEqual({ hello: 'Hello!' })

setLocaleMessage('en', { hi: 'Hi!' })
expect(getLocaleMessage('en')).toEqual({ hi: 'Hi!' })
setLocaleMessage('en', { hi: { hi: 'Hi!' } })
expect(getLocaleMessage('en')).toEqual({ hi: { hi: 'Hi!' } })

mergeLocaleMessage('en', { hello: 'Hello!' })
mergeLocaleMessage('en', { hi: { hello: 'Hello!' } })
expect(getLocaleMessage('en')).toEqual({
hello: 'Hello!',
hi: 'Hi!'
hi: {
hi: 'Hi!',
hello: 'Hello!'
}
})
})
})
Expand Down
23 changes: 19 additions & 4 deletions packages/vue-i18n/test/i18n.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ test('merge useI18n resources to global scope', async () => {
locale: 'ja',
messages: {
en: {
hello: 'hello!'
hi: { hello: 'hello!' }
}
}
})
Expand All @@ -564,6 +564,9 @@ test('merge useI18n resources to global scope', async () => {
useI18n({
useScope: 'global',
messages: {
en: {
hi: { hi: 'hi!' }
},
ja: {
hello: 'こんにちは！'
}
Expand Down Expand Up @@ -595,6 +598,12 @@ test('merge useI18n resources to global scope', async () => {
})
await mount(App, i18n)

expect(i18n.global.getLocaleMessage('en')).toEqual({
hi: {
hi: 'hi!',
hello: 'hello!'
}
})
expect(i18n.global.getLocaleMessage('ja')).toEqual({ hello: 'こんにちは！' })
expect(i18n.global.getDateTimeFormat('en-US')).toEqual({
short: {
Expand All @@ -620,7 +629,7 @@ test('merge i18n custom blocks to global scope', async () => {
locale: 'ja',
messages: {
en: {
hello: 'hello!'
hi: { hello: 'hello!' }
}
}
})
Expand All @@ -635,7 +644,10 @@ test('merge i18n custom blocks to global scope', async () => {
options.__i18nGlobal = [
{
locale: 'en',
resource: { foo: 'foo!' }
resource: {
hi: { hi: 'hi!' },
foo: 'foo!'
}
},
{
locale: 'ja',
Expand All @@ -657,7 +669,10 @@ test('merge i18n custom blocks to global scope', async () => {
await mount(App, i18n)

expect(i18n.global.getLocaleMessage('en')).toEqual({
hello: 'hello!',
hi: {
hi: 'hi!',
hello: 'hello!'
},
foo: 'foo!'
})
expect(i18n.global.getLocaleMessage('ja')).toEqual({
Expand Down
12 changes: 7 additions & 5 deletions packages/vue-i18n/test/legacy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,15 @@ test('getLocaleMessage / setLocaleMessage / mergeLocaleMessage', () => {
})
expect(i18n.getLocaleMessage('en')).toEqual({ hello: 'Hello!' })

i18n.setLocaleMessage('en', { hi: 'Hi!' })
expect(i18n.getLocaleMessage('en')).toEqual({ hi: 'Hi!' })
i18n.setLocaleMessage('en', { hi: { hi: 'hi!' } })
expect(i18n.getLocaleMessage('en')).toEqual({ hi: { hi: 'hi!' } })

i18n.mergeLocaleMessage('en', { hello: 'Hello!' })
i18n.mergeLocaleMessage('en', { hi: { hello: 'hello!' } })
expect(i18n.getLocaleMessage('en')).toEqual({
hello: 'Hello!',
hi: 'Hi!'
hi: {
hi: 'hi!',
hello: 'hello!'
}
})
})

Expand Down