aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorChristophe HAMERLING <chamerling@linagora.com>2020-06-29 16:09:46 +0200
committerSaúl Ibarra Corretgé <s@saghul.net>2020-06-30 13:47:47 +0200
commit5b924fe218983dac468519ab8723fcd6b602aaed (patch)
tree57a6fdab6661cab26dd51658653ed44858cc02b0 /app
parentce588d65e81cd5e7557191c8b45b09fa207b371b (diff)
Open the conference with the app locale
Diffstat (limited to 'app')
-rw-r--r--app/features/conference/components/Conference.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/features/conference/components/Conference.js b/app/features/conference/components/Conference.js
index b87fc02..4a4dbb5 100644
--- a/app/features/conference/components/Conference.js
+++ b/app/features/conference/components/Conference.js
@@ -7,6 +7,7 @@ import type { Dispatch } from 'redux';
import { connect } from 'react-redux';
import { push } from 'react-router-redux';
+import i18n from '../../../i18n';
import config from '../../config';
import { getSetting, setEmail, setName } from '../../settings';
@@ -201,7 +202,11 @@ class Conference extends Component<Props, State> {
const roomName = url.pathname.split('/').pop();
const host = this._conference.serverURL.replace(/https?:\/\//, '');
const searchParameters = Object.fromEntries(url.searchParams);
- const urlParameters = Object.keys(searchParameters).length ? searchParameters : {};
+ const locale = { lng: i18n.language };
+ const urlParameters = {
+ ...searchParameters,
+ ...locale
+ };
const configOverwrite = {
startWithAudioMuted: this.props._startWithAudioMuted,