fix(lang): UI string edits, round 2 (#1202)

This commit is contained in:
TheCatLady
2021-03-17 22:28:44 -04:00
committed by GitHub
parent 9ec2c468cb
commit ea1863ac3a
42 changed files with 435 additions and 313 deletions

View File

@@ -1,21 +1,28 @@
import Link from 'next/link';
import React from 'react';
import { defineMessages, FormattedMessage } from 'react-intl';
import { defineMessages, useIntl } from 'react-intl';
import PageTitle from '../components/Common/PageTitle';
const messages = defineMessages({
pageNotFound: '404 - Page Not Found',
errormessagewithcode: '404 - {error}',
pagenotfound: 'Page Not Found',
returnHome: 'Return Home',
});
const Custom404: React.FC = () => {
const intl = useIntl();
return (
<div className="error-message">
<PageTitle title={intl.formatMessage(messages.pagenotfound)} />
<div className="text-4xl">
<FormattedMessage {...messages.pageNotFound} />
{intl.formatMessage(messages.errormessagewithcode, {
error: intl.formatMessage(messages.pagenotfound),
})}
</div>
<Link href="/">
<a className="flex">
<FormattedMessage {...messages.returnHome} />
{intl.formatMessage(messages.returnHome)}
<svg
className="w-6 h-6 ml-2"
fill="none"

View File

@@ -2,16 +2,18 @@ import React from 'react';
import type { NextPage } from 'next';
import Link from 'next/link';
import type { Undefinable } from '../utils/typeHelpers';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import { defineMessages, useIntl } from 'react-intl';
import PageTitle from '../components/Common/PageTitle';
interface ErrorProps {
statusCode?: number;
}
const messages = defineMessages({
internalServerError: '{statusCode} - Internal server error',
serviceUnavailable: '{statusCode} - Service unavailable',
somethingWentWrong: '{statusCode} - Something went wrong',
errormessagewithcode: '{statusCode} - {error}',
internalservererror: 'Internal Server Error',
serviceunavailable: 'Service Unavailable',
somethingwentwrong: 'Something Went Wrong',
oops: 'Oops',
returnHome: 'Return Home',
});
@@ -22,25 +24,29 @@ const Error: NextPage<ErrorProps> = ({ statusCode }) => {
const getErrorMessage = (statusCode?: number) => {
switch (statusCode) {
case 500:
return intl.formatMessage(messages.internalServerError, {
statusCode: 500,
});
return intl.formatMessage(messages.internalservererror);
case 503:
return intl.formatMessage(messages.serviceUnavailable, {
statusCode: 503,
});
return intl.formatMessage(messages.serviceunavailable);
default:
return intl.formatMessage(messages.somethingWentWrong, {
statusCode: statusCode ?? intl.formatMessage(messages.oops),
});
return statusCode
? intl.formatMessage(messages.somethingwentwrong)
: intl.formatMessage(messages.oops);
}
};
return (
<div className="error-message">
<div className="text-4xl">{getErrorMessage(statusCode)}</div>
<PageTitle title={getErrorMessage(statusCode)} />
<div className="text-4xl">
{statusCode
? intl.formatMessage(messages.errormessagewithcode, {
statusCode: statusCode,
message: getErrorMessage(statusCode),
})
: getErrorMessage(statusCode)}
</div>
<Link href="/">
<a className="flex">
<FormattedMessage {...messages.returnHome} />
{intl.formatMessage(messages.returnHome)}
<svg
className="w-6 h-6 ml-2"
fill="none"