declare gettext globally

jrief · Nov 14, 2023 · 4b9d105 · 4b9d105
1 parent 63d4fd2
commit 4b9d105
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/client/declaration.d.ts b/client/declaration.d.ts
@@ -6,3 +6,4 @@ declare module '*.svg' {
 	const content: string;
 	export default content;
 }
+declare function gettext(s: string): string;
diff --git a/client/django-formset/PhoneNumber.ts b/client/django-formset/PhoneNumber.ts
@@ -4,7 +4,8 @@ import {StyleHelpers} from './helpers';
 import {countries} from './countries';
 import styles from './PhoneNumber.scss';
 
-declare function gettext(s: string): string;
+const gettext = typeof window.gettext === 'function' ? window.gettext : ((s: string) => s);
+
 
 class PhoneNumberField {
 	private readonly inputElement: HTMLInputElement;
@@ -60,16 +61,9 @@ class PhoneNumberField {
 	}
 
 	private createCountriesMap() : [string, CountryCallingCode, CountryCode][] {
-		if (typeof gettext === 'function') {
-			return getCountries().map(
-				countryCode => [gettext(countries.get(countryCode) ?? ''), getCountryCallingCode(countryCode), countryCode]
-			);
-		} else {
-			// gettext is not available in the global scope, so we use the country names as-is
-			return getCountries().map(
-				countryCode => [countries.get(countryCode) ?? '', getCountryCallingCode(countryCode), countryCode]
-			);
-		}
+		return getCountries().map(
+			countryCode => [gettext(countries.get(countryCode) ?? ''), getCountryCallingCode(countryCode), countryCode]
+		);
 	}
 
 	private createTextBox() {