Skip to content

Commit 4b231ce

Browse files
authoredMay 11, 2024
fix: allow empty default message (#1849)
1 parent c14ad03 commit 4b231ce

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed
 

‎packages/core-base/src/translate.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,11 @@ export function translate<
649649
: (!messageCompiler ? () => key : key)
650650
: fallbackFormat // default by `fallbackFormat` option
651651
? (!messageCompiler ? () => key : key)
652-
: ''
653-
const enableDefaultMsg = fallbackFormat || defaultMsgOrKey !== ''
652+
: null
653+
const enableDefaultMsg =
654+
fallbackFormat ||
655+
(defaultMsgOrKey != null &&
656+
(isString(defaultMsgOrKey) || isFunction(defaultMsgOrKey)))
654657
const locale = getLocale(context, options)
655658

656659
// escape params

‎packages/core-base/test/translate.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ describe('default option', () => {
120120
expect(translate(ctx, 'hello', 'hello, default message!')).toEqual(
121121
'hello, default message!'
122122
)
123+
expect(translate(ctx, 'hello', '')).toEqual('')
123124
})
124125

125126
test('boolean true', () => {

‎packages/vue-i18n-core/test/composer.test.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,16 @@ describe('t', () => {
734734
await nextTick()
735735
expect(t('hello')).toEqual(JA_HELLO)
736736
})
737+
738+
test('default msg', () => {
739+
const { t } = createComposer({
740+
locale: 'en',
741+
messages: {
742+
en: { hello: 'Hello!' }
743+
}
744+
})
745+
expect(t('foo', '')).toEqual('')
746+
})
737747
})
738748

739749
describe('rt', () => {

0 commit comments

Comments
 (0)
Failed to load comments.