Skip to content

Commit c01cc58

Browse files
authored
Revert "fix: typo (#2221)"
This reverts commit 80ba5c9.
1 parent 021641f commit c01cc58

File tree

8 files changed

+28
-30
lines changed

8 files changed

+28
-30
lines changed

packages/core-base/src/context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ export interface CoreInternalContext {
335335
*/
336336
export const VERSION = __VERSION__
337337

338-
export const NOT_RESOLVED = -1
338+
export const NOT_REOSLVED = -1
339339

340340
export const DEFAULT_LOCALE = 'en-US'
341341

packages/core-base/src/datetime.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
handleMissing,
1313
isTranslateFallbackWarn,
1414
MISSING_RESOLVE_VALUE,
15-
NOT_RESOLVED
15+
NOT_REOSLVED
1616
} from './context'
1717
import { CoreErrorCodes, createCoreError } from './errors'
1818
import { getLocale } from './fallbacker'
@@ -275,7 +275,7 @@ export function datetime<
275275

276276
// checking format and target locale
277277
if (!isPlainObject(format) || !isString(targetLocale)) {
278-
return unresolving ? NOT_RESOLVED : key
278+
return unresolving ? NOT_REOSLVED : key
279279
}
280280

281281
let id = `${targetLocale}__${key}`

packages/core-base/src/number.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
handleMissing,
1212
isTranslateFallbackWarn,
1313
MISSING_RESOLVE_VALUE,
14-
NOT_RESOLVED
14+
NOT_REOSLVED
1515
} from './context'
1616
import { CoreErrorCodes, createCoreError } from './errors'
1717
import { getLocale } from './fallbacker'
@@ -270,7 +270,7 @@ export function number<
270270

271271
// checking format and target locale
272272
if (!isPlainObject(format) || !isString(targetLocale)) {
273-
return unresolving ? NOT_RESOLVED : key
273+
return unresolving ? NOT_REOSLVED : key
274274
}
275275

276276
let id = `${targetLocale}__${key}`

packages/core-base/src/translate.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
isAlmostSameLocale,
2626
isImplicitFallback,
2727
isTranslateFallbackWarn,
28-
NOT_RESOLVED
28+
NOT_REOSLVED
2929
} from './context'
3030
import { translateDevTools } from './devtools'
3131
import { CoreErrorCodes, createCoreError } from './errors'
@@ -713,7 +713,7 @@ export function translate<
713713
) ||
714714
!isString(targetLocale))
715715
) {
716-
return unresolving ? NOT_RESOLVED : (key as MessageFunctionReturn<Message>)
716+
return unresolving ? NOT_REOSLVED : (key as MessageFunctionReturn<Message>)
717717
}
718718

719719
// TODO: refactor

packages/core-base/test/datetime.test.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ vi.mock('../src/intl', async () => {
2020
}
2121
})
2222

23-
import { compile } from '../src/compilation'
24-
import {
25-
createCoreContext as context,
26-
NOT_RESOLVED,
27-
registerLocaleFallbacker,
28-
registerMessageCompiler
29-
} from '../src/context'
23+
import { createCoreContext as context, NOT_REOSLVED } from '../src/context'
3024
import { datetime } from '../src/datetime'
3125
import { CoreErrorCodes, errorMessages } from '../src/errors'
26+
import {
27+
registerMessageCompiler,
28+
registerLocaleFallbacker
29+
} from '../src/context'
30+
import { compile } from '../src/compilation'
3231
import { fallbackWithLocaleChain } from '../src/fallbacker'
3332

3433
import type { DateTimeFormats } from '../src/types'
@@ -266,7 +265,7 @@ describe('context unresolving option', () => {
266265
datetimeFormats
267266
})
268267

269-
expect(datetime(ctx, dt, 'long')).toEqual(NOT_RESOLVED)
268+
expect(datetime(ctx, dt, 'long')).toEqual(NOT_REOSLVED)
270269
expect(mockWarn).not.toHaveBeenCalled()
271270
})
272271

@@ -285,7 +284,7 @@ describe('context unresolving option', () => {
285284
datetimeFormats
286285
})
287286

288-
expect(datetime(ctx, dt, 'custom')).toEqual(NOT_RESOLVED)
287+
expect(datetime(ctx, dt, 'custom')).toEqual(NOT_REOSLVED)
289288
expect(mockWarn).not.toHaveBeenCalled()
290289
})
291290
})

packages/core-base/test/number.test.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,15 @@ vi.mock('../src/intl', async () => {
2020
}
2121
})
2222

23-
import { compile } from '../src/compilation'
23+
import { createCoreContext as context, NOT_REOSLVED } from '../src/context'
24+
import { number } from '../src/number'
25+
import { CoreErrorCodes, errorMessages } from '../src/errors'
2426
import {
25-
createCoreContext as context,
26-
NOT_RESOLVED,
27-
registerLocaleFallbacker,
28-
registerMessageCompiler
27+
registerMessageCompiler,
28+
registerLocaleFallbacker
2929
} from '../src/context'
30-
import { CoreErrorCodes, errorMessages } from '../src/errors'
30+
import { compile } from '../src/compilation'
3131
import { fallbackWithLocaleChain } from '../src/fallbacker'
32-
import { number } from '../src/number'
3332
import { NumberFormats } from '../src/types/index'
3433

3534
type MyNumberSchema = {
@@ -239,7 +238,7 @@ describe('context unresolving option', () => {
239238
numberFormats
240239
})
241240

242-
expect(number(ctx, 0.99, 'percent')).toEqual(NOT_RESOLVED)
241+
expect(number(ctx, 0.99, 'percent')).toEqual(NOT_REOSLVED)
243242
expect(mockWarn).not.toHaveBeenCalled()
244243
})
245244

@@ -258,7 +257,7 @@ describe('context unresolving option', () => {
258257
numberFormats
259258
})
260259

261-
expect(number(ctx, 123456789, 'custom')).toEqual(NOT_RESOLVED)
260+
expect(number(ctx, 123456789, 'custom')).toEqual(NOT_REOSLVED)
262261
expect(mockWarn).not.toHaveBeenCalled()
263262
})
264263
})

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ vi.mock('@intlify/shared', async () => {
1616
import { compile } from '../src/compilation'
1717
import {
1818
createCoreContext as context,
19-
NOT_RESOLVED,
19+
NOT_REOSLVED,
2020
registerLocaleFallbacker,
2121
registerMessageCompiler,
2222
registerMessageResolver
@@ -553,7 +553,7 @@ describe('context unresolving option', () => {
553553
ja: {}
554554
}
555555
})
556-
expect(translate(ctx, 'hello.world')).toEqual(NOT_RESOLVED)
556+
expect(translate(ctx, 'hello.world')).toEqual(NOT_REOSLVED)
557557
})
558558

559559
test('fallbackWarn is false', () => {
@@ -568,7 +568,7 @@ describe('context unresolving option', () => {
568568
ja: {}
569569
}
570570
})
571-
expect(translate(ctx, 'hello.world')).toEqual(NOT_RESOLVED)
571+
expect(translate(ctx, 'hello.world')).toEqual(NOT_REOSLVED)
572572
})
573573

574574
test('fallbackFormat is true', () => {

packages/vue-i18n-core/src/composer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
DEFAULT_LOCALE,
44
MISSING_RESOLVE_VALUE,
55
MessageFunction,
6-
NOT_RESOLVED,
6+
NOT_REOSLVED,
77
clearDateTimeFormat,
88
clearNumberFormat,
99
createCoreContext,
@@ -2234,7 +2234,7 @@ export function createComposer(options: any = {}): any {
22342234
if (
22352235
(warnType !== 'translate exists' && // for not `te` (e.g `t`)
22362236
isNumber(ret) &&
2237-
ret === NOT_RESOLVED) ||
2237+
ret === NOT_REOSLVED) ||
22382238
(warnType === 'translate exists' && !ret) // for `te`
22392239
) {
22402240
const [key, arg2] = argumentParser()

0 commit comments

Comments
 (0)