4 files changed, 17 insertions, 171 deletions

diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts
index e946b8fd6..47b3e3784 100755
--- a/scripts/i18n/create-custom-files.ts
+++ b/scripts/i18n/create-custom-files.ts
@@ -1,25 +1,21 @@
 import { registerTSPaths } from '../../server/helpers/register-ts-paths'
-registerTSPaths()
-
-import * as jsToXliff12 from 'xliff/jsToXliff12'
-import { writeFile } from 'fs-extra'
+import { writeJSON } from 'fs-extra'
 import { join } from 'path'
 import {
   buildLanguages,
   VIDEO_CATEGORIES,
   VIDEO_IMPORT_STATES,
-  VIDEO_LICENCES, VIDEO_PLAYLIST_PRIVACIES, VIDEO_PLAYLIST_TYPES,
+  VIDEO_LICENCES,
+  VIDEO_PLAYLIST_PRIVACIES,
+  VIDEO_PLAYLIST_TYPES,
   VIDEO_PRIVACIES,
   VIDEO_STATES
 } from '../../server/initializers/constants'
 import { values } from 'lodash'
 
-type TranslationType = {
-  target: string
-  data: { [id: string]: string }
-}
+registerTSPaths()
 
-const videojs = require(join(__dirname, '../../../client/src/locale/source/videojs_en_US.json'))
+const videojs = require(join(__dirname, '../../../client/src/locale/videojs.en-US.json'))
 const playerKeys = {
   'Quality': 'Quality',
   'Auto': 'Auto',
@@ -37,10 +33,7 @@ const playerKeys = {
   'Total downloaded: ': 'Total downloaded: ',
   'Total uploaded: ': 'Total uploaded: '
 }
-const playerTranslations = {
-  target: join(__dirname, '../../../client/src/locale/source/player_en_US.xml'),
-  data: Object.assign({}, videojs, playerKeys)
-}
+Object.assign(playerKeys, videojs)
 
 // Server keys
 const serverKeys: any = {}
@@ -65,57 +58,17 @@ Object.assign(serverKeys, {
   'Unknown': 'Unknown'
 })
 
-const serverTranslations = {
-  target: join(__dirname, '../../../client/src/locale/source/server_en_US.xml'),
-  data: serverKeys
-}
-
 // ISO 639 keys
 const languageKeys: any = {}
 const languages = buildLanguages()
 Object.keys(languages).forEach(k => languageKeys[languages[k]] = languages[k])
 
-const iso639Translations = {
-  target: join(__dirname, '../../../client/src/locale/source/iso639_en_US.xml'),
-  data: languageKeys
-}
-
-saveToXliffFile(playerTranslations, err => {
-  if (err) return handleError(err)
-
-  saveToXliffFile(serverTranslations, err => {
-    if (err) return handleError(err)
-
-    saveToXliffFile(iso639Translations, err => {
-      if (err) return handleError(err)
+Object.assign(serverKeys, languageKeys)
 
-      process.exit(0)
-    })
-  })
-})
-
-// Then, the server strings
-
-function saveToXliffFile (jsonTranslations: TranslationType, cb: Function) {
-  const obj = {
-    resources: {
-      namespace1: {}
-    }
-  }
-  Object.keys(jsonTranslations.data).forEach(k => obj.resources.namespace1[ k ] = { source: jsonTranslations.data[ k ] })
-
-  jsToXliff12(obj, (err, res) => {
-    if (err) return cb(err)
-
-    writeFile(jsonTranslations.target, res, err => {
-      if (err) return cb(err)
-
-      return cb(null)
-    })
-  })
-}
-
-function handleError (err: any) {
+Promise.all([
+  writeJSON(join(__dirname, '../../../client/src/locale/player.en-US.json'), playerKeys),
+  writeJSON(join(__dirname, '../../../client/src/locale/server.en-US.json'), serverKeys)
+]).catch(err => {
   console.error(err)
   process.exit(-1)
-}
+})
diff --git a/scripts/i18n/generate.sh b/scripts/i18n/generate.sh
index 3f3e3d8e5..f9c2f0613 100755
--- a/scripts/i18n/generate.sh
+++ b/scripts/i18n/generate.sh
@@ -3,12 +3,11 @@
 set -eu
 
 cd client
-npm run ng -- xi18n --i18n-locale "en-US" --output-path src/locale/source --out-file angular_en_US.xml
-npm run ngx-extractor -- --locale "en-US" -i 'src/**/*.ts' -f xlf -o src/locale/source/angular_en_US.xml
+npm run ng -- xi18n --i18n-locale "en-US" --output-path src/locale --out-file angular.xlf
+npm run ngx-extractor -- --locale "en-US" -i 'src/**/*.ts' -f xlf -o src/locale/angular.xlf
 
-# Zanata does not support inner elements in <source>, so we hack these special elements
-# This regex translate the Angular elements to special entities (that we will reconvert on pull)
-perl -pi -e 's|<x id=(.+?)/>|&lt;x id=\1/&gt;|g' src/locale/source/angular_en_US.xml
+# Merge new translations in other language files
+npm run ng run -- PeerTube:xliffmerge
 
 # Add our strings too
 cd ../
diff --git a/scripts/i18n/pull-hook.sh b/scripts/i18n/pull-hook.sh
deleted file mode 100755
index 8d1f7ee55..000000000
--- a/scripts/i18n/pull-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-for i in $(seq 1 10); do
-    # Angular does not like when there is not target element, so we create it with the same content than the source element
-    perl -0pi -e 's#<source>([^<]+)</source>\s*<context-group #<source>\1</source><target>\1</target><context-group #g' client/src/locale/target/angular_*.xml
-
-    # Zanata does not support inner elements in <source>, so we hack these special elements
-    # This regex translate the converted elements to initial Angular elements
-    perl -pi -e 's|&lt;x id=(.+?)/&gt;([^"])|<x id=\1/>\2|g' client/src/locale/target/*.xml
-done
-
-npm run i18n:xliff2json
-
diff --git a/scripts/i18n/xliff2json.ts b/scripts/i18n/xliff2json.ts
deleted file mode 100755
index 68fc95f34..000000000
--- a/scripts/i18n/xliff2json.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { registerTSPaths } from '../../server/helpers/register-ts-paths'
-registerTSPaths()
-
-import * as xliff12ToJs from 'xliff/xliff12ToJs'
-import { readFileSync, unlink, writeFile } from 'fs-extra'
-import { join } from 'path'
-import { buildFileLocale, I18N_LOCALES, isDefaultLocale } from '../../shared/models/i18n/i18n'
-import { eachSeries } from 'async'
-
-const sources: string[] = []
-const availableLocales = Object.keys(I18N_LOCALES)
-                               .filter(l => isDefaultLocale(l) === false)
-                               .map(l => buildFileLocale(l))
-
-for (const file of [ 'player', 'server', 'iso639' ]) {
-  for (const locale of availableLocales) {
-    sources.push(join(__dirname, '../../../client/src/locale/target/', `${file}_${locale}.xml`))
-  }
-}
-
-eachSeries(sources, (source, cb) => {
-  xliffFile2JSON(source, cb)
-}, err => {
-  if (err) return handleError(err)
-
-  mergeISO639InServer(err => {
-    if (err) return handleError(err)
-
-    process.exit(0)
-  })
-})
-
-function handleError (err: any) {
-  console.error(err)
-  process.exit(-1)
-}
-
-function xliffFile2JSON (filePath: string, cb) {
-  const fileTarget = filePath.replace('.xml', '.json')
-
-  // Remove the two first lines our xliff module does not like
-  let fileContent = readFileSync(filePath).toString()
-  fileContent = removeFirstLine(fileContent)
-  fileContent = removeFirstLine(fileContent)
-
-  xliff12ToJs(fileContent, (err, res) => {
-    if (err) return cb(err)
-
-    const json = createJSONString(res)
-    writeFile(fileTarget, json, err => {
-      if (err) return cb(err)
-
-      return unlink(filePath, cb)
-    })
-  })
-}
-
-function mergeISO639InServer (cb) {
-  eachSeries(availableLocales, (locale, eachCallback) => {
-    const serverPath = join(__dirname, '../../../client/src/locale/target/', `server_${locale}.json`)
-    const iso639Path = join(__dirname, '../../../client/src/locale/target/', `iso639_${locale}.json`)
-
-    const resServer = readFileSync(serverPath).toString()
-    const resISO639 = readFileSync(iso639Path).toString()
-
-    const jsonServer = JSON.parse(resServer)
-    const jsonISO639 = JSON.parse(resISO639)
-
-    Object.assign(jsonServer, jsonISO639)
-    const serverString = JSON.stringify(jsonServer)
-
-    writeFile(serverPath, serverString, err => {
-      if (err) return eachCallback(err)
-
-      return unlink(iso639Path, eachCallback)
-    })
-  }, cb)
-}
-
-function removeFirstLine (str: string) {
-  return str.substring(str.indexOf('\n') + 1)
-}
-
-function createJSONString (obj: any) {
-  const res: any = {}
-  const strings = obj.resources['']
-
-  Object.keys(strings).forEach(k => res[k] = strings[k].target)
-
-  return JSON.stringify(res)
-}