Merge Timeband feature and revert Gemfile

4 files changed, 56 insertions, 0 deletions

diff --git a/config/locales/referentials.yml b/config/locales/referentials.yml
index c23e748d3..c38fb8a4b 100644
--- a/config/locales/referentials.yml
+++ b/config/locales/referentials.yml
@@ -68,6 +68,7 @@ en:
         rule_parameter_sets: "Rule parameters sets"
         data_format_restrictions: "Data format constraint"
         data_format: "Favorite format for export"
+        timebands: "Time bands"
   formtastic:
     titles:
       referential:
@@ -146,6 +147,7 @@ fr:
         rule_parameter_sets: "Jeux de paramètres"
         data_format_restrictions: "Appliquer les contraintes de format des données"
         data_format: "Format d'export privilégié"
+        timebands: "Plages horaires"
   formtastic:
     titles:
       referential:
diff --git a/config/locales/timebands.en.yml b/config/locales/timebands.en.yml
new file mode 100644
index 000000000..fae2f1d30
--- /dev/null
+++ b/config/locales/timebands.en.yml
@@ -0,0 +1,26 @@
+en:
+  timebands:
+    actions:
+      new: "Add a time band"
+      edit: "Edit a time band"
+      destroy: "Delete a time band"
+      destroy_confirm: "Thank you to confirm the deletion of these time band."
+    new:
+      title: "Add a time band"
+    edit:
+      title: "Edit this time band %{timeband}"
+    show:
+      title: "Time band %{timeband}"
+    index:
+      title: "Time bands"
+  activerecord:
+    models:
+      timeband:
+        zero:  "Time band"
+        one:   "Time band"
+        other: "Time bands"
+    attributes:
+      timeband:
+        name: "Title"
+        start_time: "Start time"
+        end_time: "End time"
diff --git a/config/locales/timebands.fr.yml b/config/locales/timebands.fr.yml
new file mode 100644
index 000000000..1865d0c39
--- /dev/null
+++ b/config/locales/timebands.fr.yml
@@ -0,0 +1,26 @@
+fr:
+  timebands:
+    actions:
+      new: "Ajouter une plage horaire"
+      edit: "Modifier cette plage horaire"
+      destroy: "Supprimer cette plage horaire"
+      destroy_confirm: "Merci de confirmer la suppression de cette plage horaire."
+    new:
+      title: "Ajouter une plage horaire"
+    edit:
+      title: "Modifier la plage horaire %{timeband}"
+    show:
+      title: Plage horaire %{timeband}
+    index:
+      title: "Plages horaires"
+  activerecord:
+    models:
+      timeband:
+        zero:  "plage horaire"
+        one:   "plage horaire"
+        other: "plages horaires"
+    attributes:
+      timeband:
+        name: "Titre"
+        start_time: "Heure de début"
+        end_time: "Heure de fin"
diff --git a/config/routes.rb b/config/routes.rb
index 4cb5f9439..fdcc506bf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -133,6 +133,8 @@ ChouetteIhm::Application.routes.draw do
       resources :time_table_combinations
     end
 
+    resources :timebands
+
     resources :access_points do
        resources :access_links
     end