From b4d016c8aa2e671e2b5a492d7e742d5166069495 Mon Sep 17 00:00:00 2001
From: Zog
Date: Thu, 28 Dec 2017 17:05:48 +0100
Subject: Refs #5437 @2h; Update Rect to v16

Because it is needed to test the components.
Major issue: Proptype now lives in a separate package, hence the huge
diff
---
 app/javascript/routes/components/StopPoint.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/javascript/routes/components/StopPoint.js')

diff --git a/app/javascript/routes/components/StopPoint.js b/app/javascript/routes/components/StopPoint.js
index 606121f99..2d47e802b 100644
--- a/app/javascript/routes/components/StopPoint.js
+++ b/app/javascript/routes/components/StopPoint.js
@@ -1,4 +1,6 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
+
 import BSelect2 from './BSelect2'
 import OlMap from './OlMap'
 
-- 
cgit v1.2.3


From 2f895a1ee52922565b7ca1a0c00defe68f40aebd Mon Sep 17 00:00:00 2001
From: Zog
Date: Mon, 12 Feb 2018 09:33:53 +0100
Subject: Refs #5888; Fix I18n in JS

---
 app/javascript/routes/components/StopPoint.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/javascript/routes/components/StopPoint.js')

diff --git a/app/javascript/routes/components/StopPoint.js b/app/javascript/routes/components/StopPoint.js
index 2d47e802b..af51a6bb4 100644
--- a/app/javascript/routes/components/StopPoint.js
+++ b/app/javascript/routes/components/StopPoint.js
@@ -18,15 +18,15 @@ export default function StopPoint(props, {I18n}) {
 
         <div>
           <select className='form-control' value={props.value.for_boarding} id="for_boarding" onChange={props.onSelectChange}>
-            <option value="normal">{I18n.routes.edit.stop_point.boarding.normal}</option>
-            <option value="forbidden">{I18n.routes.edit.stop_point.boarding.forbidden}</option>
+            <option value="normal">{I18n.t('routes.edit.stop_point.boarding.normal')}</option>
+            <option value="forbidden">{I18n.t('routes.edit.stop_point.boarding.forbidden')}</option>
           </select>
         </div>
 
         <div>
           <select className='form-control' value={props.value.for_alighting} id="for_alighting" onChange={props.onSelectChange}>
-            <option value="normal">{I18n.routes.edit.stop_point.alighting.normal}</option>
-            <option value="forbidden">{I18n.routes.edit.stop_point.alighting.forbidden}</option>
+            <option value="normal">{I18n.t('routes.edit.stop_point.alighting.normal')}</option>
+            <option value="forbidden">{I18n.t('routes.edit.stop_point.alighting.forbidden')}</option>
           </select>
         </div>
 
@@ -77,7 +77,7 @@ export default function StopPoint(props, {I18n}) {
   )
 }
 
-StopPoint.PropTypes = {
+StopPoint.propTypes = {
   onToggleMap: PropTypes.func.isRequired,
   onToggleEdit: PropTypes.func.isRequired,
   onDeleteClick: PropTypes.func.isRequired,
@@ -93,4 +93,4 @@ StopPoint.PropTypes = {
 
 StopPoint.contextTypes = {
   I18n: PropTypes.object
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3