Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions packages/core-base/src/translate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -649,8 +649,11 @@ export function translate<
: (!messageCompiler ? () => key : key)
: fallbackFormat // default by `fallbackFormat` option
? (!messageCompiler ? () => key : key)
: ''
const enableDefaultMsg = fallbackFormat || defaultMsgOrKey !== ''
: null
const enableDefaultMsg =
fallbackFormat ||
(defaultMsgOrKey != null &&
(isString(defaultMsgOrKey) || isFunction(defaultMsgOrKey)))
const locale = getLocale(context, options)

// escape params
Expand Down
1 change: 1 addition & 0 deletions packages/core-base/test/translate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ describe('default option', () => {
expect(translate(ctx, 'hello', 'hello, default message!')).toEqual(
'hello, default message!'
)
expect(translate(ctx, 'hello', '')).toEqual('')
})

test('boolean true', () => {
Expand Down
10 changes: 10 additions & 0 deletions packages/vue-i18n-core/test/composer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,16 @@ describe('t', () => {
await nextTick()
expect(t('hello')).toEqual(JA_HELLO)
})

test('default msg', () => {
const { t } = createComposer({
locale: 'en',
messages: {
en: { hello: 'Hello!' }
}
})
expect(t('foo', '')).toEqual('')
})
})

describe('rt', () => {
Expand Down