-
{response.data.error ? response.data.error : _t("This server has exceeded its available resources")}
-
{_t(
+ const errorTop = messageForResourceLimitError(
+ response.data.limit_type,
+ response.data.admin_contact, {
+ 'monthly_active_user': _td(
+ "This homeserver has hit its Monthly Active User limit.",
+ ),
+ '': _td(
+ "This homeserver has exceeded one of its resource limits.",
+ ),
+ });
+ const errorDetail = messageForResourceLimitError(
+ response.data.limit_type,
+ response.data.admin_contact, {
+ '': _td(
"Please contact your service administrator to continue using this service.",
- {},
- {
- a: (sub) => {
- if (response.data.admin_contact) {
- return {sub};
- } else {
- return sub;
- }
- },
- },
- )}
+ ),
+ });
+ msg =
+
{errorTop}
+
{errorDetail}
;
} else if (response.required_stages && response.required_stages.indexOf('m.login.msisdn') > -1) {
let msisdnAvailable = false;
diff --git a/src/components/views/globals/ServerLimitBar.js b/src/components/views/globals/ServerLimitBar.js
index 375d52bbe4..0b924fd2e2 100644
--- a/src/components/views/globals/ServerLimitBar.js
+++ b/src/components/views/globals/ServerLimitBar.js
@@ -17,7 +17,8 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
-import { _t } from '../../../languageHandler';
+import { _td } from '../../../languageHandler';
+import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
export default React.createClass({
propTypes: {
@@ -39,52 +40,50 @@ export default React.createClass({
'mx_MatrixToolbar': true,
};
- const translateLink = (sub) => {
- if (this.props.adminContact) {
- return
{sub};
- } else {
- return sub;
- }
- };
-
let adminContact;
let limitError;
if (this.props.kind === 'hard') {
toolbarClasses['mx_MatrixToolbar_error'] = true;
- adminContact = _t(
- "Please
contact your service administrator to continue using the service.",
- {},
+
+ adminContact = messageForResourceLimitError(
+ this.props.limitType,
+ this.props.adminContact,
{
- 'a': translateLink,
+ '': _td("Please
contact your service administrator to continue using the service."),
+ },
+ );
+ limitError = messageForResourceLimitError(
+ this.props.limitType,
+ this.props.adminContact,
+ {
+ 'monthly_active_user': _td("This homeserver has hit its Monthly Active User limit."),
+ '': _td("This homeserver has exceeded one of its resource limits."),
},
);
- if (this.props.limitType === 'monthly_active_user') {
- limitError = _t("This homeserver has hit its Monthly Active User limit.");
- } else {
- limitError = _t("This homeserver has exceeded one of its resource limits.");
- }
} else {
toolbarClasses['mx_MatrixToolbar_info'] = true;
- adminContact = _t(
- "Please
contact your service administrator to get this limit increased.",
- {},
+ adminContact = messageForResourceLimitError(
+ this.props.limitType,
+ this.props.adminContact,
{
- 'a': translateLink,
+ '': _td("Please
contact your service administrator to get this limit increased."),
},
);
- if (this.props.limitType === 'monthly_active_user') {
- limitError = _t(
- "This homeserver has hit its Monthly Active User limit so " +
- "
some users will not be able to log in.", {},
- {'b': sub =>
{sub}},
- );
- } else {
- limitError = _t(
- "This homeserver has exceeded one of its resource limits so " +
- "
some users will not be able to log in.", {},
- {'b': sub =>
{sub}},
- );
- }
+ limitError = messageForResourceLimitError(
+ this.props.limitType,
+ this.props.adminContact,
+ {
+ 'monthly_active_user': _td(
+ "This homeserver has hit its Monthly Active User limit so " +
+ "
some users will not be able to log in.",
+ ),
+ '': _td(
+ "This homeserver has exceeded one of its resource limits so " +
+ "
some users will not be able to log in.",
+ ),
+ },
+ {'b': sub =>
{sub}},
+ );
}
return (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 68a4ce1508..1afa35d8fd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1171,7 +1171,6 @@
"Send Reset Email": "Send Reset Email",
"Create an account": "Create an account",
"This Home Server does not support login using email address.": "This Home Server does not support login using email address.",
- "This server has exceeded its available resources": "This server has exceeded its available resources",
"Please
contact your service administrator to continue using this service.": "Please
contact your service administrator to continue using this service.",
"Incorrect username and/or password.": "Incorrect username and/or password.",
"Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
diff --git a/src/utils/ErrorUtils.js b/src/utils/ErrorUtils.js
new file mode 100644
index 0000000000..97a29a3572
--- /dev/null
+++ b/src/utils/ErrorUtils.js
@@ -0,0 +1,50 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { _t } from '../languageHandler';
+
+/**
+ * Produce a translated error message for a
+ * M_RESOURCE_LIMIT_EXCEEDED error
+ *
+ * @param {string} limitType The limit_type from the error
+ * @param {string} adminContact The admin_contact from the error
+ * @param {Object} strings Translateable string for different
+ * limit_type. Must include at least the empty string key
+ * which is the default. Strings may include an 'a' tag
+ * for the admin contact link.
+ * @param {Object} extraTranslations Extra translation substitution functions
+ * for any tags in the strings apart from 'a'
+ * @returns {*} Translated string or react component
+ */
+export function messageForResourceLimitError(limitType, adminContact, strings, extraTranslations) {
+ let errString = strings[limitType];
+ if (errString === undefined) errString = strings[''];
+
+ const linkSub = sub => {
+ if (adminContact) {
+ return
{sub};
+ } else {
+ return sub;
+ }
+ };
+
+ if (errString.includes('
')) {
+ return _t(errString, {}, Object.assign({ 'a': linkSub }, extraTranslations));
+ } else {
+ return _t(errString, {}, extraTranslations);
+ }
+}