aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLuc Donnet2014-09-22 11:18:56 +0200
committerLuc Donnet2014-09-22 11:18:56 +0200
commitc48c2f8afdb378c5a3d688ff57dd45eb32ddafee (patch)
tree52cc0634d9004c77d011ba307476d30644a6976a /config
parent9bec29bc032934c60e23a01a6cfd4b1664aabc22 (diff)
downloadchouette-core-c48c2f8afdb378c5a3d688ff57dd45eb32ddafee.tar.bz2
Fix modal display Refs #0028818
Diffstat (limited to 'config')
-rw-r--r--config/initializers/formtastic.rb4
-rw-r--r--config/locales/formtastic.yml2
-rw-r--r--config/locales/vehicle_journeys.yml2
3 files changed, 4 insertions, 4 deletions
diff --git a/config/initializers/formtastic.rb b/config/initializers/formtastic.rb
index c20f77e40..2cdc37243 100644
--- a/config/initializers/formtastic.rb
+++ b/config/initializers/formtastic.rb
@@ -4,10 +4,10 @@
Formtastic::FormBuilder.default_text_field_size = 50
# Set the default text area height when input is a text. Default is 20.
-# Formtastic::FormBuilder.default_text_area_height = 5
+Formtastic::FormBuilder.default_text_area_height = 5
# Set the default text area width when input is a text. Default is nil.
-# Formtastic::FormBuilder.default_text_area_width = 50
+Formtastic::FormBuilder.default_text_area_width = 50
# Should all fields be considered "required" by default?
# Defaults to true.
diff --git a/config/locales/formtastic.yml b/config/locales/formtastic.yml
index 40ea23472..13b82ef2e 100644
--- a/config/locales/formtastic.yml
+++ b/config/locales/formtastic.yml
@@ -12,6 +12,7 @@ en:
export: "Launch export"
validate: "Launch validation"
duplicate: "Duplicate"
+ clone: "Clone"
fr:
formtastic:
@@ -27,3 +28,4 @@ fr:
export: "Lancer l'export"
validate: "Lancer la validation"
duplicate: "Dupliquer"
+ clone: "Cloner" \ No newline at end of file
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index 810c80ddb..d9768048a 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -38,7 +38,6 @@ en:
arrival: "Arrival"
time_tables: "Calendars list"
bounding: "From %{start} to %{end}"
- validation: "Clone"
translation_form: "Vehicle journey translations"
index:
title: "Vehicle journeys on route %{route}"
@@ -138,7 +137,6 @@ fr:
arrival: "Arrivée"
time_tables: "Liste des calendriers"
bounding: "De %{start} à %{end}"
- validation: "Cloner"
translation_form: "Cloner la course"
index:
title: "Courses de la séquence d'arrêts %{route}"