matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-19 05:22:13 +03:00
Code Activity

Make the disabled PowerSelector element showing custom value translatable. Fixes #5547

Browse Source
This commit is contained in:
Peter Vágner
2017-11-10 11:26:53 +01:00
parent 1e7fc953b3
commit 681f43913a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/elements/PowerSelector.js
View File

@@ -18,7 +18,7 @@ limitations under the License.
import React from 'react'; import React from 'react';
import * as Roles from '../../../Roles'; import * as Roles from '../../../Roles';
import { _t } from '../../../languageHandler'; import { _t, _tJsx } from '../../../languageHandler';
let LEVEL_ROLE_MAP = {}; let LEVEL_ROLE_MAP = {};
const reverseRoles = {}; const reverseRoles = {};
@@ -85,13 +85,11 @@ module.exports = React.createClass({
render: function() { render: function() {
let customPicker; let customPicker;
if (this.state.custom) { if (this.state.custom) {
let input;
if (this.props.disabled) { if (this.props.disabled) {
input = <span>{ this.props.value }</span>; customPicker = <span>{ _tJsx('Custom of <span/>', [/<span\/>/], [(sub) => <span>{ this.props.value }</span>]) }</span>;
} else { } else {
input = <input ref="custom" type="text" size="3" defaultValue={this.props.value} onBlur={this.onCustomBlur} onKeyDown={this.onCustomKeyDown} />; customPicker = <span><input ref="custom" type="text" size="3" defaultValue={this.props.value} onBlur={this.onCustomBlur} onKeyDown={this.onCustomKeyDown} /></span>;
} }
customPicker = <span> of { input }</span>;
} }
let selectValue; let selectValue;
@@ -102,7 +100,9 @@ module.exports = React.createClass({
} }
let select; let select;
if (this.props.disabled) { if (this.props.disabled) {
select = <span>{ selectValue }</span>; if (!this.state.custom) {
select = <span>{ selectValue }</span>;
}
} else { } else {
// Each level must have a definition in LEVEL_ROLE_MAP // Each level must have a definition in LEVEL_ROLE_MAP
const levels = [0, 50, 100]; const levels = [0, 50, 100];

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

@@ -581,6 +581,7 @@
"%(items)s and %(count)s others|other": "%(items)s and %(count)s others", "%(items)s and %(count)s others|other": "%(items)s and %(count)s others",
"%(items)s and %(count)s others|one": "%(items)s and one other", "%(items)s and %(count)s others|one": "%(items)s and one other",
"%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s", "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
"Custom of <span/>": "Custom of <span/>",
"Custom level": "Custom level", "Custom level": "Custom level",
"Room directory": "Room directory", "Room directory": "Room directory",
"Start chat": "Start chat", "Start chat": "Start chat",