diff options
| author | Luc Donnet | 2018-01-19 15:27:51 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-19 15:27:51 +0100 |
| commit | 64caaf63e8e566dd448d9ceca995829b8630b98f (patch) | |
| tree | 2c9c0dd6bfceedb954e3ee09aabfbb978d02f358 | |
| parent | de37a9ecbc12b7e6cab3546e549bf9de74ac8bde (diff) | |
| parent | a7a72085530a38117af3a92b383a8c751954b988 (diff) | |
| download | chouette-core-64caaf63e8e566dd448d9ceca995829b8630b98f.tar.bz2 | |
Merge pull request #243 from af83/5585_stop_area_waiting_time
5585 stop area waiting time
| -rw-r--r-- | app/views/stop_areas/_form.html.slim | 2 | ||||
| -rw-r--r-- | config/locales/stop_areas.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/stop_areas.fr.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/stop_areas/_form.html.slim b/app/views/stop_areas/_form.html.slim index af8b9d889..b2322f73a 100644 --- a/app/views/stop_areas/_form.html.slim +++ b/app/views/stop_areas/_form.html.slim @@ -30,7 +30,7 @@ h3 = t("stop_areas.stop_area.general") - if has_feature?(:stop_area_waiting_time) - = f.input :waiting_time + = f.input :waiting_time, input_html: { min: 0 } = f.input :registration_number, required: format_restriction_for_locales(@referential) == '.hub', :input_html => {:title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.registration_number")} = f.input :fare_code diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml index 62cde93bb..09e8d1a82 100644 --- a/config/locales/stop_areas.en.yml +++ b/config/locales/stop_areas.en.yml @@ -134,7 +134,7 @@ en: city_name: "City" created_at: Created at updated_at: Updated at - waiting_time: Waiting time + waiting_time: Waiting time (minutes) formtastic: titles: stop_area: diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml index 531692cbd..0095bbe6d 100644 --- a/config/locales/stop_areas.fr.yml +++ b/config/locales/stop_areas.fr.yml @@ -134,7 +134,7 @@ fr: city_name: "Commune" created_at: "Créé le" updated_at: "Edité le" - waiting_time: Temps de desserte + waiting_time: Temps de desserte (minutes) formtastic: titles: stop_area: |