Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
3 changed files with 16 additions and 5 deletions
Showing only changes of commit 43592c32d9 - Show all commits

4
ui/src/i18next.ts vendored
View File

@ -13,14 +13,18 @@ import { it } from './translations/it';
import { fi } from './translations/fi';
import { ca } from './translations/ca';
import { fa } from './translations/fa';
import { hi } from './translations/hi';
import { pt_BR } from './translations/pt_BR';
import { ja } from './translations/ja';
import { ka } from './translations/ka';
// https://github.com/nimbusec-oss/inferno-i18next/blob/master/tests/T.test.js#L66
const resources = {
en,
eo,
es,
ka,
hi,
de,
zh,
fr,

4
ui/src/utils.ts vendored
View File

@ -13,6 +13,7 @@ import 'moment/locale/fa';
import 'moment/locale/pt-br';
import 'moment/locale/ja';
import 'moment/locale/ka';
import 'moment/locale/hi';
import {
UserOperation,
@ -62,6 +63,7 @@ export const languages = [
{ code: 'es', name: 'Español' },
{ code: 'de', name: 'Deutsch' },
{ code: 'ka', name: 'ქართული ენა' },
{ code: 'hi', name: 'मानक हिन्दी' },
{ code: 'fa', name: 'فارسی' },
{ code: 'ja', name: '日本語' },
{ code: 'pt_BR', name: 'Português Brasileiro' },
@ -366,6 +368,8 @@ export function getMomentLanguage(): string {
lang = 'ja';
} else if (lang.startsWith('ka')) {
lang = 'ka';
} else if (lang.startsWith('hi')) {
lang = 'hi';
} else {
lang = 'en';
}

3
ui/translations/hi.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
}