Merge branch 'develop' of github.com:tracim/tracim_v2 into develop

frontend/i18next.scanner.js

@@ -0,0 +1,16 @@
+const scanner = require('i18next-scanner')
+const vfs = require('vinyl-fs')
+
+const option = require('../i18next.option.js')
+
+// this script is run by npm run build-translation and generate i18next.scanner/**/*.json
+
+// --------------------
+// 2018/07/27 - currently, last version is 2.6.5 but a bug is spaming log with errors. So I'm using 2.6.1
+// this issue seems related : https://github.com/i18next/i18next-scanner/issues/88
+// --------------------
+
+vfs.src(['./src/**/*.jsx'])
+  // .pipe(sort()) // Sort files in stream by path
+  .pipe(scanner(option))
+  .pipe(vfs.dest('./i18next.scanner'))

frontend/i18next.scanner/en/translation.json

@@ -0,0 +1,13 @@
+{
+  "Create your own collaborative workspaces on trac.im": "Create your own collaborative workspaces on trac.im",
+  "Copyright 2013 - 2017": "Copyright 2013 - 2017",
+  "Disconnection error": "Disconnection error",
+  "Create new workspace": "Create new workspace",
+  "Error": "Error",
+  "Email or password invalid": "Email or password invalid",
+  "Type": "Type",
+  "Document's name": "Document's name",
+  "Status": "Status",
+  "Create in folder...": "Create in folder...",
+  "Search...": "Search..."
+}

frontend/i18next.scanner/fr/translation.json

@@ -0,0 +1,13 @@
+{
+  "Create your own collaborative workspaces on trac.im": "Créer votre propre espace de travail sur trac.im",
+  "Copyright 2013 - 2017": "Copyright 2013 - 2017",
+  "Disconnection error": "Erreur de déconnexion",
+  "Create new workspace": "Créer un espace de travail",
+  "Error": "Erreur",
+  "Email or password invalid": "Email ou mot de passe invalid",
+  "Type": "Type",
+  "Document's name": "Nom du document",
+  "Status": "Statut",
+  "Create in folder...": "Créer dans le dossier ...",
+  "Search...": "Rechercher ..."
+}

frontend_app_html-document/build_html-document.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. ../bash_library.sh # source bash_library.sh
+
+windoz=""
+if [[ $1 = "-w" ]]; then
+    windoz="windoz"
+fi
+
+log "npm run build$windoz"
+npm run build$windoz
+log "cp dist/html-document.app.js ../frontend/dist/app"
+cp dist/html-document.app.js ../frontend/dist/app
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/html-document_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/html-document_en_translation.json
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json

frontend_app_html-document/i18next.scanner.js

@@ -0,0 +1,14 @@
+const scanner = require('i18next-scanner')
+const vfs = require('vinyl-fs')
+
+const option = require('../i18next.option.js')
+
+// --------------------
+// 2018/07/27 - currently, last version is 2.6.5 but a bug is spaming log with errors. So I'm using 2.6.1
+// this issue seems related : https://github.com/i18next/i18next-scanner/issues/88
+// --------------------
+
+vfs.src(['./src/**/*.jsx'])
+// .pipe(sort()) // Sort files in stream by path
+  .pipe(scanner(option))
+  .pipe(vfs.dest('./i18next.scanner'))

frontend_app_html-document/i18next.scanner/en/translation.json

@@ -0,0 +1,3 @@
+{
+  "Last version": "Last version"
+}

frontend_app_html-document/i18next.scanner/fr/translation.json

@@ -0,0 +1,3 @@
+{
+  "Last version": "Dernière version"
+}

frontend_app_thread/build_thread.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. ../bash_library.sh # source bash_library.sh
+
+windoz=""
+if  [[ $1 = "-w" ]]; then
+    windoz="windoz"
+fi
+
+log "npm run build$windoz"
+npm run build$windoz
+log "cp dist/thread.app.js ../frontend/dist/app"
+cp dist/thread.app.js ../frontend/dist/app
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json

frontend_app_thread/i18next.scanner.js

@@ -0,0 +1,14 @@
+const scanner = require('i18next-scanner')
+const vfs = require('vinyl-fs')
+
+const option = require('../i18next.option.js')
+
+// --------------------
+// 2018/07/27 - currently, last version is 2.6.5 but a bug is spaming log with errors. So I'm using 2.6.1
+// this issue seems related : https://github.com/i18next/i18next-scanner/issues/88
+// --------------------
+
+vfs.src(['./src/**/*.jsx'])
+// .pipe(sort()) // Sort files in stream by path
+  .pipe(scanner(option))
+  .pipe(vfs.dest('./i18next.scanner'))

frontend_app_thread/i18next.scanner/en/translation.json

@@ -0,0 +1 @@
+{}

frontend_app_thread/i18next.scanner/fr/translation.json

@@ -0,0 +1 @@
+{}

frontend_lib/i18next.scanner.js

@@ -0,0 +1,9 @@
+const scanner = require('i18next-scanner')
+const vfs = require('vinyl-fs')
+
+const option = require('../i18next.option.js')
+
+vfs.src(['./src/**/*.jsx'])
+// .pipe(sort()) // Sort files in stream by path
+  .pipe(scanner(option))
+  .pipe(vfs.dest('./i18next.scanner'))

frontend_lib/i18next.scanner/en/translation.json

@@ -0,0 +1,3 @@
+{
+  "File status": "File status"
+}

frontend_lib/i18next.scanner/fr/translation.json

@@ -0,0 +1,3 @@
+{
+  "File status": "__NOT_TRANSLATED__"
+}

i18next.option.js

@@ -0,0 +1,40 @@
+module.exports = {
+  debug: true,
+  removeUnusedKeys: true,
+  func: {
+    list: ['t', 'props.t', 'this.props.t'],
+    extensions: ['.js', '.jsx']
+  },
+  lngs: ['en', 'fr'],
+  defaultLng: 'en',
+  keySeparator: false, // false means "keyBasedFallback"
+  nsSeparator: false, // false means "keyBasedFallback"
+  fallbackLng: false,
+
+  ns: ['translation'], // namespace
+  defaultNS: 'translation',
+
+  // @param {string} lng The language currently used.
+  // @param {string} ns The namespace currently used.
+  // @param {string} key The translation key.
+  // @return {string} Returns a default value for the translation key.
+  // Return key as the default value for English language. Otherwise, returns '__NOT_TRANSLATED__'
+  defaultValue: (lng, ns, key) => lng === 'en' ? key : '__NOT_TRANSLATED__',
+
+  react: {wait: true},
+
+  resource: {
+    // The path where resources get loaded from.
+    // /!\ /!\ /!\ Relative to CURRENT working directory. /!\
+    loadPath: 'i18next.scanner/{{lng}}/{{ns}}.json',
+    // The path to store resources.
+    // /!\ /!\ /!\ Relative to the path specified by `vfs.dest('./i18next.scanner')`. /!\
+    savePath: '{{lng}}/{{ns}}.json',
+    jsonIndent: 2,
+    lineEnding: '\n'
+  },
+  // interpolation: {
+  //   escapeValue: false, // not needed for react!!
+  // },
+  trans: false,
+}