Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801

src/components/views/dialogs/ChatInviteDialog.js

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import classNames from 'classnames';
+import _t from 'counterpart-riot';
 import sdk from '../../../index';
 import { getAddressType, inviteMultipleToRoom } from '../../../Invite';
 import createRoom from '../../../createRoom';
@@ -48,11 +49,7 @@ module.exports = React.createClass({
 
     getDefaultProps: function() {
         return {
-            title: "Start a chat",
-            description: "Who would you like to communicate with?",
             value: "",
-            placeholder: "Email, name or matrix ID",
-            button: "Start Chat",
             focus: true
         };
     },
@@ -310,6 +307,7 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: "Failed to invite",
                     description: ((err && err.message) ? err.message : "Operation failed"),
+                    button: _t("OK"),
                 });
                 return null;
             })
@@ -323,6 +321,7 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: "Failed to invite user",
                     description: ((err && err.message) ? err.message : "Operation failed"),
+                    button: _t("OK"),
                 });
                 return null;
             })
@@ -344,6 +343,7 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: "Failed to invite",
                     description: ((err && err.message) ? err.message : "Operation failed"),
+                    button: _t("OK"),
                 });
                 return null;
             })
@@ -403,6 +403,7 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: "Failed to invite the following users to the " + room.name + " room:",
                 description: errorList.join(", "),
+                button: _t("OK"),
             });
         }
         return addrs;

src/components/views/dialogs/ConfirmUserActionDialog.js

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
+import _t from 'counterpart-riot';
 import classnames from 'classnames';
 
 /*
@@ -69,7 +70,7 @@ export default React.createClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
 
-        const title = this.props.action + " this person?";
+        const title = _t("%(actionVerb)s this person?", { actionVerb: this.props.action});
         const confirmButtonClass = classnames({
             'mx_Dialog_primary': true,
             'danger': this.props.danger,
@@ -82,7 +83,7 @@ export default React.createClass({
                     <form onSubmit={this.onOk}>
                         <input className="mx_ConfirmUserActionDialog_reasonField"
                             ref={this._collectReasonField}
-                            placeholder="Reason"
+                            placeholder={ _t("Reason") }
                             autoFocus={true}
                         />
                     </form>
@@ -111,7 +112,7 @@ export default React.createClass({
                     </button>
 
                     <button onClick={this.onCancel}>
-                        Cancel
+                        { _t("Cancel") }
                     </button>
                 </div>
             </BaseDialog>

src/components/views/dialogs/ErrorDialog.js

@@ -43,9 +43,6 @@ export default React.createClass({
 
     getDefaultProps: function() {
         return {
-            title: "Error",
-            description: "An error has occurred.",
-            button: "OK",
             focus: true,
         };
     },

src/components/views/dialogs/InteractiveAuthDialog.js

@@ -46,12 +46,6 @@ export default React.createClass({
         title: React.PropTypes.string,
     },
 
-    getDefaultProps: function() {
-        return {
-            title: "Authentication",
-        };
-    },
-
     getInitialState: function() {
         return {
             authError: null,

src/components/views/dialogs/NeedToRegisterDialog.js

@@ -38,13 +38,6 @@ module.exports = React.createClass({
         onFinished: React.PropTypes.func.isRequired,
     },
 
-    getDefaultProps: function() {
-        return {
-            title: "Registration required",
-            description: "A registered account is required for this action",
-        };
-    },
-
     onRegisterClicked: function() {
         dis.dispatch({
             action: "start_upgrade_registration",

src/components/views/dialogs/QuestionDialog.js

@@ -33,7 +33,6 @@ export default React.createClass({
             title: "",
             description: "",
             extraButtons: null,
-            button: "OK",
             focus: true,
             hasCancelButton: true,
         };

src/components/views/dialogs/TextInputDialog.js

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
+import _t from 'counterpart-riot';
 
 export default React.createClass({
     displayName: 'TextInputDialog',
@@ -36,7 +37,6 @@ export default React.createClass({
             title: "",
             value: "",
             description: "",
-            button: "OK",
             focus: true,
         };
     },
@@ -73,7 +73,7 @@ export default React.createClass({
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.onCancel}>
-                        Cancel
+                        { _t("Cancel") }
                     </button>
                     <button className="mx_Dialog_primary" onClick={this.onOk}>
                         {this.props.button}