Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Add some missing translatable strings #1588

Merged
merged 6 commits into from
Dec 7, 2017
Merged

Add some missing translatable strings #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a29ab09
Make the addresses heading on the aliases settings view translatable
pvagner Nov 8, 2017
1e7fc95
Ooops, also add the string to the default language file.
pvagner Nov 8, 2017
681f439
Make the disabled PowerSelector element showing custom value translat…
pvagner Nov 10, 2017
184b29d
Revert "Make the disabled PowerSelector element showing custom value …
pvagner Nov 18, 2017
093f110
Make the toggle button on the memberEventListSummary translatable
pvagner Nov 18, 2017
802abe7
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-…
pvagner Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/views/elements/MemberEventListSummary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ module.exports = React.createClass({
}
const toggleButton = (
<div className={"mx_MemberEventListSummary_toggle"} onClick={this._toggleSummary}>
{ expanded ? 'collapse' : 'expand' }
{ expanded ? _t('collapse') : _t('expand') }
</div>
);

Expand Down
2 changes: 1 addition & 1 deletion src/components/views/room_settings/AliasSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ module.exports = React.createClass({

return (
<div>
<h3>Addresses</h3>
<h3>{ _t('Addresses') }</h3>
<div className="mx_RoomSettings_aliasLabel">
{ _t('The main address for this room is') }: { canonical_alias_section }
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@
"not specified": "not specified",
"not set": "not set",
"Remote addresses for this room:": "Remote addresses for this room:",
"Addresses": "Addresses",
"The main address for this room is": "The main address for this room is",
"Local addresses for this room:": "Local addresses for this room:",
"This room has no local addresses": "This room has no local addresses",
Expand Down Expand Up @@ -612,6 +613,8 @@
"%(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 %(lastItem)s": "%(items)s and %(lastItem)s",
"collapse": "collapse",
"expand": "expand",
"Custom of %(powerLevel)s": "Custom of %(powerLevel)s",
"Custom level": "Custom level",
"Room directory": "Room directory",
Expand Down