PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-03-08 16:47:50 +00:00
commit 3d34596162
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -704,8 +704,10 @@ module.exports = React.createClass({
{ Object.keys(userLevels).map(function(user, i) {
return (
<li className="mx_RoomSettings_userLevel" key={user}>
{ _t("%(user)s is a", {user: user}) }
<PowerSelector value={userLevels[user]} disabled={true} />
{ _t("%(user)s is a %(userRole)s", {
user: user,
userRole: <PowerSelector value={userLevels[user]} disabled={true} />,
}) }
</li>
);
}) }

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

@ -445,7 +445,7 @@
"To ban users, you must be a": "To ban users, you must be a",
"To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
"Privileged Users": "Privileged Users",
"%(user)s is a": "%(user)s is a",
"%(user)s is a %(userRole)s": "%(user)s is a %(userRole)s",
"No users have specific privileges in this room": "No users have specific privileges in this room",
"Banned users": "Banned users",
"This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",