);
}
diff --git a/src/components/OnlineBox.jsx b/src/components/OnlineBox.jsx
index e30d1bb..80bc835 100644
--- a/src/components/OnlineBox.jsx
+++ b/src/components/OnlineBox.jsx
@@ -22,7 +22,7 @@ const OnlineBox = ({ online, totalPixels, name }) => (
&&
{online} }
{(name != null)
&& (
-
+
{numberToString(totalPixels)}
)}
diff --git a/src/components/SignUpForm.jsx b/src/components/SignUpForm.jsx
index 746c58d..153ebdf 100644
--- a/src/components/SignUpForm.jsx
+++ b/src/components/SignUpForm.jsx
@@ -115,7 +115,8 @@ class SignUpForm extends React.Component {
return (
or
- Deny
+ {t`Deny`}
.
)}
diff --git a/src/core/ttag.js b/src/core/ttag.js
index 10f986c..cb2f68c 100644
--- a/src/core/ttag.js
+++ b/src/core/ttag.js
@@ -3,22 +3,21 @@
* @flow
*/
import { TTag } from 'ttag';
-import deLocale from '../../i18n/ssr-de.po';
import { languageFromLocalisation } from '../utils/location';
-const LOCALES = {
- de: deLocale,
-};
+// eslint-disable-next-line max-len
+const localeImports = require.context('../../i18n', false, /^\.[/\\]ssr-.+\.po$/);
const ttags = {
default: new TTag(),
};
(() => {
- const langs = Object.keys(LOCALES);
- langs.forEach((lang) => {
+ localeImports.keys().forEach((file) => {
const ttag = new TTag();
- ttag.addLocale(lang, LOCALES[lang]);
+ // ./ssr-de.po
+ const lang = file.replace('./ssr-', '').replace('.po', '');
+ ttag.addLocale(lang, localeImports(file).default);
ttag.useLocale(lang);
ttags[lang] = ttag;
});
diff --git a/src/routes/api/auth/change_mail.js b/src/routes/api/auth/change_mail.js
index e574c2d..4d4d6a2 100644
--- a/src/routes/api/auth/change_mail.js
+++ b/src/routes/api/auth/change_mail.js
@@ -16,7 +16,7 @@ function validate(email, password, gettext) {
const passerror = gettext(validatePassword(password));
if (passerror) errors.push(passerror);
- const mailerror = validateEMail(email);
+ const mailerror = gettext(validateEMail(email));
if (mailerror) errors.push(mailerror);
return errors;
diff --git a/src/routes/api/auth/index.js b/src/routes/api/auth/index.js
index 3d240ad..a399f5a 100644
--- a/src/routes/api/auth/index.js
+++ b/src/routes/api/auth/index.js
@@ -108,7 +108,10 @@ export default (passport) => {
if (err) {
const host = getHostFromRequest(req);
logger.info(`Authentification error ${err}`);
- const index = getHtml('OAuth Authentification', err.message, host);
+ const index = getHtml(
+ 'OAuth Authentification',
+ err.message, host, req.lang,
+ );
res.status(400).send(index);
} else {
next();
diff --git a/src/routes/api/auth/logout.js b/src/routes/api/auth/logout.js
index 44b37f2..05d6f68 100644
--- a/src/routes/api/auth/logout.js
+++ b/src/routes/api/auth/logout.js
@@ -6,10 +6,11 @@ import type { Request, Response } from 'express';
export default async (req: Request, res: Response) => {
const { user } = req;
+ const { t } = req.ttag;
if (!user) {
res.status(401);
res.json({
- errors: ['You are not even logged in.'],
+ errors: [t`You are not even logged in.`],
});
return;
}
diff --git a/src/routes/api/auth/register.js b/src/routes/api/auth/register.js
index b184568..06d193a 100644
--- a/src/routes/api/auth/register.js
+++ b/src/routes/api/auth/register.js
@@ -18,9 +18,9 @@ import {
validatePassword,
} from '../../../utils/validation';
-async function validate(email, name, password, gettext) {
+async function validate(email, name, password, t, gettext) {
const errors = [];
- const emailerror = validateEMail(email);
+ const emailerror = gettext(validateEMail(email));
if (emailerror) errors.push(emailerror);
const nameerror = validateName(name);
if (nameerror) errors.push(nameerror);
@@ -28,9 +28,9 @@ async function validate(email, name, password, gettext) {
if (passworderror) errors.push(passworderror);
let reguser = await RegUser.findOne({ where: { email } });
- if (reguser) errors.push('E-Mail already in use.');
+ if (reguser) errors.push(t`E-Mail already in use.`);
reguser = await RegUser.findOne({ where: { name } });
- if (reguser) errors.push('Username already in use.');
+ if (reguser) errors.push(t`Username already in use.`);
return errors;
}
@@ -38,7 +38,7 @@ async function validate(email, name, password, gettext) {
export default async (req: Request, res: Response) => {
const { email, name, password } = req.body;
const { t, gettext } = req.ttag;
- const errors = await validate(email, name, password, gettext);
+ const errors = await validate(email, name, password, t, gettext);
if (errors.length > 0) {
res.status(400);
res.json({
diff --git a/src/routes/api/auth/restore_password.js b/src/routes/api/auth/restore_password.js
index 1cd3f46..327810b 100644
--- a/src/routes/api/auth/restore_password.js
+++ b/src/routes/api/auth/restore_password.js
@@ -10,9 +10,9 @@ import mailProvider from '../../../core/mail';
import { validateEMail } from '../../../utils/validation';
import { getHostFromRequest } from '../../../utils/ip';
-async function validate(email) {
+async function validate(email, gettext) {
const errors = [];
- const emailerror = validateEMail(email);
+ const emailerror = gettext(validateEMail(email));
if (emailerror) errors.push(emailerror);
return errors;
@@ -21,8 +21,9 @@ async function validate(email) {
export default async (req: Request, res: Response) => {
const ip = req.trueIp;
const { email } = req.body;
+ const { gettext } = req.ttag;
- const errors = await validate(email);
+ const errors = validate(email, gettext);
if (errors.length > 0) {
res.status(400);
res.json({
diff --git a/src/routes/api/auth/verify.js b/src/routes/api/auth/verify.js
index a044948..54bd470 100644
--- a/src/routes/api/auth/verify.js
+++ b/src/routes/api/auth/verify.js
@@ -12,6 +12,8 @@ import mailProvider from '../../../core/mail';
export default async (req: Request, res: Response) => {
const { token } = req.query;
+ const { lang } = req;
+ const { t } = req.ttag;
const name = await mailProvider.verify(token);
const host = getHostFromRequest(req);
if (name) {
@@ -19,11 +21,15 @@ export default async (req: Request, res: Response) => {
// thats a bit counter productive because it directly links to the websocket
webSockets.notifyChangedMe(name);
// ---
- const index = getHtml('Mail verification', 'You are now verified :)', host);
+ const index = getHtml(
+ t`Mail verification`,
+ t`You are now verified :)`,
+ host, lang,
+ );
res.status(200).send(index);
} else {
// eslint-disable-next-line max-len
- const index = getHtml('Mail verification', 'Your mail verification code is invalid or already expired :(, please request a new one.', host);
+ const index = getHtml(t`Mail verification`, t`Your mail verification code is invalid or already expired :(, please request a new one.`, host, lang);
res.status(400).send(index);
}
};
diff --git a/src/routes/reset_password.js b/src/routes/reset_password.js
index bac273f..9b96f18 100644
--- a/src/routes/reset_password.js
+++ b/src/routes/reset_password.js
@@ -54,12 +54,14 @@ router.use(expressTTag);
*/
router.post('/', async (req: Request, res: Response) => {
const { pass, passconf, code } = req.body;
+ const { lang } = req;
const { t } = req.ttag;
if (!pass || !passconf || !code) {
const html = getPasswordResetHtml(
null,
null,
+ lang,
t`You sent an empty password or invalid data :(`,
);
res.status(400).send(html);
@@ -71,6 +73,7 @@ router.post('/', async (req: Request, res: Response) => {
const html = getPasswordResetHtml(
null,
null,
+ lang,
t`This password-reset link isn't valid anymore :(`,
);
res.status(401).send(html);
@@ -81,6 +84,7 @@ router.post('/', async (req: Request, res: Response) => {
const html = getPasswordResetHtml(
null,
null,
+ lang,
t`Your passwords do not match :(`,
);
res.status(400).send(html);
@@ -95,6 +99,7 @@ router.post('/', async (req: Request, res: Response) => {
const html = getPasswordResetHtml(
null,
null,
+ lang,
t`User doesn't exist in our database :(`,
);
res.status(400).send(html);
@@ -106,6 +111,7 @@ router.post('/', async (req: Request, res: Response) => {
const html = getPasswordResetHtml(
null,
null,
+ lang,
t`Passowrd successfully changed.`,
);
res.status(200).send(html);
@@ -117,12 +123,14 @@ router.post('/', async (req: Request, res: Response) => {
*/
router.get('/', async (req: Request, res: Response) => {
const { token } = req.query;
+ const { lang } = req;
const { t } = req.ttag;
if (!token) {
const html = getPasswordResetHtml(
null,
null,
+ lang,
t`Invalid url :( Please check your mail again.`,
);
res.status(400).send(html);
@@ -134,6 +142,7 @@ router.get('/', async (req: Request, res: Response) => {
const html = getPasswordResetHtml(
null,
null,
+ lang,
// eslint-disable-next-line max-len
t`This passwort reset link is wrong or already expired, please request a new one (Note: you can use those links just once)`,
);
diff --git a/src/ssr-components/Main.jsx b/src/ssr-components/Main.jsx
index 96852b4..b3c40eb 100644
--- a/src/ssr-components/Main.jsx
+++ b/src/ssr-components/Main.jsx
@@ -8,6 +8,7 @@
import React from 'react';
import ReactDOM from 'react-dom/server';
+import { getTTag } from '../core/ttag';
import Html from './Html';
/* this one is set by webpack */
// eslint-disable-next-line import/no-unresolved
@@ -45,12 +46,13 @@ function generateMainPage(countryCoords: Cell, lang: string): string {
const scripts = (assets[`client-${lang}`])
? assets[`client-${lang}`].js.map((s) => ASSET_SERVER + s)
: defaultScripts;
+ const { t } = getTTag(lang);
// eslint-disable-next-line
const html = ReactDOM.renderToStaticMarkup(
(
-
-);
+import { getTTag } from '../core/ttag';
-const PasswordResetError = ({ message }) => (
-
-
Reset Password
-
{message}
-
Click here to go back to pixelplanet
-
-);
+export default function getPasswordResetHtml(name, code, lang, message = null) {
+ const { t } = getTTag(lang);
+
+ let body = '';
+
+ if (message) {
+ body = (
+
+
{t`Reset Password`}
+
{message}
+
{t`Click here`}
+ {t`to go back to pixelplanet`}
+
+ );
+ } else {
+ body = (
+
+ );
+ }
+
+ const title = t`PixelPlanet.fun Password Reset`;
+ const description = t`Reset your password here`;
-export default function getPasswordResetHtml(name, code, message = null) {
- const title = 'PixelPlanet.fun Password Reset';
- const description = 'reset your password here';
- const body = (message)
- ?
- :
;
const index = `${
ReactDOM.renderToStaticMarkup(
)}`;
return index;
}
diff --git a/src/ssr-components/RedirectionPage.jsx b/src/ssr-components/RedirectionPage.jsx
index 405761d..391b436 100644
--- a/src/ssr-components/RedirectionPage.jsx
+++ b/src/ssr-components/RedirectionPage.jsx
@@ -7,17 +7,22 @@ import React from 'react';
import ReactDOM from 'react-dom/server';
import Html from './Html';
-const RedirectionPage = ({ text, host }) => (
-