aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-04-03 22:03:18 +0200
committerGitHub2018-04-03 22:03:18 +0200
commit6262b1cf8c536fb59997119a28420584ab08994c (patch)
tree265bdd55a9e9cba9a6489277a6adef4f5c420a28
parent71c57bf5fcf24429730cc9ef117f1d0aa120402b (diff)
parent9b771756f7aa7defec4057d4778aefefb5704d19 (diff)
downloadchouette-core-6262b1cf8c536fb59997119a28420584ab08994c.tar.bz2
Merge pull request #436 from af83/6386-fix-timetables-editor
6386 Fix Timetables edit
-rw-r--r--app/javascript/time_tables/actions/index.js1
-rw-r--r--app/javascript/time_tables/containers/App.js1
-rw-r--r--app/views/vehicle_journeys/index.html.slim1
3 files changed, 0 insertions, 3 deletions
diff --git a/app/javascript/time_tables/actions/index.js b/app/javascript/time_tables/actions/index.js
index 98b9eab4b..3127d11b8 100644
--- a/app/javascript/time_tables/actions/index.js
+++ b/app/javascript/time_tables/actions/index.js
@@ -4,7 +4,6 @@ import reject from 'lodash/reject'
import some from 'lodash/some'
import every from 'lodash/every'
import clone from '../../helpers/clone'
-const I18n = clone(window, "I18n")
const actions = {
weekDays: (index) => {
diff --git a/app/javascript/time_tables/containers/App.js b/app/javascript/time_tables/containers/App.js
index 5963f8f1d..c12e33ef5 100644
--- a/app/javascript/time_tables/containers/App.js
+++ b/app/javascript/time_tables/containers/App.js
@@ -10,7 +10,6 @@ import SaveTimetable from './SaveTimetable'
import ConfirmModal from './ConfirmModal'
import ErrorModal from './ErrorModal'
import clone from '../../helpers/clone'
-const I18n = clone(window, "I18n", true)
class App extends Component {
componentDidMount(){
diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim
index cd55d3ce6..c92fb7bae 100644
--- a/app/views/vehicle_journeys/index.html.slim
+++ b/app/views/vehicle_journeys/index.html.slim
@@ -33,7 +33,6 @@
| window.all_missions = #{(@all_missions.to_json).html_safe};
| window.custom_fields = #{(@custom_fields.to_json).html_safe};
| window.extra_headers = #{(@extra_headers.to_json).html_safe};
- // | window.I18n = #{(I18n.backend.send(:translations).to_json).html_safe};
- if has_feature?(:vehicle_journeys_return_route)
= javascript_tag do