diff --git a/client/main.html b/client/main.html index 5b43708..7463f76 100644 --- a/client/main.html +++ b/client/main.html @@ -1,25 +1,13 @@ + - - - - - - - - - diff --git a/client/main.js b/client/main.js index e49f5d7..1412f30 100644 --- a/client/main.js +++ b/client/main.js @@ -1,3 +1 @@ import '../imports/startup/client'; -/* import '../node_modules/daemonite-material/js/material.min.js'; -import '../node_modules/daemonite-material/css/material.css'; */ diff --git a/imports/ui/pages/Fires/Fires.js b/imports/ui/pages/Fires/Fires.js index d8e37b9..4cf0e06 100644 --- a/imports/ui/pages/Fires/Fires.js +++ b/imports/ui/pages/Fires/Fires.js @@ -9,6 +9,7 @@ import { translate, Trans } from 'react-i18next'; import { FormGroup } from 'react-bootstrap'; import { Meteor } from 'meteor/meteor'; import { Bert } from 'meteor/themeteorchef:bert'; +import { Helmet } from 'react-helmet'; import { Map, Circle } from 'react-leaflet'; import Blaze from 'meteor/gadicc:blaze-react-component'; import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers'; @@ -58,16 +59,19 @@ class Fire extends React.Component { if (fire && fire.when) { this.dateLongFormat = dateLongFormat(fire.when); } + const title = fire.address ? + t('Información adicional sobre fuego detectado en {{where}} el {{when}}', { where: fire.address, when: this.dateLongFormat }) : + t('Información adicional sobre fuego detectado el {{when}}', { when: this.dateLongFormat }); return (fire ? (
+ + + {t('AppName')}: {t('Información adicional sobre fuego')} + + {!loading && -

- {fire.address ? - t('Información adicional sobre fuego detectado en {{where}} el {{when}}', { where: fire.address, when: this.dateLongFormat }) : - t('Información adicional sobre fuego detectado el {{when}}', { when: this.dateLongFormat })} -

- +

{title}

{ this.fireMap = map; diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index a0a30e5..f3b3fa5 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -8,6 +8,7 @@ import { ButtonGroup, Row, Col, Checkbox } from 'react-bootstrap'; import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { withTracker } from 'meteor/react-meteor-data'; +import { Helmet } from 'react-helmet'; import { Trans, translate } from 'react-i18next'; import { Map } from 'react-leaflet'; import Control from 'react-leaflet-control'; @@ -132,6 +133,7 @@ class FiresMap extends React.Component { } render() { + const { t } = this.props; console.log(`Rendering ${this.props.loading ? 'loading' : 'LOADED'} map ${this.props.activefires.length + this.props.firealerts.length} of ${this.props.activefirestotal} total. Subs users ready ${this.props.subsready}, reactive ${this.state.viewport.zoom >= MAXZOOMREACTIVE}`); return ( @@ -140,6 +142,11 @@ class FiresMap extends React.Component {
{ this.divElement = divElement; }} > + { window.location.pathname !== '/' && + + {t('AppName')}: {t('Fuegos activos')} + + } {this.props.loading || !this.props.subsready ? diff --git a/imports/ui/pages/Index/Index.js b/imports/ui/pages/Index/Index.js index af913ba..aeaab6b 100644 --- a/imports/ui/pages/Index/Index.js +++ b/imports/ui/pages/Index/Index.js @@ -4,6 +4,7 @@ /* eslint-env jquery */ import React, { Component, Fragment } from 'react'; import { translate, Trans } from 'react-i18next'; +import { Helmet } from 'react-helmet'; import PropTypes from 'prop-types'; // import { HashLink as Link } from 'react-router-hash-link'; // import { Link } from 'react-router-dom'; @@ -76,8 +77,12 @@ class Index extends Component { } render() { + const { t } = this.props; return (
+ + {t('AppName')}: {t('Inicio')} + {/* https://v4-alpha.getbootstrap.com/components/carousel/ */}
diff --git a/imports/ui/pages/Page/Page.js b/imports/ui/pages/Page/Page.js index b4add16..273c8f9 100644 --- a/imports/ui/pages/Page/Page.js +++ b/imports/ui/pages/Page/Page.js @@ -3,14 +3,20 @@ import PropTypes from 'prop-types'; import { Meteor } from 'meteor/meteor'; import { createContainer } from 'meteor/react-meteor-data'; import { ReactiveVar } from 'meteor/reactive-var'; +import i18n from '/imports/startup/client/i18n'; import PageHeader from '../../components/PageHeader/PageHeader'; import Content from '../../components/Content/Content'; -import i18n from '/imports/startup/client/i18n'; +import { Helmet } from 'react-helmet'; import './Page.scss'; const Page = ({ title, subtitle, content }) => (
+ + + {i18n.t('AppName')}: {title} + +
diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 0848b4b..22a0008 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -247,5 +247,11 @@ "Es una quema controlada": "Es una quema controlada", "Parece una falsa alarma": - "Parece una falsa alarma" + "Parece una falsa alarma", + "Inicio": + "Inicio", + "Fuegos activos en el mundo actualizados en tiempo real": + "Fuegos activos en el mundo actualizados en tiempo real", + "Información adicional sobre fuego": + "Información adicional sobre fuego" }