Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,18 @@ var tsml_react_config = {
};
```

### Override language

By default, the UI language is determined by the visitor's browser setting (`navigator.language`). You can force a specific language for all visitors:

```js
var tsml_react_config = {
language: 'es',
};
```

Supported values: `en`, `es`, `fr`, `ja`, `nl`, `pt`, `sk`, `sv`, `th`.

### Disable Add to Calendar button

You can disable the add to calendar button if needed.
Expand Down
2 changes: 1 addition & 1 deletion public/app.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/tests/japan.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<script>
var tsml_react_config = {
distance_unit: 'km',
language: 'ja',
};
</script>
<script src="/app.js" async></script>
Expand Down
11 changes: 6 additions & 5 deletions src/hooks/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,15 +156,16 @@ export const SettingsProvider = ({
}
}

const preferredLanguage = navigator.language.substring(0, 2);

if (preferredLanguage in settings.strings) {
settings.language = preferredLanguage as Lang;
if (!userSettings?.language) {
const preferredLanguage = navigator.language.substring(0, 2);
if (preferredLanguage in settings.strings) {
settings.language = preferredLanguage as Lang;
}
}

const strings = settings.strings[settings.language];

Settings.defaultLocale = navigator.language;
Settings.defaultLocale = userSettings?.language ?? navigator.language;

return { settings, strings };
}, [userSettings]);
Expand Down
33 changes: 30 additions & 3 deletions test/__tests__/settings.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
import { renderHook } from '@testing-library/react';
import { createElement } from 'react';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { SettingsProvider, useSettings } from '../../src/hooks';

describe('settings', () => {
let languageGetter: ReturnType<typeof vi.spyOn>;

beforeEach(() => {
languageGetter = vi.spyOn(window.navigator, 'language', 'get');
});

const renderSettings = (userSettings?: Partial<TSMLReactConfig>) => {
return renderHook(() => useSettings(), {
wrapper: ({ children }) =>
createElement(
SettingsProvider,
{ userSettings: userSettings as TSMLReactConfig },
children
),
});
};

it('should import flags', () => {
const flags = ['O', 'C'];
// const { settings } = mergeSettings({ flags });
Expand Down Expand Up @@ -65,9 +80,21 @@ describe('settings', () => {
// expect(settings.weekdays).toEqual(weekdays);
});

it('should fall back to english', () => {
it('falls back to english when navigator.language is unsupported', () => {
languageGetter.mockReturnValue('de');
// const { settings } = mergeSettings();
// expect(settings.language).toEqual('en');
const { result } = renderSettings();
expect(result.current.settings.language).toBe('en');
});

it('uses navigator.language when no language is configured', () => {
languageGetter.mockReturnValue('es-MX');
const { result } = renderSettings();
expect(result.current.settings.language).toBe('es');
});

it('uses tsml_react_config language when set, ignoring navigator.language', () => {
languageGetter.mockReturnValue('en-US');
const { result } = renderSettings({ language: 'fr' });
expect(result.current.settings.language).toBe('fr');
});
});
Loading