imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable @typescript-eslint/explicit-function-return-type in /src (#9788)

Browse source 
* Enable `@typescript-eslint/explicit-member-accessibility` on /src

* Prettier

* Enable `@typescript-eslint/explicit-function-return-type` in /src

* Fix types

* tsc strict fixes

* Delint

* Fix test

* Fix bad merge
This commit is contained in:
Michael Telatynski 2023-01-12 13:25:14 +00:00 • committed by GitHub
parent 7a36ba0fde
commit 030b7e90bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
683 changed files with 3459 additions and 3013 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/languageHandler.tsx
View file

@ -87,7 +87,7 @@ export function _td(s: string): string {
* for this reason, force fallbackLocale === locale in the first call to translate
* and fallback 'manually' so we can mark fallback strings appropriately
* */
const translateWithFallback = (text: string, options?: object): { translated?: string; isFallback?: boolean } => {
const translateWithFallback = (text: string, options?: IVariables): { translated?: string; isFallback?: boolean } => {
const translated = counterpart.translate(text, { ...options, fallbackLocale: counterpart.getLocale() });
if (!translated || translated.startsWith("missing translation:")) {
const fallbackTranslated = counterpart.translate(text, { ...options, locale: FALLBACK_LOCALE });
@ -117,11 +117,13 @@ const translateWithFallback = (text: string, options?: object): { translated?: s
// Wrapper for counterpart's translation function so that it handles nulls and undefineds properly
// Takes the same arguments as counterpart.translate()
function safeCounterpartTranslate(text: string, variables?: object) {
function safeCounterpartTranslate(text: string, variables?: IVariables): { translated?: string; isFallback?: boolean } {
// Don't do substitutions in counterpart. We handle it ourselves so we can replace with React components
// However, still pass the variables to counterpart so that it can choose the correct plural if count is given
// It is enough to pass the count variable, but in the future counterpart might make use of other information too
const options = { ...variables, interpolate: false };
const options: IVariables & {
interpolate: boolean;
} = { ...variables, interpolate: false };
// Horrible hack to avoid https://github.com/vector-im/element-web/issues/4191
// The interpolation library that counterpart uses does not support undefined/null
@ -391,7 +393,7 @@ export function replaceByRegexes(text: string, mapping: IVariables | Tags): stri
// Allow overriding the text displayed when no translation exists
// Currently only used in unit tests to avoid having to load
// the translations in element-web
export function setMissingEntryGenerator(f: (value: string) => void) {
export function setMissingEntryGenerator(f: (value: string) => void): void {
counterpart.setMissingEntryGenerator(f);
}
@ -402,7 +404,7 @@ type Languages = {
};
};
export function setLanguage(preferredLangs: string | string[]) {
export function setLanguage(preferredLangs: string | string[]): Promise<void> {
if (!Array.isArray(preferredLangs)) {
preferredLangs = [preferredLangs];
}
@ -432,7 +434,7 @@ export function setLanguage(preferredLangs: string | string[]) {
return getLanguageRetry(i18nFolder + availLangs[langToUse].fileName);
})
.then(async (langData) => {
.then(async (langData): Promise<ICounterpartTranslation> => {
counterpart.registerTranslations(langToUse, langData);
await registerCustomTranslations();
counterpart.setLocale(langToUse);
@ -447,7 +449,7 @@ export function setLanguage(preferredLangs: string | string[]) {
return getLanguageRetry(i18nFolder + availLangs["en"].fileName);
}
})
.then(async (langData) => {
.then(async (langData): Promise<void> => {
if (langData) counterpart.registerTranslations("en", langData);
await registerCustomTranslations();
});
@ -473,13 +475,13 @@ export function getAllLanguagesFromJson(): Promise<Language[]> {
});
}
export function getLanguagesFromBrowser() {
export function getLanguagesFromBrowser(): readonly string[] {
if (navigator.languages && navigator.languages.length) return navigator.languages;
if (navigator.language) return [navigator.language];
return [navigator.userLanguage || "en"];
}
export function getLanguageFromBrowser() {
export function getLanguageFromBrowser(): string {
return getLanguagesFromBrowser()[0];
}
@ -492,7 +494,7 @@ export function getLanguageFromBrowser() {
* @param {string} language The input language string
* @return {string[]} List of normalised languages
*/
export function getNormalizedLanguageKeys(language: string) {
export function getNormalizedLanguageKeys(language: string): string[] {
const languageKeys: string[] = [];
const normalizedLanguage = normalizeLanguageKey(language);
const languageParts = normalizedLanguage.split("-");
@ -514,11 +516,11 @@ export function getNormalizedLanguageKeys(language: string) {
* @param {string} language The language string to be normalized
* @returns {string} The normalized language string
*/
export function normalizeLanguageKey(language: string) {
export function normalizeLanguageKey(language: string): string {
return language.toLowerCase().replace("_", "-");
}
export function getCurrentLanguage() {
export function getCurrentLanguage(): string {
return counterpart.getLocale();
}
@ -624,7 +626,7 @@ export class CustomTranslationOptions {
}
}
function doRegisterTranslations(customTranslations: ICustomTranslations) {
function doRegisterTranslations(customTranslations: ICustomTranslations): void {
// We convert the operator-friendly version into something counterpart can
// consume.
const langs: {
@ -654,7 +656,7 @@ function doRegisterTranslations(customTranslations: ICustomTranslations) {
* This function should be called *after* registering other translations data to
* ensure it overrides strings properly.
*/
export async function registerCustomTranslations() {
export async function registerCustomTranslations(): Promise<void> {
const moduleTranslations = ModuleRunner.instance.allTranslations;
doRegisterTranslations(moduleTranslations);