);
- let placeholderUserName = "User name";
+ let placeholderUserName = _t("User name");
if (this.props.guestUsername) {
- placeholderUserName += " (default: " + this.props.guestUsername + ")";
+ placeholderUserName += " " + _t("(default: %(userName)s)", {userName: this.props.guestUsername});
}
return (
@@ -356,15 +356,15 @@ module.exports = React.createClass({
onBlur={function() {self.validateField(FIELD_USERNAME);}} />
{ this.props.guestUsername ?
-
Setting a user name will create a fresh account
: null
+
{_t("Setting a user name will create a fresh account")}
: null
}
+ placeholder={_t("Password")} defaultValue={this.props.defaultPassword} />
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index b48c5a4fe2..b9c9c7d989 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -230,7 +230,7 @@ module.exports = React.createClass({
remote_aliases_section = (
- Remote addresses for this room:
+ {_t("Remote addresses for this room:")}
{ this.state.remoteDomains.map((domain, i) => {
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index d221cd4fd8..e5236b90cc 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -20,7 +20,7 @@ var MatrixClientPeg = require('../../../MatrixClientPeg');
var sdk = require("../../../index");
var Modal = require("../../../Modal");
var UserSettingsStore = require('../../../UserSettingsStore');
-import { _t } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';
module.exports = React.createClass({
@@ -131,12 +131,24 @@ module.exports = React.createClass({
;
}
+ let urlPreviewText = null;
+ if (UserSettingsStore.getUrlPreviewsDisabled()) {
+ urlPreviewText = (
+ _tJsx("You have
disabled URL previews by default.", /
(.*?)<\/a>/, (sub)=>{sub})
+ );
+ }
+ else {
+ urlPreviewText = (
+ _tJsx("You have
enabled URL previews by default.", /
(.*?)<\/a>/, (sub)=>{sub})
+ );
+ }
+
return (
{_t("URL Previews")}
{ disableRoomPreviewUrls }