[IMPROVE] i18next (#1096)

* Replace env module with process.env.NODE_ENV

* Refactor i18n module

* Remove pluralization

* Fix i18n imports

* Normalize locale strings

* Fix wrong dialog title

* Remove unused strings

* Change i18n string interpolation

* Update i18n keys

* Move empty menu to menus module

* Add i18next

* Allow asynchronous initialization of i18n

* Refactor i18n initialization

* Deactivate i18n initialization in test mode

.editorconfig

@@ -13,7 +13,7 @@ indent_style = tab
 
 [*.i18n.json]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.md]
 trim_trailing_whitespace = false

gulpfile.js

@@ -1,4 +1,3 @@
 require('./tasks/build-app');
-require('./tasks/build-tests');
 require('./tasks/release');
 require('./tasks/start');

package.json

@@ -40,6 +40,9 @@
     "electron-updater": "^4.0.6",
     "freedesktop-notifications": "^1.4.0",
     "fs-jetpack": "^2.2.0",
+    "i18next": "^15.0.4",
+    "i18next-node-fs-backend": "^2.1.1",
+    "i18next-sync-fs-backend": "^1.1.0",
     "spellchecker": "^3.5.0",
     "tmp": "^0.0.33"
   },
@@ -56,7 +59,6 @@
     "eslint": "^5.12.0",
     "gulp": "^3.9.1",
     "gulp-batch": "^1.0.5",
-    "gulp-file": "^0.4.0",
     "gulp-less": "^4.0.1",
     "gulp-plumber": "^1.2.0",
     "gulp-rename": "^1.4.0",
@@ -71,6 +73,7 @@
     "rollup-plugin-istanbul": "^2.0.1",
     "rollup-plugin-json": "^3.1.0",
     "rollup-plugin-node-resolve": "^4.0.0",
+    "rollup-plugin-replace": "^2.1.0",
     "run-sequence": "^2.2.1",
     "sinon": "^7.2.2",
     "spectron": "^5.0.0",

servers.json

@@ -0,0 +1,3 @@
+{
+	"Test": "http://localhost:3000"
+}

src/background.js

@@ -1,4 +1,4 @@
-import { app, ipcMain, Menu } from 'electron';
+import { app, ipcMain } from 'electron';
 import querystring from 'querystring';
 import url from 'url';
 import idle from '@paulcbetts/system-idle-time';
@@ -14,36 +14,14 @@ import './background/screenshareDialog';
 import tray from './background/tray';
 import './background/updateDialog';
 import './background/updates';
-
-import i18n from './i18n/index.js';
+import i18n from './i18n';
 
 export { default as remoteServers } from './background/servers';
 export { certificate, dock, menus, tray };
 
 
 process.env.GOOGLE_API_KEY = 'AIzaSyADqUh_c1Qhji3Cp1NE43YrcpuPkmhXD-c';
 
-const unsetDefaultApplicationMenu = () => {
-	if (process.platform !== 'darwin') {
-		Menu.setApplicationMenu(null);
-		return;
-	}
-
-	const emptyMenuTemplate = [{
-		label: app.getName(),
-		submenu: [
-			{
-				label: i18n.__('&Quit %s', app.getName()),
-				accelerator: 'CommandOrControl+Q',
-				click() {
-					app.quit();
-				},
-			},
-		],
-	}];
-	Menu.setApplicationMenu(Menu.buildFromTemplate(emptyMenuTemplate));
-};
-
 const parseProtocolUrls = (args) =>
 	args.filter((arg) => /^rocketchat:\/\/./.test(arg))
 		.map((uri) => url.parse(uri))
@@ -90,10 +68,8 @@ if (gotTheLock) {
 	});
 
 	app.on('ready', async() => {
-		unsetDefaultApplicationMenu();
-
 		appData.initialize();
-
+		await i18n.initialize();
 		const mainWindow = await getMainWindow();
 		certificate.initWindow(mainWindow);
 

src/background/aboutDialog.js

@@ -1,6 +1,6 @@
 import { app, BrowserWindow, ipcMain } from 'electron';
 import { getMainWindow } from './mainWindow';
-import i18n from '../i18n/index.js';
+import i18n from '../i18n';
 
 
 let aboutWindow;
@@ -12,7 +12,7 @@ const openAboutDialog = async() => {
 
 	const mainWindow = await getMainWindow();
 	aboutWindow = new BrowserWindow({
-		title: i18n.__('About %s', app.getName()),
+		title: i18n.__('dialog.about.title', { appName: app.getName() }),
 		parent: mainWindow,
 		modal: process.platform !== 'darwin',
 		width: 400,

src/background/appData.js

@@ -1,12 +1,11 @@
 import { app, ipcMain } from 'electron';
 import jetpack from 'fs-jetpack';
 import path from 'path';
-import env from '../env';
 
 
 const definePath = () => {
 	const appName = app.getName();
-	const dirName = env.name === 'production' ? appName : `${ appName } (${ env.name })`;
+	const dirName = process.env.NODE_ENV === 'production' ? appName : `${ appName } (${ process.env.NODE_ENV })`;
 
 	app.setPath('userData', path.join(app.getPath('appData'), dirName));
 };
@@ -20,7 +19,7 @@ const reset = () => {
 
 const migrate = () => {
 	const olderAppName = 'Rocket.Chat+';
-	const dirName = env.name === 'production' ? olderAppName : `${ olderAppName } (${ env.name })`;
+	const dirName = process.env.NODE_ENV === 'production' ? olderAppName : `${ olderAppName } (${ process.env.NODE_ENV })`;
 	const olderUserDataPath = path.join(app.getPath('appData'), dirName);
 
 	try {

src/background/certificate.js

@@ -1,7 +1,7 @@
 import { app, dialog } from 'electron';
 import jetpack from 'fs-jetpack';
 import url from 'url';
-import i18n from '../i18n/index.js';
+import i18n from '../i18n';
 
 class CertificateStore {
 	initWindow(win) {
@@ -31,17 +31,17 @@ class CertificateStore {
 
 			let detail = `URL: ${ url }\nError: ${ error }`;
 			if (this.isExisting(url)) {
-				detail = i18n.__('Certificate_error_different', detail);
+				detail = i18n.__('error.differentCertificate', { detail });
 			}
 
 			dialog.showMessageBox(this.window, {
-				title: i18n.__('Certificate_error'),
-				message: i18n.__('Certificate_error_message', certificate.issuerName),
+				title: i18n.__('dialog.certificateError.title'),
+				message: i18n.__('dialog.certificateError.message', { issuerName: certificate.issuerName }),
 				detail,
 				type: 'warning',
 				buttons: [
-					i18n.__('Yes'),
-					i18n.__('No'),
+					i18n.__('dialog.certificateError.yes'),
+					i18n.__('dialog.certificateError.no'),
 				],
 				cancelId: 1,
 			}, (response) => {

src/background/mainWindow.js

@@ -1,7 +1,6 @@
 import { app, BrowserWindow, ipcMain } from 'electron';
 import createWindowStateKeeper from './windowState';
 import { whenReady, whenReadyToShow } from './utils';
-import env from '../env';
 
 
 let mainWindow = null;
@@ -83,7 +82,7 @@ export const getMainWindow = async() => {
 		mainWindow.loadURL(`file://${ __dirname }/public/app.html`);
 		attachWindowStateHandling(mainWindow);
 
-		if (env.name === 'development') {
+		if (process.env.NODE_ENV === 'development') {
 			mainWindow.openDevTools();
 		}
 	}