js/i18n.js -> js/modules/i18n.js

.eslintignore

@@ -22,7 +22,6 @@ js/react/**/*.js
 !js/backup.js
 !js/database.js
 !js/logging.js
-!js/i18n.js
 !js/models/conversations.js
 !js/views/attachment_view.js
 !js/views/conversation_search_view.js

Gruntfile.js

@@ -101,7 +101,6 @@ module.exports = function(grunt) {
         '!js/backup.js',
         '!js/components.js',
         '!js/database.js',
-        '!js/i18n.js',
         '!js/jquery.js',
         '!js/libsignal-protocol-worker.js',
         '!js/libtextsecure.js',

js/react/util/index.ts

@@ -51,7 +51,7 @@ const locale = urlOptions.locale || 'en';
 import localeMessages from '../../../_locales/en/messages.json';
 
 // @ts-ignore
-import { setup } from '../../i18n';
+import { setup } from '../../modules/i18n';
 
 const i18n = setup(locale, localeMessages);
 

preload.js

@@ -113,7 +113,7 @@ window.React = require('react');
 window.ReactDOM = require('react-dom');
 window.moment = require('moment');
 
-const { setup } = require('./js/i18n');
+const { setup } = require('./js/modules/i18n');
 
 const { locale, localeMessages } = window.config;
 window.i18n = setup(locale, localeMessages);