Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Add support for overriding strings in the app #7886

Merged
merged 8 commits into from
Mar 1, 2022
Merged

Add support for overriding strings in the app #7886

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
820ddb1
Add support for overriding strings in the app
turt2live Feb 23, 2022
adee559
Fix import grouping
turt2live Feb 23, 2022
95443a5
Add a language handler test
turt2live Feb 23, 2022
17c5097
Appease the linter
turt2live Feb 23, 2022
6e4893e
Merge branch 'develop' into travis/add-custom-strings-support
turt2live Mar 1, 2022
2e5f7d6
Add comment for why a weird class exists
turt2live Mar 1, 2022
327002a
Merge branch 'develop' into travis/add-custom-strings-support
turt2live Mar 1, 2022
f3d27cd
Merge remote-tracking branch 'origin/develop' into travis/add-custom-…
turt2live Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Appease the linter
  • Loading branch information
@turt2live
turt2live committed Feb 23, 2022
commit 17c509706224f8edbdd9cdccc71e3c24dc1b9c82
6 changes: 3 additions & 3 deletions src/languageHandler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ let cachedCustomTranslations: Optional<ICustomTranslations> = null;
let cachedCustomTranslationsExpire = 0; // zero to trigger expiration right away

export class CustomTranslationOptions {
public static LookupFn: (url: string) => ICustomTranslations;
public static lookupFn: (url: string) => ICustomTranslations;
turt2live marked this conversation as resolved.
Show resolved Hide resolved

private constructor() {
// static access for tests only
Expand All @@ -619,8 +619,8 @@ export async function registerCustomTranslations() {
try {
let json: ICustomTranslations;
if (Date.now() >= cachedCustomTranslationsExpire) {
json = CustomTranslationOptions.LookupFn
? CustomTranslationOptions.LookupFn(lookupUrl)
json = CustomTranslationOptions.lookupFn
? CustomTranslationOptions.lookupFn(lookupUrl)
: (await (await fetch(lookupUrl)).json() as ICustomTranslations);
cachedCustomTranslations = json;

Expand Down
4 changes: 2 additions & 2 deletions test/languageHandler-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
describe('languageHandler', () => {
afterEach(() => {
SdkConfig.unset();
CustomTranslationOptions.LookupFn = undefined;
CustomTranslationOptions.lookupFn = undefined;
});

it('should support overriding translations', async () => {
Expand Down Expand Up @@ -58,7 +58,7 @@ describe('languageHandler', () => {
SdkConfig.add({
custom_translations_url: lookupUrl,
});
CustomTranslationOptions.LookupFn = fn;
CustomTranslationOptions.lookupFn = fn;
await registerCustomTranslations();

await setLanguage("en");
Expand Down