Rename fr locale -> fr-FR

Arthurin · Jun 6, 2018 · 9f16472 · 9f16472
1 parent 74b7c6d
commit 9f16472
Show file tree

Hide file tree

Showing 5 changed files with 2,902 additions and 4 deletions.
diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts
@@ -12,7 +12,7 @@ import './peertube-videojs-plugin'
 import './peertube-load-progress-bar'
 import { videojsUntyped } from './peertube-videojs-typings'
 import { buildVideoEmbed, buildVideoLink, copyToClipboard } from './utils'
-import { getCompleteLocale, is18nLocale, isDefaultLocale } from '../../../../shared/models/i18n/i18n'
+import { getCompleteLocale, getShortLocale, is18nLocale, isDefaultLocale } from '../../../../shared/models/i18n/i18n'
 
 // Change 'Playback Rate' to 'Speed' (smaller for our settings menu)
 videojsUntyped.getComponent('PlaybackRateMenuButton').prototype.controlText_ = 'Speed'
@@ -147,7 +147,7 @@ function loadLocale (serverUrl: string, videojs: any, locale: string) {
 
   return fetch(serverUrl + '/client/locales/' + completeLocale + '/player.json')
     .then(res => res.json())
-    .then(json => videojs.addLanguage(completeLocale, json))
+    .then(json => videojs.addLanguage(getShortLocale(completeLocale), json))
 }
 
 export {