diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-03 11:14:04 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-04-03 11:23:34 +0200 |
commit | 8137c8b9862689789c023b0f50dcd09ba27db13a (patch) | |
tree | f6333bb4f3a609b9c0addc81e0568d0a2ce25f88 /shared | |
parent | df93a9bed8f7427a3a2d71daedbdceb49680e808 (diff) | |
download | PeerTube-8137c8b9862689789c023b0f50dcd09ba27db13a.tar.gz PeerTube-8137c8b9862689789c023b0f50dcd09ba27db13a.tar.zst PeerTube-8137c8b9862689789c023b0f50dcd09ba27db13a.zip |
Add Nederlands and Português (Portugal)
Diffstat (limited to 'shared')
-rw-r--r-- | shared/models/i18n/i18n.ts | 8 | ||||
-rw-r--r-- | shared/models/videos/video-resolution.enum.ts | 42 |
2 files changed, 27 insertions, 23 deletions
diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts index d7164b73f..347544df3 100644 --- a/shared/models/i18n/i18n.ts +++ b/shared/models/i18n/i18n.ts | |||
@@ -9,10 +9,12 @@ export const I18N_LOCALES = { | |||
9 | 'eo': 'Esperanto', | 9 | 'eo': 'Esperanto', |
10 | 'de-DE': 'Deutsch', | 10 | 'de-DE': 'Deutsch', |
11 | 'it-IT': 'Italiano', | 11 | 'it-IT': 'Italiano', |
12 | 'nl-NL': 'Nederlands', | ||
12 | 'es-ES': 'Español', | 13 | 'es-ES': 'Español', |
13 | 'oc': 'Occitan', | 14 | 'oc': 'Occitan', |
14 | 'zh-Hant-TW': '繁體中文(台灣)', | 15 | 'zh-Hant-TW': '繁體中文(台灣)', |
15 | 'pt-BR': 'Português (Brasil)', | 16 | 'pt-BR': 'Português (Brasil)', |
17 | 'pt-PT': 'Português (Portugal)', | ||
16 | 'sv-SE': 'svenska', | 18 | 'sv-SE': 'svenska', |
17 | 'pl-PL': 'Polski', | 19 | 'pl-PL': 'Polski', |
18 | 'ru-RU': 'русский', | 20 | 'ru-RU': 'русский', |
@@ -27,10 +29,12 @@ const I18N_LOCALE_ALIAS = { | |||
27 | 'cs': 'cs-CZ', | 29 | 'cs': 'cs-CZ', |
28 | 'de': 'de-DE', | 30 | 'de': 'de-DE', |
29 | 'es': 'es-ES', | 31 | 'es': 'es-ES', |
30 | 'pt': 'pt-BR', | 32 | 'pt': 'pt-PT', |
31 | 'sv': 'sv-SE', | 33 | 'sv': 'sv-SE', |
32 | 'pl': 'pl-PL', | 34 | 'pl': 'pl-PL', |
33 | 'ru': 'ru-RU' | 35 | 'ru': 'ru-RU', |
36 | 'nl': 'nl-NL', | ||
37 | 'zh': 'zh-Hans-CN' | ||
34 | } | 38 | } |
35 | 39 | ||
36 | export const POSSIBLE_LOCALES = Object.keys(I18N_LOCALES) | 40 | export const POSSIBLE_LOCALES = Object.keys(I18N_LOCALES) |
diff --git a/shared/models/videos/video-resolution.enum.ts b/shared/models/videos/video-resolution.enum.ts index 5ba2c1faa..7da5e7100 100644 --- a/shared/models/videos/video-resolution.enum.ts +++ b/shared/models/videos/video-resolution.enum.ts | |||
@@ -17,27 +17,27 @@ export enum VideoResolution { | |||
17 | */ | 17 | */ |
18 | function getBaseBitrate (resolution: VideoResolution) { | 18 | function getBaseBitrate (resolution: VideoResolution) { |
19 | switch (resolution) { | 19 | switch (resolution) { |
20 | case VideoResolution.H_240P: | 20 | case VideoResolution.H_240P: |
21 | // quality according to Google Live Encoder: 300 - 700 Kbps | 21 | // quality according to Google Live Encoder: 300 - 700 Kbps |
22 | // Quality according to YouTube Video Info: 186 Kbps | 22 | // Quality according to YouTube Video Info: 186 Kbps |
23 | return 250 * 1000 | 23 | return 250 * 1000 |
24 | case VideoResolution.H_360P: | 24 | case VideoResolution.H_360P: |
25 | // quality according to Google Live Encoder: 400 - 1,000 Kbps | 25 | // quality according to Google Live Encoder: 400 - 1,000 Kbps |
26 | // Quality according to YouTube Video Info: 480 Kbps | 26 | // Quality according to YouTube Video Info: 480 Kbps |
27 | return 500 * 1000 | 27 | return 500 * 1000 |
28 | case VideoResolution.H_480P: | 28 | case VideoResolution.H_480P: |
29 | // quality according to Google Live Encoder: 500 - 2,000 Kbps | 29 | // quality according to Google Live Encoder: 500 - 2,000 Kbps |
30 | // Quality according to YouTube Video Info: 879 Kbps | 30 | // Quality according to YouTube Video Info: 879 Kbps |
31 | return 900 * 1000 | 31 | return 900 * 1000 |
32 | case VideoResolution.H_720P: | 32 | case VideoResolution.H_720P: |
33 | // quality according to Google Live Encoder: 1,500 - 4,000 Kbps | 33 | // quality according to Google Live Encoder: 1,500 - 4,000 Kbps |
34 | // Quality according to YouTube Video Info: 1752 Kbps | 34 | // Quality according to YouTube Video Info: 1752 Kbps |
35 | return 1750 * 1000 | 35 | return 1750 * 1000 |
36 | case VideoResolution.H_1080P: // fallthrough | 36 | case VideoResolution.H_1080P: // fallthrough |
37 | default: | 37 | default: |
38 | // quality according to Google Live Encoder: 3000 - 6000 Kbps | 38 | // quality according to Google Live Encoder: 3000 - 6000 Kbps |
39 | // Quality according to YouTube Video Info: 3277 Kbps | 39 | // Quality according to YouTube Video Info: 3277 Kbps |
40 | return 3300 * 1000 | 40 | return 3300 * 1000 |
41 | } | 41 | } |
42 | } | 42 | } |
43 | 43 | ||