OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
RiotTranslate 2017-05-28 23:08:11 +00:00
parent d325582344 776712995f
commit 93b958419a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/dialogs/ConfirmRedactDialog.js
View File

@ -42,7 +42,7 @@ export default React.createClass({
render: function() { render: function() {
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const title = "Confirm Redaction"; const title = "Confirm Removal";
const confirmButtonClass = classnames({ const confirmButtonClass = classnames({
'mx_Dialog_primary': true, 'mx_Dialog_primary': true,
@ -55,12 +55,12 @@ export default React.createClass({
title={title} title={title}
> >
<div className="mx_Dialog_content"> <div className="mx_Dialog_content">
Are you sure you wish to redact (delete) this event? Are you sure you wish to remove (delete) this event?
Note that if you redact a room name or topic change, it could undo the change. Note that if you delete a room name or topic change, it could undo the change.
</div> </div>
<div className="mx_Dialog_buttons"> <div className="mx_Dialog_buttons">
<button className={confirmButtonClass} onClick={this.onOk}> <button className={confirmButtonClass} onClick={this.onOk}>
Redact Remove
</button> </button>
<button onClick={this.onCancel}> <button onClick={this.onCancel}>

2
src/components/views/messages/UnknownBody.js
View File

@ -24,7 +24,7 @@ module.exports = React.createClass({
render: function() { render: function() {
const text = this.props.mxEvent.getContent().body; const text = this.props.mxEvent.getContent().body;
return ( return (
<span className="mx_UnknownBody" title="Redacted or unknown message type"> <span className="mx_UnknownBody" title="Removed or unknown message type">
{text} {text}
</span> </span>
); );

2
src/components/views/rooms/RoomSettings.js
View File

@ -927,7 +927,7 @@ module.exports = React.createClass({
<PowerSelector ref="ban" value={ban_level} controlled={false} disabled={!can_change_levels || current_user_level < ban_level} onChange={this.onPowerLevelsChanged}/> <PowerSelector ref="ban" value={ban_level} controlled={false} disabled={!can_change_levels || current_user_level < ban_level} onChange={this.onPowerLevelsChanged}/>
</div> </div>
<div className="mx_RoomSettings_powerLevel"> <div className="mx_RoomSettings_powerLevel">
<span className="mx_RoomSettings_powerLevelKey">{ _t('To redact other users\' messages') }, { _t('you must be a') } </span> <span className="mx_RoomSettings_powerLevelKey">{ _t('To remove other users\' messages') }, { _t('you must be a') } </span>
<PowerSelector ref="redact" value={redact_level} controlled={false} disabled={!can_change_levels || current_user_level < redact_level} onChange={this.onPowerLevelsChanged}/> <PowerSelector ref="redact" value={redact_level} controlled={false} disabled={!can_change_levels || current_user_level < redact_level} onChange={this.onPowerLevelsChanged}/>
</div> </div>