add headers and copy to lessen confusion of new alias workings
This commit is contained in:
parent
26f6203985
commit
31cb257eb9
3 changed files with 16 additions and 6 deletions
|
@ -356,6 +356,9 @@ export default class AliasSettings extends React.Component {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='mx_AliasSettings'>
|
<div className='mx_AliasSettings'>
|
||||||
|
<span className='mx_SettingsTab_subheading'>{_t("Published Addresses")}</span>
|
||||||
|
<p>{_t("Published addresses can be used by anyone on any server to join your room. " +
|
||||||
|
"To publish an address it needs to be set as a local address first.")}</p>
|
||||||
{canonicalAliasSection}
|
{canonicalAliasSection}
|
||||||
<RoomPublishSetting roomId={this.props.roomId} canSetCanonicalAlias={this.props.canSetCanonicalAlias} />
|
<RoomPublishSetting roomId={this.props.roomId} canSetCanonicalAlias={this.props.canSetCanonicalAlias} />
|
||||||
<datalist id="mx_AliasSettings_altRecommendations">
|
<datalist id="mx_AliasSettings_altRecommendations">
|
||||||
|
@ -374,12 +377,14 @@ export default class AliasSettings extends React.Component {
|
||||||
onItemAdded={this.onAltAliasAdded}
|
onItemAdded={this.onAltAliasAdded}
|
||||||
onItemRemoved={this.onAltAliasDeleted}
|
onItemRemoved={this.onAltAliasDeleted}
|
||||||
suggestionsListId="mx_AliasSettings_altRecommendations"
|
suggestionsListId="mx_AliasSettings_altRecommendations"
|
||||||
itemsLabel={_t('Alternative addresses for this room:')}
|
itemsLabel={_t('Other published addresses:')}
|
||||||
noItemsLabel={_t('This room has no alternative addresses')}
|
noItemsLabel={_t('No other published addresses yet, add one below')}
|
||||||
placeholder={_t(
|
placeholder={_t(
|
||||||
'New address (e.g. #foo:domain)',
|
'New address (e.g. #foo:domain)',
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
|
<span className='mx_SettingsTab_subheading'>{_t("Local Addresses")}</span>
|
||||||
|
<p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
|
||||||
<details onToggle={this.onLocalAliasesToggled}>
|
<details onToggle={this.onLocalAliasesToggled}>
|
||||||
<summary>{_t('Local addresses (unmoderated content)')}</summary>
|
<summary>{_t('Local addresses (unmoderated content)')}</summary>
|
||||||
{localAliasesList}
|
{localAliasesList}
|
||||||
|
|
|
@ -68,12 +68,13 @@ export default class GeneralRoomSettingsTab extends React.Component {
|
||||||
<RoomProfileSettings roomId={this.props.roomId} />
|
<RoomProfileSettings roomId={this.props.roomId} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span className='mx_SettingsTab_subheading'>{_t("Room Addresses")}</span>
|
<div className="mx_SettingsTab_heading">{_t("Room Addresses")}</div>
|
||||||
<div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
|
<div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
|
||||||
<AliasSettings roomId={this.props.roomId}
|
<AliasSettings roomId={this.props.roomId}
|
||||||
canSetCanonicalAlias={canSetCanonical} canSetAliases={canSetAliases}
|
canSetCanonicalAlias={canSetCanonical} canSetAliases={canSetAliases}
|
||||||
canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
|
canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
|
||||||
</div>
|
</div>
|
||||||
|
<div className="mx_SettingsTab_heading">{_t("Other")}</div>
|
||||||
<span className='mx_SettingsTab_subheading'>{_t("Flair")}</span>
|
<span className='mx_SettingsTab_subheading'>{_t("Flair")}</span>
|
||||||
<div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
|
<div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
|
||||||
<RelatedGroupSettings roomId={room.roomId}
|
<RelatedGroupSettings roomId={room.roomId}
|
||||||
|
|
|
@ -840,7 +840,6 @@
|
||||||
"This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "This room isn’t bridging messages to any platforms. <a>Learn more.</a>",
|
"This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "This room isn’t bridging messages to any platforms. <a>Learn more.</a>",
|
||||||
"Bridges": "Bridges",
|
"Bridges": "Bridges",
|
||||||
"Room Addresses": "Room Addresses",
|
"Room Addresses": "Room Addresses",
|
||||||
"Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
|
|
||||||
"URL Previews": "URL Previews",
|
"URL Previews": "URL Previews",
|
||||||
"Uploaded sound": "Uploaded sound",
|
"Uploaded sound": "Uploaded sound",
|
||||||
"Sounds": "Sounds",
|
"Sounds": "Sounds",
|
||||||
|
@ -1164,9 +1163,13 @@
|
||||||
"not specified": "not specified",
|
"not specified": "not specified",
|
||||||
"This room has no local addresses": "This room has no local addresses",
|
"This room has no local addresses": "This room has no local addresses",
|
||||||
"New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
|
"New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
|
||||||
"Alternative addresses for this room:": "Alternative addresses for this room:",
|
"Published Addresses": "Published Addresses",
|
||||||
"This room has no alternative addresses": "This room has no alternative addresses",
|
"Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.",
|
||||||
|
"Other published addresses:": "Other published addresses:",
|
||||||
|
"No other published addresses yet, add one below": "No other published addresses yet, add one below",
|
||||||
"New address (e.g. #foo:domain)": "New address (e.g. #foo:domain)",
|
"New address (e.g. #foo:domain)": "New address (e.g. #foo:domain)",
|
||||||
|
"Local Addresses": "Local Addresses",
|
||||||
|
"Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)",
|
||||||
"Local addresses (unmoderated content)": "Local addresses (unmoderated content)",
|
"Local addresses (unmoderated content)": "Local addresses (unmoderated content)",
|
||||||
"Error updating flair": "Error updating flair",
|
"Error updating flair": "Error updating flair",
|
||||||
"There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
|
"There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
|
||||||
|
@ -1178,6 +1181,7 @@
|
||||||
"Room Name": "Room Name",
|
"Room Name": "Room Name",
|
||||||
"Room Topic": "Room Topic",
|
"Room Topic": "Room Topic",
|
||||||
"Room avatar": "Room avatar",
|
"Room avatar": "Room avatar",
|
||||||
|
"Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
|
||||||
"You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
|
"You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
|
||||||
"You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
|
"You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
|
||||||
"URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
|
"URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
|
||||||
|
|
Loading…
Reference in a new issue