From 9e8a839fcd5a910a40bc0b8cd3a5e7d3f9e7d0eb Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Tue, 26 Sep 2017 18:17:31 +0200
Subject: Refs #4614
Add trad to React itineraries
---
.../es6_browserified/itineraries/components/App.js | 28 +++++++++++++----
.../itineraries/components/BSelect2.js | 16 ++++++----
.../itineraries/components/OlMap.js | 35 ++++++++++++----------
.../itineraries/components/StopPoint.js | 14 +++++----
.../itineraries/components/StopPointList.js | 14 +++++----
.../es6_browserified/itineraries/index.js | 4 ++-
.../es6_browserified/itineraries/show.js | 3 ++
.../es6_browserified/time_tables/actions/index.js | 3 +-
.../es6_browserified/time_tables/containers/App.js | 4 ++-
.../es6_browserified/time_tables/index.js | 5 +++-
10 files changed, 84 insertions(+), 42 deletions(-)
(limited to 'app/assets/javascripts')
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/App.js b/app/assets/javascripts/es6_browserified/itineraries/components/App.js
index e662d140c..f4cc5e4a6 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/App.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/App.js
@@ -1,12 +1,28 @@
var React = require('react')
+var { Component, PropTypes } = require('react')
var AddStopPoint = require('../containers/AddStopPoint')
var VisibleStopPoints = require('../containers/VisibleStopPoints')
+const clone = require('../../helpers/clone')
+const I18n = clone(window , "I18n", true)
-const App = () => (
-
-)
+class App extends Component {
+
+ getChildContext() {
+ return { I18n }
+ }
+
+ render() {
+ return (
+
+ )
+ }
+}
+
+App.childContextTypes = {
+ I18n: PropTypes.object
+}
module.exports = App
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
index 64c6d3ac7..9a82b7925 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
@@ -1,6 +1,6 @@
var _ = require('lodash')
var React = require('react')
-var PropTypes = require('react').PropTypes
+var { Component, PropTypes } = require('react')
var Select2 = require('react-select2')
@@ -9,9 +9,9 @@ var origin = window.location.origin
var path = window.location.pathname.split('/', 3).join('/')
-class BSelect3 extends React.Component{
- constructor(props) {
- super(props)
+class BSelect3 extends Component{
+ constructor(props, context) {
+ super(props, context)
}
onChange(e) {
this.props.onChange(this.props.index, {
@@ -73,7 +73,7 @@ class BSelect3 extends React.Component{
}
}
-class BSelect2 extends React.Component{
+class BSelect2 extends Component{
componentDidMount() {
this.refs.newSelect.el.select2('open')
}
@@ -85,7 +85,7 @@ class BSelect2 extends React.Component{
onSelect={ this.props.onSelect }
ref='newSelect'
options={{
- placeholder: 'Sélectionnez un arrêt existant...',
+ placeholder: this.context.I18n.routes.edit.select2.placeholder,
allowClear: true,
language: 'fr', /* Doesn't seem to work... :( */
theme: 'bootstrap',
@@ -121,4 +121,8 @@ class BSelect2 extends React.Component{
}
}
+BSelect2.contextTypes = {
+ I18n: PropTypes.object
+}
+
module.exports = BSelect3
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
index b9e106c1a..937871346 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
@@ -1,11 +1,10 @@
var _ = require('lodash')
var React = require('react')
-var Component = require('react').Component
-var PropTypes = require('react').PropTypes
+var { Component, PropTypes } = require('react')
class OlMap extends Component{
- constructor(props){
- super(props)
+ constructor(props, context){
+ super(props, context)
}
fetchApiURL(id){
@@ -116,40 +115,40 @@ class OlMap extends Component{
{this.props.value.olMap.json.name}
- Type d'arrêt :
+ {this.context.I18n.routes.edit.stop_point_type} :
{this.props.value.olMap.json.area_type}
- Nom court :
+ {this.context.I18n.routes.edit.short_name} :
{this.props.value.olMap.json.short_name}
- ID Reflex :
+ {this.context.I18n.id_reflex} :
{this.props.value.olMap.json.user_objectid}
- Coordonnées :
+ {this.context.I18n.routes.edit.map.coordinates} :
- Proj.: WSG84
- Lat.: {this.props.value.olMap.json.latitude}
- Lon.: {this.props.value.olMap.json.longitude}
+ {this.context.I18n.routes.edit.map.proj}.: WSG84
+ {this.context.I18n.routes.edit.map.lat}.: {this.props.value.olMap.json.latitude}
+ {this.context.I18n.routes.edit.map.lon}.: {this.props.value.olMap.json.longitude}
- Code Postal :
+ {this.context.I18n.routes.edit.map.postal_code} :
{this.props.value.olMap.json.zip_code}
- Commune :
+ {this.context.I18n.routes.edit.map.city} :
{this.props.value.olMap.json.city_name}
- Commentaire :
+ {this.context.I18n.routes.edit.map.comment} :
{this.props.value.olMap.json.comment}
{(this.props.value.stoparea_id != this.props.value.olMap.json.stoparea_id) &&(
{this.props.onUpdateViaOlMap(this.props.index, this.props.value.olMap.json)}}
- >Sélectionner
+ >{this.context.I18n.actions.select}
)}
@@ -163,7 +162,11 @@ class OlMap extends Component{
}
}
-OlMap.propTypes = {
+OlMap.PropTypes = {
+}
+
+OlMap.contextTypes = {
+ I18n: PropTypes.object
}
module.exports = OlMap
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
index 48f77b8e9..c3996f5b3 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
@@ -3,7 +3,7 @@ var PropTypes = require('react').PropTypes
var BSelect2 = require('./BSelect2')
var OlMap = require('./OlMap')
-const StopPoint = (props) => {
+const StopPoint = (props, {I18n}) => {
return (
@@ -17,15 +17,15 @@ const StopPoint = (props) => {
@@ -90,4 +90,8 @@ StopPoint.propTypes = {
value: PropTypes.object
}
+StopPoint.contextTypes = {
+ I18n: PropTypes.object
+}
+
module.exports = StopPoint
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js
index 77077dbd8..37a480fca 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js
@@ -2,29 +2,29 @@ var React = require('react')
var PropTypes = require('react').PropTypes
var StopPoint = require('./StopPoint')
-const StopPointList = ({ stopPoints, onDeleteClick, onMoveUpClick, onMoveDownClick, onChange, onSelectChange, onToggleMap, onToggleEdit, onSelectMarker, onUnselectMarker, onUpdateViaOlMap }) => {
+const StopPointList = ({ stopPoints, onDeleteClick, onMoveUpClick, onMoveDownClick, onChange, onSelectChange, onToggleMap, onToggleEdit, onSelectMarker, onUnselectMarker, onUpdateViaOlMap }, {I18n}) => {
return (
-
+
-
+
-
+
-
+
@@ -65,4 +65,8 @@ StopPointList.propTypes = {
onUnselectMarker : PropTypes.func.isRequired
}
+StopPointList.contextTypes = {
+ I18n: PropTypes.object
+}
+
module.exports = StopPointList
diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js
index bb06126f7..13d89bec5 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/index.js
@@ -5,7 +5,9 @@ var createStore = require('redux').createStore
var reducers = require('./reducers')
var App = require('./components/App')
var { handleForm, handleStopPoints } = require('./form_helper')
-let datas = JSON.parse(decodeURIComponent(window.itinerary_stop))
+let clone = require('../helpers/clone')
+let datas = clone(window, "itinerary_stop", true)
+datas = JSON.parse(decodeURIComponent(datas))
// logger, DO NOT REMOVE
// var applyMiddleware = require('redux').applyMiddleware
diff --git a/app/assets/javascripts/es6_browserified/itineraries/show.js b/app/assets/javascripts/es6_browserified/itineraries/show.js
index 79a11701f..e88469900 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/show.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/show.js
@@ -1,4 +1,7 @@
+const clone = require('../helpers/clone')
+let route = clone(window, "route", true)
route = JSON.parse(decodeURIComponent(route))
+
const geoColPts = []
const geoColLns= []
const geoColEdges = [
diff --git a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
index 361e89c36..a421a8ed6 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
@@ -1,5 +1,6 @@
const _ = require('lodash')
-const { I18n } = window
+const clone = require('../../helpers/clone')
+const I18n = clone(window, "I18n")
const actions = {
weekDays: (index) => {
diff --git a/app/assets/javascripts/es6_browserified/time_tables/containers/App.js b/app/assets/javascripts/es6_browserified/time_tables/containers/App.js
index 772747104..f12fb8a71 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/containers/App.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/containers/App.js
@@ -9,7 +9,9 @@ var PeriodForm = require('./PeriodForm')
var SaveTimetable = require('./SaveTimetable')
var ConfirmModal = require('./ConfirmModal')
var ErrorModal = require('./ErrorModal')
-const { I18n } = window
+
+const clone = require('../../helpers/clone')
+const I18n = clone(window, "I18n", true)
class App extends Component {
componentDidMount(){
diff --git a/app/assets/javascripts/es6_browserified/time_tables/index.js b/app/assets/javascripts/es6_browserified/time_tables/index.js
index a91747991..6c352df6b 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/index.js
@@ -5,6 +5,9 @@ var createStore = require('redux').createStore
var timeTablesApp = require('./reducers')
var App = require('./containers/App')
+const clone = require('../helpers/clone')
+const actionType = clone(window, "actionType", true)
+
// logger, DO NOT REMOVE
// var applyMiddleware = require('redux').applyMiddleware
// var createLogger = require('redux-logger')
@@ -13,7 +16,7 @@ var App = require('./containers/App')
var initialState = {
status: {
- actionType: window.actionType,
+ actionType: actionType,
policy: window.perms,
fetchSuccess: true,
isFetching: false
--
cgit v1.2.3