gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4198 from vector-im/luke/ilag-i18n 

i18n for SetPasswordDialog
This commit is contained in:
Luke Barnard 2017-06-05 17:00:21 +01:00 committed by GitHub
parent 13262d9a8b 0919b7ce3a
commit 5e67bcdac7
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/views/dialogs/SetPasswordDialog.js
View File

@ -14,11 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import q from 'q';
import React from 'react';
import sdk from 'matrix-react-sdk';
import {MatrixClientPeg} from 'matrix-react-sdk';
import classnames from 'classnames';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
/**
* Prompt the user to set a password
@ -51,9 +50,12 @@ export default React.createClass({
_onPasswordChangeError: function(err) {
let errMsg = err.error || "";
if (err.httpStatus === 403) {
errMsg = "Failed to change password. Is your password correct?";
errMsg = _t('Failed to change password. Is your password correct?');
} else if (err.httpStatus) {
errMsg += ` (HTTP status ${err.httpStatus})`;
errMsg += _t(
' (HTTP status %(httpStatus))',
{ httpStatus: err.httpStatus },
);
}
this.setState({
error: errMsg,
@ -63,18 +65,16 @@ export default React.createClass({
render: function() {
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const ChangePassword = sdk.getComponent('views.settings.ChangePassword');
const Spinner = sdk.getComponent('elements.Spinner');
if (this.state.success) {
return (
<BaseDialog className="mx_SetPasswordDialog"
onFinished={this.props.onFinished}
title="You have successfully set a password!"
title={ _t('You have successfully set a password!') }
>
<div className="mx_Dialog_content">
<p>
You can now return to your account after signing out,
and sign in on other devices.
{ _t('You can now return to your account after signing out, and sign in on other devices.') }
</p>
</div>
<div className="mx_Dialog_buttons">
@ -82,7 +82,7 @@ export default React.createClass({
className="mx_Dialog_primary"
autoFocus={true}
onClick={this._onContinueClicked}>
Continue
{ _t('Continue') }
</button>
</div>
</BaseDialog>
@ -92,12 +92,11 @@ export default React.createClass({
return (
<BaseDialog className="mx_SetPasswordDialog"
onFinished={this.props.onFinished}
title="Please set a password!"
title={ _t('Please set a password!') }
>
<div className="mx_Dialog_content">
<p>
This will allow you to return to your account after signing out,
and sign in on other devices.
{ _t('This will allow you to return to your account after signing out, and sign in on other devices.') }
</p>
<ChangePassword
className="mx_SetPasswordDialog_change_password"

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

@ -156,5 +156,11 @@
"Dev chat for the Riot/Web dev team": "Dev chat for the Riot/Web dev team",
"Dev chat for the Dendrite dev team": "Dev chat for the Dendrite dev team",
"Co-ordination for Riot/Web translators": "Co-ordination for Riot/Web translators",
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!"
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!",
"Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
"You have successfully set a password!": "You have successfully set a password!",
"You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
"Continue": "Continue",
"Please set a password!": "Please set a password!",
"This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices."
}