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

Merge pull request #6406 from matrix-org/travis/notifications-ui-order 

Revert order of notification setting radios
pull/21833/head
Travis Ralston 2021-07-19 10:24:06 -06:00 committed by GitHub
parent 676d2aa187 6862d97961
commit 4856559661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/settings/Notifications.tsx
View File

@ -569,8 +569,8 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
const rows = this.state.vectorPushRules[category].map(r => <tr key={category + r.ruleId}> const rows = this.state.vectorPushRules[category].map(r => <tr key={category + r.ruleId}>
<td>{ r.description }</td> <td>{ r.description }</td>
<td>{ makeRadio(r, VectorState.On) }</td>
<td>{ makeRadio(r, VectorState.Off) }</td> <td>{ makeRadio(r, VectorState.Off) }</td>
<td>{ makeRadio(r, VectorState.On) }</td>
<td>{ makeRadio(r, VectorState.Loud) }</td> <td>{ makeRadio(r, VectorState.Loud) }</td>
</tr>); </tr>);
@ -594,8 +594,8 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
<thead> <thead>
<tr> <tr>
<th>{ sectionName }</th> <th>{ sectionName }</th>
<th>{ _t("On") }</th>
<th>{ _t("Off") }</th> <th>{ _t("Off") }</th>
<th>{ _t("On") }</th>
<th>{ _t("Noisy") }</th> <th>{ _t("Noisy") }</th>
</tr> </tr>
</thead> </thead>

2
src/i18n/strings/en_EN.json
View File

@ -1146,8 +1146,8 @@
"New keyword": "New keyword", "New keyword": "New keyword",
"Global": "Global", "Global": "Global",
"Mentions & keywords": "Mentions & keywords", "Mentions & keywords": "Mentions & keywords",
"On": "On",
"Off": "Off", "Off": "Off",
"On": "On",
"Noisy": "Noisy", "Noisy": "Noisy",
"Notification targets": "Notification targets", "Notification targets": "Notification targets",
"There was an error loading your notification settings.": "There was an error loading your notification settings.", "There was an error loading your notification settings.": "There was an error loading your notification settings.",