diff options
author | Chocobozzz <me@florianbigard.com> | 2020-05-29 16:39:49 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-05-29 17:09:55 +0200 |
commit | 2a39506c7da9ef79671d4c21539313b6d49b1884 (patch) | |
tree | 61374b31491c8d05f788346efa573b4b66210246 | |
parent | 696d83fd1377486dd03cc1bd02a21d9b6ddd9fcd (diff) | |
download | PeerTube-2a39506c7da9ef79671d4c21539313b6d49b1884.tar.gz PeerTube-2a39506c7da9ef79671d4c21539313b6d49b1884.tar.zst PeerTube-2a39506c7da9ef79671d4c21539313b6d49b1884.zip |
Revert "Remove oc locale support"
This reverts commit 8323c435c19ac6ed1656ee8436b175bce7bd2c82.
-rw-r--r-- | client/angular.json | 7 | ||||
-rw-r--r-- | client/src/app/app.module.ts | 6 | ||||
-rw-r--r-- | client/src/app/shared/locale/oc.ts | 104 | ||||
-rwxr-xr-x | scripts/build/client.sh | 3 | ||||
-rw-r--r-- | shared/models/i18n/i18n.ts | 1 |
5 files changed, 119 insertions, 2 deletions
diff --git a/client/angular.json b/client/angular.json index a64596a08..44749d6b1 100644 --- a/client/angular.json +++ b/client/angular.json | |||
@@ -41,6 +41,10 @@ | |||
41 | "translation": "src/locale/angular.es-ES.xlf", | 41 | "translation": "src/locale/angular.es-ES.xlf", |
42 | "baseHref": "/client/es-ES/" | 42 | "baseHref": "/client/es-ES/" |
43 | }, | 43 | }, |
44 | "oc": { | ||
45 | "translation": "src/locale/angular.oc.xlf", | ||
46 | "baseHref": "/client/oc/" | ||
47 | }, | ||
44 | "pt": { | 48 | "pt": { |
45 | "translation": "src/locale/angular.pt-BR.xlf", | 49 | "translation": "src/locale/angular.pt-BR.xlf", |
46 | "baseHref": "/client/pt-BR/" | 50 | "baseHref": "/client/pt-BR/" |
@@ -208,6 +212,9 @@ | |||
208 | "es-ES": { | 212 | "es-ES": { |
209 | "localize": [ "es" ] | 213 | "localize": [ "es" ] |
210 | }, | 214 | }, |
215 | "oc": { | ||
216 | "localize": [ "oc" ] | ||
217 | }, | ||
211 | "pt-BR": { | 218 | "pt-BR": { |
212 | "localize": [ "pt" ] | 219 | "localize": [ "pt" ] |
213 | }, | 220 | }, |
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index 6e74cd394..e61346dac 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts | |||
@@ -2,7 +2,6 @@ import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular | |||
2 | import { BrowserModule } from '@angular/platform-browser' | 2 | import { BrowserModule } from '@angular/platform-browser' |
3 | import { ServerService } from '@app/core' | 3 | import { ServerService } from '@app/core' |
4 | import { ResetPasswordModule } from '@app/reset-password' | 4 | import { ResetPasswordModule } from '@app/reset-password' |
5 | |||
6 | import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core' | 5 | import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core' |
7 | import 'focus-visible' | 6 | import 'focus-visible' |
8 | 7 | ||
@@ -18,9 +17,12 @@ import { SearchModule } from '@app/search' | |||
18 | import { WelcomeModalComponent } from '@app/modal/welcome-modal.component' | 17 | import { WelcomeModalComponent } from '@app/modal/welcome-modal.component' |
19 | import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component' | 18 | import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component' |
20 | import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models' | 19 | import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models' |
21 | import { APP_BASE_HREF } from '@angular/common' | 20 | import { APP_BASE_HREF, registerLocaleData } from '@angular/common' |
22 | import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component' | 21 | import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component' |
23 | import { CustomModalComponent } from '@app/modal/custom-modal.component' | 22 | import { CustomModalComponent } from '@app/modal/custom-modal.component' |
23 | import localeOc from '@app/shared/locale/oc' | ||
24 | |||
25 | registerLocaleData(localeOc, 'oc') | ||
24 | 26 | ||
25 | @NgModule({ | 27 | @NgModule({ |
26 | bootstrap: [ AppComponent ], | 28 | bootstrap: [ AppComponent ], |
diff --git a/client/src/app/shared/locale/oc.ts b/client/src/app/shared/locale/oc.ts new file mode 100644 index 000000000..d3b2e8407 --- /dev/null +++ b/client/src/app/shared/locale/oc.ts | |||
@@ -0,0 +1,104 @@ | |||
1 | |||
2 | // This code is not generated | ||
3 | // See angular/tools/gulp-tasks/cldr/extract.js | ||
4 | |||
5 | const u: any = undefined | ||
6 | |||
7 | function plural (n: number): number { | ||
8 | const i = Math.floor(Math.abs(n)) | ||
9 | if (i === 0 || i === 1) return 1 | ||
10 | return 5 | ||
11 | } | ||
12 | |||
13 | export default [ | ||
14 | 'oc', | ||
15 | [['a. m.', 'p. m.'], u, u], | ||
16 | u, | ||
17 | [ | ||
18 | ['dg', 'dl', 'dm', 'dc', 'dj', 'dv', 'ds'], ['dg.', 'dl.', 'dm.', 'dc.', 'dj.', 'dv.', 'ds.'], | ||
19 | ['dimenge', 'diluns', 'dimars', 'dimècres', 'dijòus', 'divendres', 'dissabte'], | ||
20 | ['dg.', 'dl.', 'dm.', 'dc.', 'dj.', 'dv.', 'ds.'] | ||
21 | ], | ||
22 | u, | ||
23 | [ | ||
24 | ['GN', 'FB', 'MÇ', 'AB', 'MA', 'JN', 'JL', 'AG', 'ST', 'OC', 'NV', 'DC'], | ||
25 | [ | ||
26 | 'de gen.', 'de febr.', 'de març', 'd’abr.', 'de mai', 'de junh', 'de jul.', 'd’ag.', | ||
27 | 'de set.', 'd’oct.', 'de nov.', 'de dec.' | ||
28 | ], | ||
29 | [ | ||
30 | 'de genièr', 'de febrièr', 'de març', 'd’abril', 'de mai', 'de junh', 'de julhet', | ||
31 | 'd’agòst', 'de setembre', 'd’octòbre', 'de novembre', 'de decembre' | ||
32 | ] | ||
33 | ], | ||
34 | [ | ||
35 | ['GN', 'FB', 'MÇ', 'AB', 'MA', 'JN', 'JL', 'AG', 'ST', 'OC', 'NV', 'DC'], | ||
36 | [ | ||
37 | 'gen.', 'febr.', 'març', 'abr.', 'mai', 'junh', 'jul.', 'ag.', 'set.', 'oct.', 'nov.', | ||
38 | 'dec.' | ||
39 | ], | ||
40 | [ | ||
41 | 'genièr', 'febrièr', 'març', 'abril', 'mai', 'junh', 'julhet', 'agòst', 'setembre', 'octòbre', | ||
42 | 'novembre', 'decembre' | ||
43 | ] | ||
44 | ], | ||
45 | [['aC', 'dC'], u, ['abans Jèsus-Crist', 'aprèp Jèsus-Crist']], | ||
46 | 1, | ||
47 | [6, 0], | ||
48 | ['d/M/yy', 'd MMM y', 'd MMMM \'de\' y', 'EEEE, d MMMM \'de\' y'], | ||
49 | ['H:mm', 'H:mm:ss', 'H:mm:ss z', 'H:mm:ss zzzz'], | ||
50 | ['{1} {0}', '{1}, {0}', '{1} \'a\' \'les\' {0}', u], | ||
51 | [',', '.', ';', '%', '+', '-', 'E', '×', '‰', '∞', 'NaN', ':'], | ||
52 | ['#,##0.###', '#,##0%', '#,##0.00 ¤', '#E0'], | ||
53 | 'EUR', | ||
54 | '€', | ||
55 | 'euro', | ||
56 | { | ||
57 | 'ARS': ['$AR', '$'], | ||
58 | 'AUD': ['$AU', '$'], | ||
59 | 'BEF': ['FB'], | ||
60 | 'BMD': ['$BM', '$'], | ||
61 | 'BND': ['$BN', '$'], | ||
62 | 'BZD': ['$BZ', '$'], | ||
63 | 'CAD': ['$CA', '$'], | ||
64 | 'CLP': ['$CL', '$'], | ||
65 | 'CNY': [u, '¥'], | ||
66 | 'COP': ['$CO', '$'], | ||
67 | 'CYP': ['£CY'], | ||
68 | 'EGP': [u, '£E'], | ||
69 | 'FJD': ['$FJ', '$'], | ||
70 | 'FKP': ['£FK', '£'], | ||
71 | 'FRF': ['F'], | ||
72 | 'GBP': ['£GB', '£'], | ||
73 | 'GIP': ['£GI', '£'], | ||
74 | 'HKD': [u, '$'], | ||
75 | 'IEP': ['£IE'], | ||
76 | 'ILP': ['£IL'], | ||
77 | 'ITL': ['₤IT'], | ||
78 | 'JPY': [u, '¥'], | ||
79 | 'KMF': [u, 'FC'], | ||
80 | 'LBP': ['£LB', '£L'], | ||
81 | 'MTP': ['£MT'], | ||
82 | 'MXN': ['$MX', '$'], | ||
83 | 'NAD': ['$NA', '$'], | ||
84 | 'NIO': [u, '$C'], | ||
85 | 'NZD': ['$NZ', '$'], | ||
86 | 'RHD': ['$RH'], | ||
87 | 'RON': [u, 'L'], | ||
88 | 'RWF': [u, 'FR'], | ||
89 | 'SBD': ['$SB', '$'], | ||
90 | 'SGD': ['$SG', '$'], | ||
91 | 'SRD': ['$SR', '$'], | ||
92 | 'TOP': [u, '$T'], | ||
93 | 'TTD': ['$TT', '$'], | ||
94 | 'TWD': [u, 'NT$'], | ||
95 | 'USD': ['$US', '$'], | ||
96 | 'UYU': ['$UY', '$'], | ||
97 | 'WST': ['$WS'], | ||
98 | 'XCD': [u, '$'], | ||
99 | 'XPF': ['FCFP'], | ||
100 | 'ZMW': [u, 'Kw'] | ||
101 | }, | ||
102 | 'ltr', | ||
103 | plural | ||
104 | ] | ||
diff --git a/scripts/build/client.sh b/scripts/build/client.sh index 05c40b5bb..e7475f56c 100755 --- a/scripts/build/client.sh +++ b/scripts/build/client.sh | |||
@@ -53,6 +53,8 @@ if [ -z ${1+x} ] || [ "$1" != "--light" ]; then | |||
53 | languages=(["el"]="el-GR") | 53 | languages=(["el"]="el-GR") |
54 | elif [ ! -z ${1+x} ] && [ "$1" == "--light-es" ]; then | 54 | elif [ ! -z ${1+x} ] && [ "$1" == "--light-es" ]; then |
55 | languages=(["es"]="es-ES") | 55 | languages=(["es"]="es-ES") |
56 | elif [ ! -z ${1+x} ] && [ "$1" == "--light-oc" ]; then | ||
57 | languages=(["oc"]="oc") | ||
56 | elif [ ! -z ${1+x} ] && [ "$1" == "--light-pt" ]; then | 58 | elif [ ! -z ${1+x} ] && [ "$1" == "--light-pt" ]; then |
57 | languages=(["pt"]="pt-BR") | 59 | languages=(["pt"]="pt-BR") |
58 | elif [ ! -z ${1+x} ] && [ "$1" == "--light-pt-PT" ]; then | 60 | elif [ ! -z ${1+x} ] && [ "$1" == "--light-pt-PT" ]; then |
@@ -93,6 +95,7 @@ if [ -z ${1+x} ] || [ "$1" != "--light" ]; then | |||
93 | ["gd"]="gd" | 95 | ["gd"]="gd" |
94 | ["el"]="el-GR" | 96 | ["el"]="el-GR" |
95 | ["es"]="es-ES" | 97 | ["es"]="es-ES" |
98 | ["oc"]="oc" | ||
96 | ["pt"]="pt-BR" | 99 | ["pt"]="pt-BR" |
97 | ["pt-PT"]="pt-PT" | 100 | ["pt-PT"]="pt-PT" |
98 | ["sv"]="sv-SE" | 101 | ["sv"]="sv-SE" |
diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts index 46940772f..9a5ea27dc 100644 --- a/shared/models/i18n/i18n.ts +++ b/shared/models/i18n/i18n.ts | |||
@@ -18,6 +18,7 @@ export const I18N_LOCALES = { | |||
18 | 'it-IT': 'Italiano', | 18 | 'it-IT': 'Italiano', |
19 | 'ja-JP': '日本語', | 19 | 'ja-JP': '日本語', |
20 | 'nl-NL': 'Nederlands', | 20 | 'nl-NL': 'Nederlands', |
21 | 'oc': 'Occitan', | ||
21 | 'pl-PL': 'Polski', | 22 | 'pl-PL': 'Polski', |
22 | 'pt-BR': 'Português (Brasil)', | 23 | 'pt-BR': 'Português (Brasil)', |
23 | 'pt-PT': 'Português (Portugal)', | 24 | 'pt-PT': 'Português (Portugal)', |