10 files changed, 61 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 92af76310..f31b67690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /server/tools/import-mediacore.ts
 /docker-volume/
 /.zanata-cache
+/scripts/i18n/generate-iso639-target.ts
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index 6323a7edf..74363e6a1 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -141,7 +141,6 @@ export class ServerService {
        )
        .subscribe(({ data, translations }) => {
          Object.keys(data)
-                .map(dataKey => parseInt(dataKey, 10))
                .forEach(dataKey => {
                  const label = data[ dataKey ]
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index 66eb6611a..35d406ee3 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -101,6 +101,7 @@ export class VideoEditComponent implements OnInit {
    this.videoCategories = this.serverService.getVideoCategories()
    this.videoLicences = this.serverService.getVideoLicences()
    this.videoLanguages = this.serverService.getVideoLanguages()
+  console.log(this.videoLanguages)
    setTimeout(() => this.minScheduledDate = new Date(), 1000 * 60) // Update every minute
  }
diff --git a/client/src/locale/target/player_es_ES.xml b/client/src/locale/target/player_es_ES.xml
index fadc5c52e..884763bee 100644
--- a/client/src/locale/target/player_es_ES.xml
+++ b/client/src/locale/target/player_es_ES.xml
@@ -3,6 +3,14 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" xmlns:xyz="urn:appInfo:Items" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" version="1.1">
  <file source-language="en-US" datatype="plaintext" original="" target-language="es-ES">
    <body>
+      <trans-unit id="Audio Player">
+        <source>Audio Player</source>
+        <target>Reproductor de audio</target>
+      </trans-unit>
+      <trans-unit id="Video Player">
+        <source>Video Player</source>
+        <target>Reproductor de video</target>
+      </trans-unit>
      <trans-unit id="Play">
        <source>Play</source>
        <target>Reproducir</target>
@@ -15,10 +23,42 @@
        <source>Replay</source>
        <target>Ver de nuevo</target>
      </trans-unit>
+      <trans-unit id="Duration">
+        <source>Duration</source>
+        <target>Duración</target>
+      </trans-unit>
+      <trans-unit id="Remaining Time">
+        <source>Remaining Time</source>
+        <target>Tiempo restante</target>
+      </trans-unit>
+      <trans-unit id="LIVE">
+        <source>LIVE</source>
+        <target>EN DIRECTO</target>
+      </trans-unit>
+      <trans-unit id="Loaded">
+        <source>Loaded</source>
+        <target>Cargado</target>
+      </trans-unit>
+      <trans-unit id="Progress">
+        <source>Progress</source>
+        <target>Progreso</target>
+      </trans-unit>
+      <trans-unit id="Progress Bar">
+        <source>Progress Bar</source>
+        <target>Barra de progreso</target>
+      </trans-unit>
+      <trans-unit id="progress bar timing: currentTime={1} duration={2}">
+        <source>{1} of {2}</source>
+        <target>{1} de {2}</target>
+      </trans-unit>
      <trans-unit id="Fullscreen">
        <source>Fullscreen</source>
        <target>Pantalla completa</target>
      </trans-unit>
+      <trans-unit id="Non-Fullscreen">
+        <source>Non-Fullscreen</source>
+        <target>Salir de pantalla completa</target>
+      </trans-unit>
      <trans-unit id="Mute">
        <source>Mute</source>
        <target>Silenciar</target>
@@ -27,6 +67,10 @@
        <source>Unmute</source>
        <target>Activar sonido</target>
      </trans-unit>
+      <trans-unit id="Playback Rate">
+        <source>Playback Rate</source>
+        <target>Velocidad de reproducción</target>
+      </trans-unit>
      <trans-unit id="Subtitles">
        <source>Subtitles</source>
        <target>Subtitulos</target>
diff --git a/client/src/locale/target/server_es_ES.xml b/client/src/locale/target/server_es_ES.xml
index 13618f3f6..a04fbbb98 100644
--- a/client/src/locale/target/server_es_ES.xml
+++ b/client/src/locale/target/server_es_ES.xml
@@ -76,5 +76,9 @@
        <source>Food</source>
        <target>Cocina</target>
      </trans-unit>
+      <trans-unit id="Attribution">
+        <source>Attribution</source>
+        <target>Asignación</target>
+      </trans-unit>
    </body>
  </file></xliff>
 \ No newline at end of file
diff --git a/client/src/locale/target/server_fr_FR.json b/client/src/locale/target/server_fr_FR.json
index 72f6e322d..a3c83dbcf 100644
--- a/client/src/locale/target/server_fr_FR.json
+++ b/client/src/locale/target/server_fr_FR.json
@@ -1 +1 @@
-{"Music":"Musiques","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"Personnalités","Comedy":"Humour","Entertainment":"Divertissement","News":"Actualités","How To":"Tutoriels","Education":"Éducation","Activism":"Militantisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d'oeuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d'oeuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","Misc":"Divers","Unknown":"Inconnu","Arabic":"Arabe"}
-\ No newline at end of file
+{"Music":"Musiques","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"Personnalités","Comedy":"Humour","Entertainment":"Divertissement","News":"Actualités","How To":"Tutoriels","Education":"Éducation","Activism":"Militantisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d'oeuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d'oeuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","Misc":"Divers","Unknown":"Inconnu","Afar":"Afar","Abkhazian":"Abkhaze","Afrikaans":"Afrikaans","Akan":"Akan","Amharic":"Amharique","Arabic":"Arabe","Aragonese":"Aragonais","Assamese":"Assamais","Avaric":"Avar","Aymara":"Aymara","Azerbaijani":"Azéri","Bashkir":"Bachkir","Bambara":"Bambara","Belarusian":"Biélorusse","Bengali":"Bengali","Bislama":"Bichlamar","Tibetan":"Tibétain","Bosnian":"Bosniaque","Breton":"Breton","Bulgarian":"Bulgare","Catalan":"Catalan","Czech":"Tchèque","Chamorro":"Chamorro","Chechen":"Tchétchène","Chuvash":"Tchouvache","Cornish":"Cornique","Corsican":"Corse","Cree":"Cree","Welsh":"Gallois","Danish":"Danois","German":"Allemand","Dhivehi":"Maldivien","Dzongkha":"Dzongkha","Modern Greek (1453-)":"Grec moderne (après 1453)","English":"Anglais","Estonian":"Estonien","Basque":"Basque","Ewe":"Éwé","Faroese":"Féroïen","Persian":"Persan","Fijian":"Fidjien","Finnish":"Finnois","French":"Français","Western Frisian":"Frison occidental","Fulah":"Peul","Scottish Gaelic":"Gaélique","Irish":"Irlandais","Galician":"Galicien","Manx":"Manx","Guarani":"Guarani","Gujarati":"Goudjrati","Haitian":"Haïtien","Hausa":"Haoussa","Hebrew":"Hébreu","Herero":"Herero","Hindi":"Hindi","Hiri Motu":"Hiri motu","Croatian":"Croate","Hungarian":"Hongrois","Armenian":"Arménien","Igbo":"Igbo","Sichuan Yi":"Yi de Sichuan","Inuktitut":"Inuktitut","Indonesian":"Indonésien","Inupiaq":"Inupiaq","Icelandic":"Islandais","Italian":"Italien","Javanese":"Javanais","Japanese":"Japonais","Kalaallisut":"Groenlandais","Kannada":"Kannada","Kashmiri":"Kashmiri","Georgian":"Géorgien","Kanuri":"Kanouri","Kazakh":"Kazakh","Khmer":"Khmer central","Kikuyu":"Kikuyu","Kinyarwanda":"Rwanda","Kirghiz":"Kirghiz","Komi":"Kom","Kongo":"Kongo","Korean":"Coréen","Kuanyama":"Kuanyama","Kurdish":"Kurde","Lao":"Lao","Latvian":"Letton","Limburgan":"Limbourgeois","Lingala":"Lingala","Lithuanian":"Lituanien","Luxembourgish":"Luxembourgeois","Luba-Katanga":"Luba-katanga","Ganda":"Ganda","Marshallese":"Marshall","Malayalam":"Malayalam","Marathi":"Marathe","Macedonian":"Macédonien","Malagasy":"Malgache","Maltese":"Maltais","Mongolian":"Mongol","Maori":"Maori","Malay (macrolanguage)":"Malais","Burmese":"Birman","Nauru":"Nauruan","Navajo":"Navaho","South Ndebele":"Ndébélé du Sud","North Ndebele":"Ndébélé du Nord","Ndonga":"Ndonga","Nepali (macrolanguage)":"Népalais","Dutch":"Néerlandais","Norwegian Nynorsk":"Norvégien nynorsk","Norwegian Bokmål":"Norvégien bokmål","Norwegian":"Norvégien","Nyanja":"Chichewa","Occitan (post 1500)":"Occitan (après 1500)","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Oriya","Oromo":"Galla","Ossetian":"Ossète","Panjabi":"Pendjabi","Polish":"Polonais","Portuguese":"Portugais","Pushto":"Pachto","Quechua":"Quechua","Romansh":"Romanche","Romanian":"Roumain","Rundi":"Rundi","Russian":"Russe","Sango":"Sango","Sinhala":"Singhalais","Slovak":"Slovaque","Slovenian":"Slovène","Northern Sami":"Sami du Nord","Samoan":"Samoan","Shona":"Shona","Sindhi":"Sindhi","Somali":"Somali","Southern Sotho":"Sotho du Sud","Spanish":"Espagnol","Albanian":"Albanais","Sardinian":"Sarde","Serbian":"Serbe","Swati":"Swati","Sundanese":"Soundanais","Swahili (macrolanguage)":"Swahili","Swedish":"Suédois","Tahitian":"Tahitien","Tamil":"Tamoul","Tatar":"Tatar","Telugu":"Télougou","Tajik":"Tadjik","Tagalog":"Tagalog","Thai":"Thaï","Tigrinya":"Tigrigna","Tonga (Tonga Islands)":"Tongan (Îles Tonga)","Tswana":"Tswana","Tsonga":"Tsonga","Turkmen":"Turkmène","Turkish":"Turc","Twi":"Twi","Uighur":"Ouïgour","Ukrainian":"Ukrainien","Urdu":"Ourdou","Uzbek":"Ouszbek","Venda":"Venda","Vietnamese":"Vietnamien","Walloon":"Wallon","Wolof":"Wolof","Xhosa":"Xhosa","Yiddish":"Yiddish","Yoruba":"Yoruba","Zhuang":"Zhuang","Chinese":"Chinois","Zulu":"Zoulou"}
+\ No newline at end of file
diff --git a/scripts/i18n/pull-hook.sh b/scripts/i18n/pull-hook.sh
index 3d57040cc..3a8394110 100755
--- a/scripts/i18n/pull-hook.sh
+++ b/scripts/i18n/pull-hook.sh
@@ -9,4 +9,5 @@ for i in 1 2 3; do
    perl -pi -e 's|&lt;x id=(.+?)/&gt;([^"])|<x id=\1/>\2|g' client/src/locale/target/*.xml
 done
-npm run i18n:xliff2json
-\ No newline at end of file
+npm run i18n:xliff2json
diff --git a/scripts/i18n/xliff2json.ts b/scripts/i18n/xliff2json.ts
index 17c73181b..ed6854514 100755
--- a/scripts/i18n/xliff2json.ts
+++ b/scripts/i18n/xliff2json.ts
@@ -1,5 +1,5 @@
 import * as xliff12ToJs from 'xliff/xliff12ToJs'
-import { readFile, readFileSync, unlink, writeFile } from 'fs'
+import { readFileSync, unlink, writeFile } from 'fs'
 import { join } from 'path'
 import { buildFileLocale, I18N_LOCALES, isDefaultLocale } from '../../shared/models/i18n/i18n'
 import { eachSeries } from 'async'
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index 56af2f30a..1165285ea 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -36,6 +36,10 @@ import { NSFWPolicyType } from '../../../shared/models/videos/nsfw-policy.type'
 import { values } from 'lodash'
 import { NSFW_POLICY_TYPES } from '../../initializers'
+enum ScopeNames {
+  WITH_VIDEO_CHANNEL = 'WITH_VIDEO_CHANNEL'
+}
 @DefaultScope({
  include: [
    {
@@ -45,7 +49,7 @@ import { NSFW_POLICY_TYPES } from '../../initializers'
  ]
 })
 @Scopes({
-  withVideoChannel: {
+  [ScopeNames.WITH_VIDEO_CHANNEL]: {
    include: [
      {
        model: () => AccountModel,
@@ -199,7 +203,7 @@ export class UserModel extends Model<UserModel> {
      }
    }
-    return UserModel.scope('withVideoChannel').findOne(query)
+    return UserModel.scope(ScopeNames.WITH_VIDEO_CHANNEL).findOne(query)
  }
  static loadByEmail (email: string) {
diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts
index e0e5982f9..e2b440900 100644
--- a/shared/models/i18n/i18n.ts
+++ b/shared/models/i18n/i18n.ts
@@ -2,7 +2,7 @@ export const LOCALE_FILES = [ 'player', 'server' ]
 export const I18N_LOCALES = {
  'en-US': 'English (US)',
-  'fr-FR': 'French (France)'
+  'fr-FR': 'Français (France)'
 }
 const I18N_LOCALE_ALIAS = {