diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-16 11:48:48 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-27 09:41:54 +0200 |
commit | c0ffdd09582fa320446a12ada1d382fedcfcd82a (patch) | |
tree | 35b2d46b446e09aafc543f3716724499f2342d84 /client/src | |
parent | 5d128505dca854cb7225624936d1053f06473260 (diff) | |
download | PeerTube-c0ffdd09582fa320446a12ada1d382fedcfcd82a.tar.gz PeerTube-c0ffdd09582fa320446a12ada1d382fedcfcd82a.tar.zst PeerTube-c0ffdd09582fa320446a12ada1d382fedcfcd82a.zip |
Fix dev locale
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/app/app.module.ts | 2 | ||||
-rw-r--r-- | client/src/app/shared/i18n/i18n-utils.ts | 2 | ||||
-rw-r--r-- | client/src/main.ts | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index 9d655c523..118831ed3 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts | |||
@@ -71,7 +71,7 @@ export function metaFactory (serverService: ServerService): MetaLoader { | |||
71 | useFactory: (locale) => { | 71 | useFactory: (locale) => { |
72 | // On dev mode, test localization | 72 | // On dev mode, test localization |
73 | if (isOnDevLocale()) { | 73 | if (isOnDevLocale()) { |
74 | locale = getDevLocale() | 74 | locale = buildFileLocale(getDevLocale()) |
75 | return require(`raw-loader!../locale/target/angular_${locale}.xml`) | 75 | return require(`raw-loader!../locale/target/angular_${locale}.xml`) |
76 | } | 76 | } |
77 | 77 | ||
diff --git a/client/src/app/shared/i18n/i18n-utils.ts b/client/src/app/shared/i18n/i18n-utils.ts index 1838dc752..30d65a2a2 100644 --- a/client/src/app/shared/i18n/i18n-utils.ts +++ b/client/src/app/shared/i18n/i18n-utils.ts | |||
@@ -5,7 +5,7 @@ function isOnDevLocale () { | |||
5 | } | 5 | } |
6 | 6 | ||
7 | function getDevLocale () { | 7 | function getDevLocale () { |
8 | return 'fr' | 8 | return 'fr-FR' |
9 | } | 9 | } |
10 | 10 | ||
11 | export { | 11 | export { |
diff --git a/client/src/main.ts b/client/src/main.ts index 061be17de..f456e89c5 100644 --- a/client/src/main.ts +++ b/client/src/main.ts | |||
@@ -6,6 +6,7 @@ import { environment } from './environments/environment' | |||
6 | 6 | ||
7 | import { hmrBootstrap } from './hmr' | 7 | import { hmrBootstrap } from './hmr' |
8 | import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' | 8 | import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' |
9 | import { buildFileLocale } from '../../shared' | ||
9 | 10 | ||
10 | let providers = [] | 11 | let providers = [] |
11 | if (environment.production) { | 12 | if (environment.production) { |
@@ -14,7 +15,7 @@ if (environment.production) { | |||
14 | 15 | ||
15 | // Template translation, should be in the bootstrap step | 16 | // Template translation, should be in the bootstrap step |
16 | if (isOnDevLocale()) { | 17 | if (isOnDevLocale()) { |
17 | const locale = getDevLocale() | 18 | const locale = buildFileLocale(getDevLocale()) |
18 | const translations = require(`raw-loader!./locale/target/angular_${locale}.xml`) | 19 | const translations = require(`raw-loader!./locale/target/angular_${locale}.xml`) |
19 | 20 | ||
20 | providers = [ | 21 | providers = [ |