imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix imports/exports

Browse source
This commit is contained in:
David Baker 2017-05-23 18:32:45 +01:00
parent cc0924f1c7
commit f412552c2c
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/UserSettings.js
View file

@ -30,7 +30,7 @@ const AddThreepid = require('../../AddThreepid');
const SdkConfig = require('../../SdkConfig'); const SdkConfig = require('../../SdkConfig');
import AccessibleButton from '../views/elements/AccessibleButton'; import AccessibleButton from '../views/elements/AccessibleButton';
import _t from 'counterpart-riot'; import _t from 'counterpart-riot';
const languageHandler = require('../../languageHandler'); import * as languageHandler from('../../languageHandler');
import * as FormattingUtils from '../../utils/FormattingUtils'; import * as FormattingUtils from '../../utils/FormattingUtils';
// if this looks like a release, use the 'version' from package.json; else use // if this looks like a release, use the 'version' from package.json; else use

2
src/components/views/elements/LanguageDropdown.js
View file

@ -19,7 +19,7 @@ import React from 'react';
import sdk from '../../../index'; import sdk from '../../../index';
import UserSettingsStore from '../../../UserSettingsStore'; import UserSettingsStore from '../../../UserSettingsStore';
import _t from 'counterpart-riot'; import _t from 'counterpart-riot';
import languageHandler from '../../../languageHandler'; import * as languageHandler from '../../../languageHandler';
import SdkConfig from '../../../SdkConfig'; import SdkConfig from '../../../SdkConfig';
let LANGUAGES = []; let LANGUAGES = [];

12
src/languageHandler.js
View file

@ -18,11 +18,11 @@ import request from 'browser-request';
// Workaround for broken export // Workaround for broken export
import * as counterpart from 'counterpart-riot'; import * as counterpart from 'counterpart-riot';
import UserSettingsStore from './UserSettingsStore'; import UserSettingsStore from './UserSettingsStore';
var q = require('q'); import q from 'q';
const i18nFolder = 'i18n/'; const i18nFolder = 'i18n/';
module.exports.setLanguage = function(languages, extCounterpart=null) { export function setLanguage(languages, extCounterpart=null) {
if (!languages || !Array.isArray(languages)) { if (!languages || !Array.isArray(languages)) {
const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser()); const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser());
console.log("no language found. Got from browser: " + JSON.stringify(languages)); console.log("no language found. Got from browser: " + JSON.stringify(languages));
@ -112,7 +112,7 @@ module.exports.setLanguage = function(languages, extCounterpart=null) {
}); });
}; };
module.exports.getAllLanguageKeysFromJson = function() { export function getAllLanguageKeysFromJson() {
let deferred = q.defer(); let deferred = q.defer();
request( request(
@ -139,11 +139,11 @@ module.exports.getAllLanguageKeysFromJson = function() {
return deferred.promise; return deferred.promise;
} }
module.exports.getLanguageFromBrowser = function() { export function getLanguageFromBrowser() {
return navigator.languages[0] || navigator.language || navigator.userLanguage; return navigator.languages[0] || navigator.language || navigator.userLanguage;
}; };
module.exports.getNormalizedLanguageKeys = function(language) { export function getNormalizedLanguageKeys(language) {
if (!language) { if (!language) {
return; return;
} }
@ -161,6 +161,6 @@ module.exports.getNormalizedLanguageKeys = function(language) {
return languageKeys; return languageKeys;
}; };
module.exports.normalizeLanguageKey = function(language) { export function normalizeLanguageKey(language) {
return language.toLowerCase().replace("_","-"); return language.toLowerCase().replace("_","-");
}; };