From b811f01ad121cff7453ffbfc5c9cd75c7ee54157 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Mon, 3 Oct 2016 08:10:20 -0700
Subject: [PATCH] Fixed lint issues
---
bigbluebutton-html5/client/langprovider.jsx | 83 ++++++++++---------
bigbluebutton-html5/client/main.jsx | 2 -
bigbluebutton-html5/client/services.js | 21 +++--
bigbluebutton-html5/imports/locales/index.js | 2 +
.../actions-dropdown/component.jsx | 1 +
5 files changed, 59 insertions(+), 50 deletions(-)
diff --git a/bigbluebutton-html5/client/langprovider.jsx b/bigbluebutton-html5/client/langprovider.jsx
index 71328523c3..671cb5ee95 100755
--- a/bigbluebutton-html5/client/langprovider.jsx
+++ b/bigbluebutton-html5/client/langprovider.jsx
@@ -4,55 +4,58 @@ import { loadMessages } from './services';
import { renderRoutes } from '../imports/startup/client/routes.js';
import Locales from '../imports/locales';
-//Set the defaultLocale below for all <FormattedMessage /> default messages.
-//The corresponding locale must be exported in /imports/locales/index.js
-let defaultLocale = "en";
-
-let defaultMsgs, newMsgs;
-let msgsUpdated = false, flag = true;
+// Set the defaultLocale below for all <FormattedMessage /> default messages.
+// The corresponding locale must be exported in /imports/locales/index.js
+let defaultLocale = 'en';
+let defaultMsgs;
+let newMsgs;
+let msgsUpdated = false;
+let flag = true;
let browserLang = navigator.language.split('-');
-let langRegion = browserLang[0] + "-" + browserLang[1].toUpperCase();
-let lang = browserLang[0], region = browserLang[1].toUpperCase();
+let langRegion = browserLang[0] + '-' + browserLang[1].toUpperCase();
+let lang = browserLang[0];
+let region = browserLang[1].toUpperCase();
defaultMsgs = Locales[defaultLocale];
-if(langRegion == defaultLocale || lang == defaultLocale){
- flag = false;
+if (langRegion == defaultLocale || lang == defaultLocale) {
+ flag = false;
}
class LangProvider extends Component {
- constructor(props) {
- super(props);
- this.state = {};
+ constructor(props) {
+ super(props);
+ this.state = {};
+ }
+
+ updateMessages(msgs) {
+ let updatedMsgs = loadMessages(msgs, defaultLocale, lang, langRegion);
+ return updatedMsgs;
+ }
+
+ render() {
+ while (flag) {
+ newMsgs = this.updateMessages(defaultMsgs);
+ flag = false;
+ msgsUpdated = true;
+ }
+
+ let passLocale;
+ let passMsgs;
+
+ if (msgsUpdated) {
+ passLocale = newMsgs[0]; passMsgs = newMsgs[1];
+ }else {
+ passLocale = defaultLocale; passMsgs = defaultMsgs;
+ }
+
+ return (
+ <IntlProvider locale={passLocale} messages={passMsgs}>
+ {renderRoutes()}
+ </IntlProvider>
+ );
}
-
- updateMessages(msgs){
- let updatedMsgs = loadMessages(msgs, defaultLocale, lang, langRegion);
- return updatedMsgs;
- }
-
- render() {
- while(flag){
- newMsgs = this.updateMessages(defaultMsgs);
- flag = false;
- msgsUpdated = true;
- }
-
- let passLocale, passMsgs;
-
- if(msgsUpdated){
- passLocale=newMsgs[0]; passMsgs=newMsgs[1];
- }else{
- passLocale=defaultLocale; passMsgs=defaultMsgs;
- }
-
- return (
- <IntlProvider locale={passLocale} messages={passMsgs}>
- {renderRoutes()}
- </IntlProvider>
- );
- }
}
export default LangProvider;
diff --git a/bigbluebutton-html5/client/main.jsx b/bigbluebutton-html5/client/main.jsx
index 6faf1f1828..dc22962247 100755
--- a/bigbluebutton-html5/client/main.jsx
+++ b/bigbluebutton-html5/client/main.jsx
@@ -3,10 +3,8 @@ import { Meteor } from 'meteor/meteor';
import { render } from 'react-dom';
import { renderRoutes } from '../imports/startup/client/routes.js';
import { IntlProvider } from 'react-intl';
-
import LangProvider from './langprovider';
-
// Helper to load javascript libraries from the BBB server
function loadLib(libname, success, fail) {
const successCallback = function (cb) {
diff --git a/bigbluebutton-html5/client/services.js b/bigbluebutton-html5/client/services.js
index 93a973436e..308f9b1b4f 100755
--- a/bigbluebutton-html5/client/services.js
+++ b/bigbluebutton-html5/client/services.js
@@ -5,12 +5,17 @@ var extend = require('util')._extend;
function loadMessages(defaultMsgs, defaultLocale, lang, langRegion) {
let newMessages;
- let langOnly = false, langRegionOnly = false;
- //let localeFound = false, attempted = false;
+ let langOnly = false;
+
+ let langRegionOnly = false;
+
+ //let localeFound = false;
+ //let attempted = false;
//pt_BR is used for testing.
- let pt_BR = {
+ /*
+ let PT_BR = {
"app.home.greeting": "Bem-vindo {name}! Sua aprensentação começará em breve...",
"app.userlist.participantsTitle": "Participantes",
"app.userlist.messagesTitle": "Mensagens",
@@ -27,8 +32,7 @@ function loadMessages(defaultMsgs, defaultLocale, lang, langRegion) {
"app.connectingMessage": "Conectando...",
"app.waitingMessage": "Desconectado. Tentando reconectar em {seconds} segundos..."
}
-
-
+ */
//TODO: get ajax calls to work, issue is with the url. doesnt have access to locale .json files
/*
@@ -67,15 +71,16 @@ function loadMessages(defaultMsgs, defaultLocale, lang, langRegion) {
}
*/
- var combined = extend(defaultMsgs, newMessages);
//var combined = extend(defaultMsgs, pt_BR);
+ var combined = extend(defaultMsgs, newMessages);
+
let results = [];
- if(langOnly){
+ if (langOnly) {
results = [lang, combined];
}else if (langRegionOnly) {
results = [langRegion, combined];
- }else{
+ }else {
results = [defaultLocale, combined];
}
diff --git a/bigbluebutton-html5/imports/locales/index.js b/bigbluebutton-html5/imports/locales/index.js
index f1b81d29f1..09fa0e0dd7 100755
--- a/bigbluebutton-html5/imports/locales/index.js
+++ b/bigbluebutton-html5/imports/locales/index.js
@@ -1,7 +1,9 @@
import en from './en.json';
+
//import ptBR from './pt-BR.json';
export default {
en: en,
+
//'pt-BR': ptBR,
};
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index fa2d1efa6d..406e3e71a1 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -11,6 +11,7 @@ import DropdownListItem from '/imports/ui/components/dropdown/list/item/componen
const intlMessages = defineMessages({
actionsLabel: {
id: 'app.actionsBar.actionsDropdown.actionsLabel',
+
//defaultMessage: 'Actions',
},
presentationLabel: {
--
GitLab