diff options
| -rw-r--r-- | app/models/export_task.rb | 4 | ||||
| -rw-r--r-- | app/models/gtfs_export.rb | 6 | ||||
| -rw-r--r-- | config/locales/export_tasks.en.yml | 3 | ||||
| -rw-r--r-- | config/locales/export_tasks.fr.yml | 1 | 
4 files changed, 9 insertions, 5 deletions
| diff --git a/app/models/export_task.rb b/app/models/export_task.rb index 0cd75b08b..fe85e335a 100644 --- a/app/models/export_task.rb +++ b/app/models/export_task.rb @@ -23,7 +23,9 @@ class ExportTask    validates_presence_of :references_type    def initialize( params = {} ) -    params.each {|k,v| send("#{k}=",v)} +    run_callbacks :initialize do +      params.each {|k,v| send("#{k}=",v)} +    end    end    def referential diff --git a/app/models/gtfs_export.rb b/app/models/gtfs_export.rb index 86bf3c368..0fa6e377d 100644 --- a/app/models/gtfs_export.rb +++ b/app/models/gtfs_export.rb @@ -1,7 +1,7 @@  class GtfsExport < ExportTask    validates_presence_of :time_zone -  attr_accessor :time_zone, :object_id_prefix +  attr_accessor :object_id_prefix, :time_zone    enumerize :references_type, in: %w( network line company group_of_line stop_area ) @@ -13,7 +13,7 @@ class GtfsExport < ExportTask      end    end -  def time_zone=(time_zone) +  def real_time_zone      ActiveSupport::TimeZone.find_tzinfo(time_zone).name    end @@ -26,7 +26,7 @@ class GtfsExport < ExportTask          "user_name" => user_name,          "organisation_name" => organisation.name,          "referential_name" => referential.name, -        "time_zone" => time_zone, +        "time_zone" => real_time_zone,          "object_id_prefix" => object_id_prefix        }      } diff --git a/config/locales/export_tasks.en.yml b/config/locales/export_tasks.en.yml index 9770c72ad..77fbf46da 100644 --- a/config/locales/export_tasks.en.yml +++ b/config/locales/export_tasks.en.yml @@ -34,7 +34,8 @@ en:          extensions: "Extensions"          created_at: "Created on"                  status: "Status" -        references_type: "subset" +        references_type: "Subset" +        reference_ids: "Subset ids"          object_id_prefix: "Neptune Id prefix"          max_distance_for_commercial: "Max distance for commercial stop"          max_distance_for_connection_link: "Max distance for connection link" diff --git a/config/locales/export_tasks.fr.yml b/config/locales/export_tasks.fr.yml index 35deec1b1..7698e03e2 100644 --- a/config/locales/export_tasks.fr.yml +++ b/config/locales/export_tasks.fr.yml @@ -35,6 +35,7 @@ fr:          created_at: "Créé le"          status: "Status"          references_type: "Sous ensemble" +        reference_ids: "Identifiants du sous ensemble"          object_id_prefix: "Préfixe d'identifiants"          max_distance_for_commercial: "Distance max pour créer les zones"          max_distance_for_connection_link: "Distance max pour créer les correspondances" | 
