Update translations
This commit is contained in:
@@ -123,7 +123,7 @@ const TopBar = (props) =>
|
||||
room,
|
||||
peersLength,
|
||||
lobbyPeers,
|
||||
stickyAppBar,
|
||||
permanentTopBar,
|
||||
myPicture,
|
||||
loggedIn,
|
||||
loginEnabled,
|
||||
@@ -174,7 +174,7 @@ const TopBar = (props) =>
|
||||
return (
|
||||
<AppBar
|
||||
position='fixed'
|
||||
className={room.toolbarsVisible || stickyAppBar ? classes.show : classes.hide}
|
||||
className={room.toolbarsVisible || permanentTopBar ? classes.show : classes.hide}
|
||||
>
|
||||
<Toolbar>
|
||||
<PulsingBadge
|
||||
@@ -364,7 +364,7 @@ TopBar.propTypes =
|
||||
room : appPropTypes.Room.isRequired,
|
||||
peersLength : PropTypes.number,
|
||||
lobbyPeers : PropTypes.array,
|
||||
stickyAppBar : PropTypes.bool,
|
||||
permanentTopBar : PropTypes.bool,
|
||||
myPicture : PropTypes.string,
|
||||
loggedIn : PropTypes.bool.isRequired,
|
||||
loginEnabled : PropTypes.bool.isRequired,
|
||||
@@ -386,7 +386,7 @@ const mapStateToProps = (state) =>
|
||||
room : state.room,
|
||||
peersLength : peersLengthSelector(state),
|
||||
lobbyPeers : lobbyPeersKeySelector(state),
|
||||
stickyAppBar : state.settings.stickyAppBar,
|
||||
permanentTopBar : state.settings.permanentTopBar,
|
||||
loggedIn : state.me.loggedIn,
|
||||
loginEnabled : state.me.loginEnabled,
|
||||
myPicture : state.me.picture,
|
||||
@@ -430,7 +430,7 @@ export default withRoomContext(connect(
|
||||
prev.room === next.room &&
|
||||
prev.peers === next.peers &&
|
||||
prev.lobbyPeers === next.lobbyPeers &&
|
||||
prev.settings.stickyAppBar === next.settings.stickyAppBar &&
|
||||
prev.settings.permanentTopBar === next.settings.permanentTopBar &&
|
||||
prev.me.loggedIn === next.me.loggedIn &&
|
||||
prev.me.loginEnabled === next.me.loginEnabled &&
|
||||
prev.me.picture === next.me.picture &&
|
||||
|
||||
@@ -68,7 +68,7 @@ class Democratic extends React.PureComponent
|
||||
|
||||
const width = this.peersRef.current.clientWidth - PADDING_H;
|
||||
const height = this.peersRef.current.clientHeight -
|
||||
(this.props.toolbarsVisible || this.props.stickyAppBar ? PADDING_V : PADDING_H);
|
||||
(this.props.toolbarsVisible || this.props.permanentTopBar ? PADDING_V : PADDING_H);
|
||||
|
||||
let x, y, space;
|
||||
|
||||
@@ -129,7 +129,7 @@ class Democratic extends React.PureComponent
|
||||
advancedMode,
|
||||
spotlightsPeers,
|
||||
toolbarsVisible,
|
||||
stickyAppBar,
|
||||
permanentTopBar,
|
||||
classes
|
||||
} = this.props;
|
||||
|
||||
@@ -143,7 +143,7 @@ class Democratic extends React.PureComponent
|
||||
<div
|
||||
className={classnames(
|
||||
classes.root,
|
||||
toolbarsVisible || stickyAppBar ? classes.showingToolBar : classes.hiddenToolBar
|
||||
toolbarsVisible || permanentTopBar ? classes.showingToolBar : classes.hiddenToolBar
|
||||
)}
|
||||
ref={this.peersRef}
|
||||
>
|
||||
@@ -175,7 +175,7 @@ Democratic.propTypes =
|
||||
boxes : PropTypes.number,
|
||||
spotlightsPeers : PropTypes.array.isRequired,
|
||||
toolbarsVisible : PropTypes.bool.isRequired,
|
||||
stickyAppBar : PropTypes.bool,
|
||||
permanentTopBar : PropTypes.bool,
|
||||
classes : PropTypes.object.isRequired
|
||||
};
|
||||
|
||||
@@ -185,7 +185,7 @@ const mapStateToProps = (state) =>
|
||||
boxes : videoBoxesSelector(state),
|
||||
spotlightsPeers : spotlightPeersSelector(state),
|
||||
toolbarsVisible : state.room.toolbarsVisible,
|
||||
stickyAppBar : state.settings.stickyAppBar
|
||||
permanentTopBar : state.settings.permanentTopBar
|
||||
};
|
||||
};
|
||||
|
||||
@@ -202,7 +202,7 @@ export default connect(
|
||||
prev.consumers === next.consumers &&
|
||||
prev.room.spotlights === next.room.spotlights &&
|
||||
prev.room.toolbarsVisible === next.room.toolbarsVisible &&
|
||||
prev.settings.stickyAppBar === next.settings.stickyAppBar
|
||||
prev.settings.permanentTopBar === next.settings.permanentTopBar
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ const Settings = ({
|
||||
me,
|
||||
settings,
|
||||
onToggleAdvancedMode,
|
||||
onToggleStickyAppBar,
|
||||
onTogglePermanentTopBar,
|
||||
handleCloseSettings,
|
||||
handleChangeMode,
|
||||
classes
|
||||
@@ -324,17 +324,17 @@ const Settings = ({
|
||||
<FormHelperText>
|
||||
<FormattedMessage
|
||||
id='settings.lastn'
|
||||
defaultMessage='Select the amount of speakers visible'
|
||||
defaultMessage='Number of visible videos'
|
||||
/>
|
||||
</FormHelperText>
|
||||
</FormControl>
|
||||
</form>
|
||||
<FormControlLabel
|
||||
className={classes.setting}
|
||||
control={<Checkbox checked={settings.stickyAppBar} onChange={onToggleStickyAppBar} value='stickyAppBar' />}
|
||||
control={<Checkbox checked={settings.permanentTopBar} onChange={onTogglePermanentTopBar} value='permanentTopBar' />}
|
||||
label={intl.formatMessage({
|
||||
id : 'settings.stickyAppBar',
|
||||
defaultMessage : 'Sticky App Bar'
|
||||
id : 'settings.permanentTopBar',
|
||||
defaultMessage : 'Permanent top bar'
|
||||
})}
|
||||
/>
|
||||
</React.Fragment>
|
||||
@@ -358,7 +358,7 @@ Settings.propTypes =
|
||||
room : appPropTypes.Room.isRequired,
|
||||
settings : PropTypes.object.isRequired,
|
||||
onToggleAdvancedMode : PropTypes.func.isRequired,
|
||||
onToggleStickyAppBar : PropTypes.func.isRequired,
|
||||
onTogglePermanentTopBar : PropTypes.func.isRequired,
|
||||
handleChangeMode : PropTypes.func.isRequired,
|
||||
handleCloseSettings : PropTypes.func.isRequired,
|
||||
classes : PropTypes.object.isRequired
|
||||
@@ -375,7 +375,7 @@ const mapStateToProps = (state) =>
|
||||
|
||||
const mapDispatchToProps = {
|
||||
onToggleAdvancedMode : settingsActions.toggleAdvancedMode,
|
||||
onToggleStickyAppBar : settingsActions.toggleStickyAppBar,
|
||||
onTogglePermanentTopBar : settingsActions.togglePermanentTopBar,
|
||||
handleChangeMode : roomActions.setDisplayMode,
|
||||
handleCloseSettings : roomActions.setSettingsOpen
|
||||
};
|
||||
|
||||
@@ -83,7 +83,7 @@ const FullScreenView = (props) =>
|
||||
consumer,
|
||||
toggleConsumerFullscreen,
|
||||
toolbarsVisible,
|
||||
stickyAppBar,
|
||||
permanentTopBar,
|
||||
classes
|
||||
} = props;
|
||||
|
||||
@@ -106,7 +106,7 @@ const FullScreenView = (props) =>
|
||||
<div className={classes.controls}>
|
||||
<div
|
||||
className={classnames(classes.button, {
|
||||
visible : toolbarsVisible || stickyAppBar
|
||||
visible : toolbarsVisible || permanentTopBar
|
||||
})}
|
||||
onClick={(e) =>
|
||||
{
|
||||
@@ -135,7 +135,7 @@ FullScreenView.propTypes =
|
||||
consumer : appPropTypes.Consumer,
|
||||
toggleConsumerFullscreen : PropTypes.func.isRequired,
|
||||
toolbarsVisible : PropTypes.bool,
|
||||
stickyAppBar : PropTypes.bool,
|
||||
permanentTopBar : PropTypes.bool,
|
||||
classes : PropTypes.object.isRequired
|
||||
};
|
||||
|
||||
@@ -143,7 +143,7 @@ const mapStateToProps = (state) =>
|
||||
({
|
||||
consumer : state.consumers[state.room.fullScreenConsumer],
|
||||
toolbarsVisible : state.room.toolbarsVisible,
|
||||
stickyAppBar : state.settings.stickyAppBar
|
||||
permanentTopBar : state.settings.permanentTopBar
|
||||
});
|
||||
|
||||
const mapDispatchToProps = (dispatch) =>
|
||||
@@ -166,7 +166,7 @@ export default connect(
|
||||
prev.consumers[prev.room.fullScreenConsumer] ===
|
||||
next.consumers[next.room.fullScreenConsumer] &&
|
||||
prev.room.toolbarsVisible === next.room.toolbarsVisible &&
|
||||
prev.settings.stickyAppBar === next.settings.stickyAppBar
|
||||
prev.settings.permanentTopBar === next.settings.permanentTopBar
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user