fix: i18n default language resolution (#12786)

aws-amplify · Jan 2, 2024 · 05d73ab · 05d73ab
1 parent bedbdbd
commit 05d73ab
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/packages/core/__tests__/I18n.test.ts b/packages/core/__tests__/I18n.test.ts
@@ -10,6 +10,12 @@ describe('I18n test', () => {
 	});
 
 	describe('get test', () => {
+		let languageGetterSpy;
+
+		beforeEach(() => {
+			languageGetterSpy = jest.spyOn(window.navigator, 'language', 'get')
+		});
+
 		test('no language', () => {
 			const i18n = new I18n();
 
@@ -59,6 +65,20 @@ describe('I18n test', () => {
 
 			spyon.mockClear();
 		});
+
+		test('sets default language', () => {
+			languageGetterSpy.mockReturnValue('fr')
+
+			const i18n = new I18n();
+
+			i18n.putVocabularies({
+				'fr': {
+					'Sign In': 'Se connecter',
+				}
+			});
+
+			expect(i18n.get('Sign In')).toBe('Se connecter');
+		});
 	});
 
 	describe('getByLanguage test', () => {

diff --git a/packages/core/src/I18n/I18n.ts b/packages/core/src/I18n/I18n.ts
@@ -65,6 +65,8 @@ export class I18n {
 	 * @param {String} defVal - Default value
 	 */
 	get(key: string, defVal: string | undefined = undefined) {
+		this.setDefaultLanguage();
+
 		if (!this._lang) {
 			return typeof defVal !== 'undefined' ? defVal : key;
 		}