Browse Source

Added/fixed translation to titles and custom messages.

KrisVos130 7 years ago
parent
commit
8fdf955aa3
3 changed files with 10 additions and 7 deletions
  1. 1 1
      backend/index.js
  2. 7 6
      frontend/app/js/app.jsx
  3. 2 0
      frontend/app/js/components/CustomMessages.jsx

+ 1 - 1
backend/index.js

@@ -227,7 +227,7 @@ async.waterfall([
 				fs.access(rootDirAssets + path, function(err) {
 				fs.access(rootDirAssets + path, function(err) {
 					console.log("Error: ", !!err);
 					console.log("Error: ", !!err);
 					if (!err) {
 					if (!err) {
-						res.sendJSON({});
+						res.json({});
 					} else {
 					} else {
 						res.redirect("/");
 						res.redirect("/");
 					}
 					}

+ 7 - 6
frontend/app/js/app.jsx

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { Route, Switch, withRouter } from "react-router-dom";
 import { Route, Switch, withRouter } from "react-router-dom";
 import PropTypes from "prop-types";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { connect } from "react-redux";
+import { translate } from "react-i18next";
 
 
 import { ban, authenticate } from "actions/auth";
 import { ban, authenticate } from "actions/auth";
 import Navbar from "components/Global/Navbar";
 import Navbar from "components/Global/Navbar";
@@ -10,10 +11,6 @@ import config from "config";
 import AuthRoute from "components/AuthRoute";
 import AuthRoute from "components/AuthRoute";
 import io from "./io";
 import io from "./io";
 
 
-const i18next = require("i18next");
-
-const t = i18next.t;
-
 const asyncComponent = getComponent => {
 const asyncComponent = getComponent => {
 	return class AsyncComponent extends React.Component {
 	return class AsyncComponent extends React.Component {
 		static Component = null;
 		static Component = null;
@@ -37,14 +34,16 @@ const asyncComponent = getComponent => {
 };
 };
 
 
 @connect()
 @connect()
-
+@translate(["pages"], { wait: false })
 class App extends Component { // eslint-disable-line react/no-multi-comp
 class App extends Component { // eslint-disable-line react/no-multi-comp
 	static propTypes = {
 	static propTypes = {
 		dispatch: PropTypes.func,
 		dispatch: PropTypes.func,
+		t: PropTypes.func,
 	};
 	};
 
 
 	static defaultProps = {
 	static defaultProps = {
 		dispatch: () => {},
 		dispatch: () => {},
+		t: () => {},
 	};
 	};
 
 
 	componentDidMount() {
 	componentDidMount() {
@@ -70,6 +69,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 	}
 	}
 
 
 	render() {
 	render() {
+		const { t } = this.props;
+
 		return (
 		return (
 			<div>
 			<div>
 				<Navbar />
 				<Navbar />
@@ -151,4 +152,4 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 	}
 	}
 }
 }
 
 
-export default withRouter(App);
+export default withRouter(App);

+ 2 - 0
frontend/app/js/components/CustomMessages.jsx

@@ -5,6 +5,8 @@ const i18next = require("i18next");
 
 
 const t = i18next.t;
 const t = i18next.t;
 
 
+i18next.loadNamespaces("customMessages");
+
 export default class CustomMessages extends Component {
 export default class CustomMessages extends Component {
 	static propTypes = {
 	static propTypes = {
 		onRef: PropTypes.func,
 		onRef: PropTypes.func,