feat: rename Locale.rootLocale to Locale.ROOT

Tradeshift · Apr 16, 2020 · ab38995 · ab38995
1 parent e54b3ff
commit ab38995
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/locale/Locale.ts b/src/locale/Locale.ts
@@ -56,7 +56,7 @@ export class Locale {
 		zh: 'zh-Hans-CN'
 	};
 
-	public static rootLocale: Locale = Locale.parse('und');
+	public static ROOT: Locale = Locale.parse('und');
 
 	public static forLanguageTag(locale: string = defaultLocale): Locale {
 		return Locale.parse(locale);

diff --git a/src/locale/__tests__/Locale.test.ts b/src/locale/__tests__/Locale.test.ts
@@ -27,7 +27,7 @@ describe('Locale', () => {
 				expect(() => Locale.parseStrict(tag)).toThrow('Found superfluous content after tag');
 
 				expect(() => Locale.parse(tag)).not.toThrow();
-				expect(Locale.parse(tag).toString()).toBe(Locale.rootLocale.toString());
+				expect(Locale.parse(tag).toString()).toBe(Locale.ROOT.toString());
 			});
 		});
 
@@ -38,7 +38,7 @@ describe('Locale', () => {
 				);
 
 				expect(() => Locale.parse(tag)).not.toThrow();
-				expect(Locale.parse(tag).toString()).toBe(Locale.rootLocale.toString());
+				expect(Locale.parse(tag).toString()).toBe(Locale.ROOT.toString());
 			});
 		});
 
@@ -49,7 +49,7 @@ describe('Locale', () => {
 				);
 
 				expect(() => Locale.parse(tag)).not.toThrow();
-				expect(Locale.parse(tag).toString()).toBe(Locale.rootLocale.toString());
+				expect(Locale.parse(tag).toString()).toBe(Locale.ROOT.toString());
 			});
 		});
 	});

diff --git a/src/locale/__tests__/LocaleMatcher.test.ts b/src/locale/__tests__/LocaleMatcher.test.ts
@@ -67,7 +67,7 @@ describe('LocaleMatcher', () => {
 
 			locale = Locale.parse('und-BR');
 			candidates = [Locale.parse('en'), Locale.parse('pt')];
-			expect(matcherRegion.match(locale, candidates)).toEqual(Locale.rootLocale);
+			expect(matcherRegion.match(locale, candidates)).toEqual(Locale.ROOT);
 		});
 
 		it('also accepts plain strings as input', () => {

diff --git a/src/locale/matchers/LocaleMatcherDefault.ts b/src/locale/matchers/LocaleMatcherDefault.ts
@@ -18,7 +18,7 @@ class LocaleMatcherDefault implements Matcher {
 		key = Locale.parse(key);
 		candidates = candidates.map(c => Locale.parse(c));
 
-		const candidatesWithDefault = [...candidates, Locale.rootLocale];
+		const candidatesWithDefault = [...candidates, Locale.ROOT];
 		const everyKey = LocaleMatcherDefault.getSplitLocales([key]);
 
 		for (const currentKey of everyKey) {

diff --git a/src/locale/matchers/LocaleMatcherPreferRegion.ts b/src/locale/matchers/LocaleMatcherPreferRegion.ts
@@ -24,7 +24,7 @@ class LocaleMatcherPreferRegion implements Matcher {
 			LocaleMatcherPreferRegion.getRegionMatch(key, candidates),
 			// in case it did not find a match by region (getRegionMatch)
 			// and the language part of the input is 'und',
-			// the best locale will certainly be Locale.rootLocale.
+			// the best locale will certainly be Locale.ROOT.
 			//
 			// Otherwise it could match, with 'getLanguageMatch',
 			// another label with the language part 'und' but with a more specific region,
@@ -72,8 +72,8 @@ class LocaleMatcherPreferRegion implements Matcher {
 	}
 
 	private static getRootLanguageMatch(input: Locale): Locale {
-		if (input.getLanguage() === Locale.rootLocale.getLanguage()) {
-			return Locale.rootLocale;
+		if (input.getLanguage() === Locale.ROOT.getLanguage()) {
+			return Locale.ROOT;
 		}
 
 		return null;