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

wording changes from Amandine to settings

Browse source
This commit is contained in:
Matthew Hodgson 2016-01-18 19:56:38 +00:00
parent 765174a600
commit 7b91d3c5f8
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/components/views/rooms/RoomSettings.js
View file

@ -482,7 +482,7 @@ module.exports = React.createClass({
remote_aliases_section = remote_aliases_section =
<div> <div>
<div className="mx_RoomSettings_aliasLabel"> <div className="mx_RoomSettings_aliasLabel">
This room can be found elsewhere as: Remote addresses for this room:
</div> </div>
<div className="mx_RoomSettings_aliasesTable"> <div className="mx_RoomSettings_aliasesTable">
{ remote_domains.map(function(state_key, i) { { remote_domains.map(function(state_key, i) {
@ -513,7 +513,7 @@ module.exports = React.createClass({
return <option value={ alias } key={ i + "_" + j }>{ alias }</option> return <option value={ alias } key={ i + "_" + j }>{ alias }</option>
}); });
})} })}
<option value="" key="unset">not set</option> <option value="" key="unset">not specified</option>
</select> </select>
} }
else { else {
@ -522,11 +522,12 @@ module.exports = React.createClass({
var aliases_section = var aliases_section =
<div> <div>
<h3>Directory</h3> <h3>Addresses</h3>
<div className="mx_RoomSettings_aliasLabel">The main address for this room is: { canonical_alias_section }</div>
<div className="mx_RoomSettings_aliasLabel"> <div className="mx_RoomSettings_aliasLabel">
{ this.state.aliases[domain].length { this.state.aliases[domain].length
? "This room can be found on " + domain + " as:" ? "Local addresses for this room:"
: "This room is not findable on " + domain } : "This room has no local addresses" }
</div> </div>
<div className="mx_RoomSettings_aliasesTable"> <div className="mx_RoomSettings_aliasesTable">
{ this.state.aliases[domain].map(function(alias, i) { { this.state.aliases[domain].map(function(alias, i) {
@ -539,7 +540,7 @@ module.exports = React.createClass({
<EditableText <EditableText
className="mx_RoomSettings_alias mx_RoomSettings_editable" className="mx_RoomSettings_alias mx_RoomSettings_editable"
placeholderClassName="mx_RoomSettings_aliasPlaceholder" placeholderClassName="mx_RoomSettings_aliasPlaceholder"
placeholder={ "New alias (e.g. #foo:" + domain + ")" } placeholder={ "New address (e.g. #foo:" + domain + ")" }
blurToCancel={ false } blurToCancel={ false }
onValueChanged={ self.onAliasChanged.bind(self, domain, i) } onValueChanged={ self.onAliasChanged.bind(self, domain, i) }
editable={ can_set_room_aliases } editable={ can_set_room_aliases }
@ -567,7 +568,6 @@ module.exports = React.createClass({
{ remote_aliases_section } { remote_aliases_section }
<div className="mx_RoomSettings_aliasLabel">The official way to refer to this room is: { canonical_alias_section }</div>
</div>; </div>;
var room_colors_section = var room_colors_section =
@ -676,23 +676,23 @@ module.exports = React.createClass({
// FIXME: disable guests_read if the user hasn't turned on shared history // FIXME: disable guests_read if the user hasn't turned on shared history
return ( return (
<div className="mx_RoomSettings"> <div className="mx_RoomSettings">
<label><input type="checkbox" ref="is_private" defaultChecked={join_rule != "public"}/> Make this room private</label> <br/>
<label><input type="checkbox" ref="share_history" defaultChecked={history_visibility === "shared" || history_visibility === "world_readable"}/> Share message history with new participants</label> <br/>
<label><input type="checkbox" ref="guests_join" defaultChecked={guest_access === "can_join"}/> Let guests join this room</label> <br/>
<label><input type="checkbox" ref="guests_read" defaultChecked={history_visibility === "world_readable"}/> Let users read message history without joining</label> <br/>
<label className="mx_RoomSettings_encrypt"><input type="checkbox" /> Encrypt room</label>
{ tags_section } { tags_section }
<div className="mx_RoomSettings_toggles">
<label><input type="checkbox" ref="are_notifications_muted" defaultChecked={are_notifications_muted}/> Mute notifications for this room</label>
<label><input type="checkbox" ref="is_private" defaultChecked={join_rule != "public"}/> Make this room private</label>
<label><input type="checkbox" ref="share_history" defaultChecked={history_visibility === "shared" || history_visibility === "world_readable"}/> Share message history with new participants</label>
<label><input type="checkbox" ref="guests_join" defaultChecked={guest_access === "can_join"}/> Let guests join this room</label>
<label><input type="checkbox" ref="guests_read" defaultChecked={history_visibility === "world_readable"}/> Let users read message history without joining</label>
<label className="mx_RoomSettings_encrypt"><input type="checkbox" /> Encrypt room</label>
</div>
{ room_colors_section } { room_colors_section }
{ aliases_section } { aliases_section }
<h3>Notifications</h3>
<div className="mx_RoomSettings_settings">
<label><input type="checkbox" ref="are_notifications_muted" defaultChecked={are_notifications_muted}/> Mute notifications for this room</label>
</div>
<h3>Permissions</h3> <h3>Permissions</h3>
<div className="mx_RoomSettings_powerLevels mx_RoomSettings_settings"> <div className="mx_RoomSettings_powerLevels mx_RoomSettings_settings">
<div className="mx_RoomSettings_powerLevel"> <div className="mx_RoomSettings_powerLevel">
@ -736,7 +736,7 @@ module.exports = React.createClass({
{ unfederatable_section } { unfederatable_section }
</div> </div>
<h3>Users</h3> <h3>Privileged Users</h3>
<div className="mx_RoomSettings_userLevels mx_RoomSettings_settings"> <div className="mx_RoomSettings_userLevels mx_RoomSettings_settings">
<div> <div>
Your role in this room is currently <b><PowerSelector room={ this.props.room } value={current_user_level} disabled={true}/></b>. Your role in this room is currently <b><PowerSelector room={ this.props.room } value={current_user_level} disabled={true}/></b>.