summaryrefslogtreecommitdiffstats
path: root/ui/src
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2020-06-09 22:43:28 -0400
committerDessalines <tyhou13@gmx.com>2020-06-09 22:43:28 -0400
commitda2229a3033d5f14bf1a6bce34d98f2a0680cd43 (patch)
tree3bdda9cfb1a5916fff2f98b5675a8b3aed928cee /ui/src
parent2e4c7256476e4d5c79f43c9c86c6c8dc3c6965af (diff)
parenta13e9fe3959e07f901ba0647dfd7f749865a900d (diff)
Merge branch 'master' into dev
Diffstat (limited to 'ui/src')
-rw-r--r--ui/src/components/sponsors.tsx5
-rw-r--r--ui/src/i18next.ts10
-rw-r--r--ui/src/utils.ts42
-rw-r--r--ui/src/version.ts2
4 files changed, 46 insertions, 13 deletions
diff --git a/ui/src/components/sponsors.tsx b/ui/src/components/sponsors.tsx
index cf2bee82..35ec7635 100644
--- a/ui/src/components/sponsors.tsx
+++ b/ui/src/components/sponsors.tsx
@@ -10,10 +10,9 @@ interface SilverUser {
}
let general = [
+ 'Ernest Wiśniewski',
+ 'HN',
'Forrest Weghorst',
- 'Serge Tarkovski',
- 'alexx henry',
- 'Nathan J. Goode',
'Andre Vallestero',
'NotTooHighToHack',
];
diff --git a/ui/src/i18next.ts b/ui/src/i18next.ts
index f2b8c10e..5fa8f4e8 100644
--- a/ui/src/i18next.ts
+++ b/ui/src/i18next.ts
@@ -16,9 +16,14 @@ import { fi } from './translations/fi';
import { ca } from './translations/ca';
import { fa } from './translations/fa';
import { hi } from './translations/hi';
+import { pl } from './translations/pl';
import { pt_BR } from './translations/pt_BR';
import { ja } from './translations/ja';
import { ka } from './translations/ka';
+import { gl } from './translations/gl';
+import { tr } from './translations/tr';
+import { hu } from './translations/hu';
+import { uk } from './translations/uk';
// https://github.com/nimbusec-oss/inferno-i18next/blob/master/tests/T.test.js#L66
const resources = {
@@ -39,8 +44,13 @@ const resources = {
fi,
ca,
fa,
+ pl,
pt_BR,
ja,
+ gl,
+ tr,
+ hu,
+ uk,
};
function format(value: any, format: any, lng: any): any {
diff --git a/ui/src/utils.ts b/ui/src/utils.ts
index 82900cab..81bb0147 100644
--- a/ui/src/utils.ts
+++ b/ui/src/utils.ts
@@ -12,10 +12,15 @@ import 'moment/locale/it';
import 'moment/locale/fi';
import 'moment/locale/ca';
import 'moment/locale/fa';
+import 'moment/locale/pl';
import 'moment/locale/pt-br';
import 'moment/locale/ja';
import 'moment/locale/ka';
import 'moment/locale/hi';
+import 'moment/locale/gl';
+import 'moment/locale/tr';
+import 'moment/locale/hu';
+import 'moment/locale/uk';
import {
UserOperation,
@@ -66,15 +71,20 @@ export const languages = [
{ code: 'eo', name: 'Esperanto' },
{ code: 'es', name: 'Español' },
{ code: 'de', name: 'Deutsch' },
+ { code: 'gl', name: 'Galego' },
+ { code: 'hu', name: 'Magyar Nyelv' },
{ code: 'ka', name: 'ქართული ენა' },
{ code: 'hi', name: 'मानक हिन्दी' },
{ code: 'fa', name: 'فارسی' },
{ code: 'ja', name: '日本語' },
+ { code: 'pl', name: 'Polski' },
{ code: 'pt_BR', name: 'Português Brasileiro' },
{ code: 'zh', name: '中文' },
{ code: 'fi', name: 'Suomi' },
{ code: 'fr', name: 'Français' },
{ code: 'sv', name: 'Svenska' },
+ { code: 'tr', name: 'Türkçe' },
+ { code: 'uk', name: 'українська мова' },
{ code: 'ru', name: 'Русский' },
{ code: 'nl', name: 'Nederlands' },
{ code: 'it', name: 'Italiano' },
@@ -366,6 +376,8 @@ export function getMomentLanguage(): string {
lang = 'ca';
} else if (lang.startsWith('fa')) {
lang = 'fa';
+ } else if (lang.startsWith('pl')) {
+ lang = 'pl';
} else if (lang.startsWith('pt')) {
lang = 'pt-br';
} else if (lang.startsWith('ja')) {
@@ -378,6 +390,14 @@ export function getMomentLanguage(): string {
lang = 'el';
} else if (lang.startsWith('eu')) {
lang = 'eu';
+ } else if (lang.startsWith('gl')) {
+ lang = 'gl';
+ } else if (lang.startsWith('tr')) {
+ lang = 'tr';
+ } else if (lang.startsWith('hu')) {
+ lang = 'hu';
+ } else if (lang.startsWith('uk')) {
+ lang = 'uk';
} else {
lang = 'en';
}
@@ -863,14 +883,18 @@ export function previewLines(text: string, lines: number = 3): string {
}
function canUseWebP() {
- var elem = document.createElement('canvas');
-
- if (!!(elem.getContext && elem.getContext('2d'))) {
- var testString = !(window.mozInnerScreenX == null) ? 'png' : 'webp';
- // was able or not to get WebP representation
- return elem.toDataURL('image/webp').startsWith('data:image/' + testString);
- }
-
- // very old browser like IE 8, canvas not supported
+ // TODO pictshare might have a webp conversion bug, try disabling this
return false;
+
+ // var elem = document.createElement('canvas');
+ // if (!!(elem.getContext && elem.getContext('2d'))) {
+ // var testString = !(window.mozInnerScreenX == null) ? 'png' : 'webp';
+ // // was able or not to get WebP representation
+ // return (
+ // elem.toDataURL('image/webp').startsWith('data:image/' + testString)
+ // );
+ // }
+
+ // // very old browser like IE 8, canvas not supported
+ // return false;
}
diff --git a/ui/src/version.ts b/ui/src/version.ts
index 4448d741..9abc8bce 100644
--- a/ui/src/version.ts
+++ b/ui/src/version.ts
@@ -1 +1 @@
-export const version: string = 'v0.6.69';
+export const version: string = 'v0.6.71';