aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLuc Donnet2018-02-01 14:04:54 +0100
committerGitHub2018-02-01 14:04:54 +0100
commitb3d46e56c65b9dcfee9c8a81fd567cba956c63fc (patch)
tree04c6447a57ac81cfaa7ba098d7efcecd056c7109 /config
parent972e988e0f52a6ee69bf97c112be28e6f852be00 (diff)
parent9caa25a7c2267f715822178b84ea15376f079a29 (diff)
downloadchouette-core-b3d46e56c65b9dcfee9c8a81fd567cba956c63fc.tar.bz2
Merge pull request #255 from af83/5682-add-days-to-calendars
Add application days to calendars
Diffstat (limited to 'config')
-rw-r--r--config/locales/calendars.en.yml7
-rw-r--r--config/locales/calendars.fr.yml7
-rw-r--r--config/routes.rb5
3 files changed, 18 insertions, 1 deletions
diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml
index a2110d053..c3df413af 100644
--- a/config/locales/calendars.en.yml
+++ b/config/locales/calendars.en.yml
@@ -69,6 +69,13 @@ en:
dates: Dates
shared: Shared
organisation: Organisation
+ monday: "Monday"
+ tuesday: "Tuesday"
+ wednesday: "Wednesday"
+ thursday: "Thursday"
+ friday: "Friday"
+ saturday: "Saturday"
+ sunday: "Sunday"
errors:
models:
calendar:
diff --git a/config/locales/calendars.fr.yml b/config/locales/calendars.fr.yml
index f9eaf1be5..6fd265925 100644
--- a/config/locales/calendars.fr.yml
+++ b/config/locales/calendars.fr.yml
@@ -69,6 +69,13 @@ fr:
dates: Dates
shared: Partagé
organisation: Organisation
+ monday: "Lundi"
+ tuesday: "Mardi"
+ wednesday: "Mercredi"
+ thursday: "Jeudi"
+ friday: "Vendredi"
+ saturday: "Samedi"
+ sunday: "Dimanche"
errors:
models:
calendar:
diff --git a/config/routes.rb b/config/routes.rb
index 432423ac5..fc2807ab1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -114,13 +114,16 @@ ChouetteIhm::Application.routes.draw do
resources :calendars do
get :autocomplete, on: :collection, controller: 'autocomplete_calendars'
+ member do
+ get 'month', defaults: { format: :json }
+ end
end
resources :referentials, except: :index do
resources :autocomplete_stop_areas, only: [:show, :index] do
get 'around', on: :member
end
- resources :autocomplete_purchase_windows, only: [:index]
+ resources :autocomplete_purchase_windows, only: [:index]
get :select_compliance_control_set
post :validate, on: :member
resources :autocomplete_time_tables, only: [:index]