grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix moment locale issue.

Browse source 
- Fixes #206
This commit is contained in:
Dessalines 2019-08-17 10:22:38 -07:00
parent 61bf12ac28
commit 62854cdf39
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ui/src/components/moment-time.tsx
View file

@ -4,7 +4,7 @@ import * as moment from 'moment';
import 'moment/locale/zh-cn'; import 'moment/locale/zh-cn';
import 'moment/locale/fr'; import 'moment/locale/fr';
import 'moment/locale/sv'; import 'moment/locale/sv';
import { getLanguage } from '../utils'; import { getMomentLanguage } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';
interface MomentTimeProps { interface MomentTimeProps {
@ -20,11 +20,7 @@ export class MomentTime extends Component<MomentTimeProps, any> {
constructor(props: any, context: any) { constructor(props: any, context: any) {
super(props, context); super(props, context);
// Moment doesnt have zh, only zh-cn let lang = getMomentLanguage();
let lang = getLanguage();
if (lang == 'zh') {
lang = 'zh-cn';
}
moment.locale(lang); moment.locale(lang);
} }

16
ui/src/utils.ts
View file

@ -170,6 +170,20 @@ export function debounce(func: any, wait: number = 500, immediate: boolean = fal
} }
} }
export function getLanguage() { export function getLanguage(): string {
return (navigator.language || navigator.userLanguage); return (navigator.language || navigator.userLanguage);
} }
export function getMomentLanguage(): string {
let lang = getLanguage();
if (lang.startsWith('zh')) {
lang = 'zh-cn';
} else if (lang.startsWith('sv')) {
lang = 'sv';
} else if (lang.startsWith('fr')) {
lang = 'fr';
} else {
lang = 'en';
}
return lang;
}