ref(i18next): Remove the base/config dependancy.

This commit is contained in:
hristoterezov 2018-05-17 16:09:32 -05:00 committed by Дамян Минков
parent 44c498a566
commit 9131d2448d
3 changed files with 14 additions and 66 deletions

View File

@ -23,20 +23,7 @@ class Translation {
/**
*
*/
generateTranslationHTML(key: string, options: Object) {
const optAttr
= options ? ` data-i18n-options='${JSON.stringify(options)}'` : '';
// XXX i18next expects undefined if options are missing.
const text = i18next.t(key, options ? options : undefined);
return `<span data-i18n="${key}"${optAttr}>${text}</span>`;
}
/**
*
*/
init() {
constructor() {
jqueryI18next.init(i18next, $, { useOptionsAttr: true });
if (i18next.isInitialized) {
@ -48,6 +35,19 @@ class Translation {
i18next.on('languageChanged', _onI18nInitialized);
}
/**
*
*/
generateTranslationHTML(key: string, options: Object) {
const optAttr
= options ? ` data-i18n-options='${JSON.stringify(options)}'` : '';
// XXX i18next expects undefined if options are missing.
const text = i18next.t(key, options ? options : undefined);
return `<span data-i18n="${key}"${optAttr}>${text}</span>`;
}
/**
*
*/

View File

@ -4,5 +4,3 @@ export * from './functions';
// TODO Eventually (e.g. when the non-React Web app is rewritten into React), it
// should not be necessary to export i18next.
export { default as i18next, DEFAULT_LANGUAGE, LANGUAGES } from './i18next';
import './middleware';

View File

@ -1,50 +0,0 @@
/* @flow */
// FIXME: Using '../config/actionTypes' instead of '../config' is a quick fix
// for the dial-in info page. Importing '../config' results in JitsiMeetJS
// undefined error (/base/config imports /app which import /lib-jitsi-meet/).
import { SET_CONFIG } from '../config/actionTypes';
import { MiddlewareRegistry } from '../redux';
declare var APP: Object;
/**
* The redux middleware of the feature base/i18n.
*
* @param {Store} store - The redux store.
* @returns {Function}
* @private
*/
MiddlewareRegistry.register(store => next => action => {
switch (action.type) {
case SET_CONFIG:
return _setConfig(store, next, action);
}
return next(action);
});
/**
* Notifies the feature base/i18n that the action SET_CONFIG is being dispatched
* within a specific redux store.
*
* @param {Store} store - The redux store in which the specified action is being
* dispatched.
* @param {Dispatch} next - The redux dispatch function to dispatch the
* specified action to the specified store.
* @param {Action} action - The redux action SET_CONFIG which is being
* dispatched in the specified store.
* @private
* @returns {Object} The new state that is the result of the reduction of the
* specified action.
*/
function _setConfig({ getState }, next, action) {
const oldValue = getState()['features/base/config'];
const result = next(action);
const newValue = getState()['features/base/config'];
if (oldValue !== newValue && typeof APP === 'object') {
APP.translation.init();
}
return result;
}