diff options
| -rw-r--r-- | app/assets/stylesheets/main/compliance_check_tasks.css.scss | 32 | ||||
| -rw-r--r-- | app/controllers/export_tasks_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/import_tasks_controller.rb | 1 | ||||
| -rw-r--r-- | app/models/export_task.rb | 5 | ||||
| -rw-r--r-- | app/views/export_tasks/new.html.erb | 3 | ||||
| -rw-r--r-- | app/views/exports/_export.erb | 2 | ||||
| -rw-r--r-- | app/views/exports/show.html.erb | 4 | ||||
| -rw-r--r-- | app/views/imports/_import.erb | 10 | ||||
| -rw-r--r-- | app/views/imports/show.html.erb | 12 | ||||
| -rw-r--r-- | config/locales/compliance_check_tasks.en.yml | 16 | ||||
| -rw-r--r-- | config/locales/compliance_check_tasks.fr.yml (renamed from config/locales/compliance_check_tasks.yml) | 17 | ||||
| -rw-r--r-- | config/locales/exports.yml | 470 | ||||
| -rw-r--r-- | config/locales/import_tasks.yml | 208 | ||||
| -rw-r--r-- | config/locales/imports.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/imports.fr.yml | 2 | ||||
| -rw-r--r-- | config/locales/imports.yml | 198 |
16 files changed, 37 insertions, 947 deletions
diff --git a/app/assets/stylesheets/main/compliance_check_tasks.css.scss b/app/assets/stylesheets/main/compliance_check_tasks.css.scss index 7fecf0068..64c6a2f94 100644 --- a/app/assets/stylesheets/main/compliance_check_tasks.css.scss +++ b/app/assets/stylesheets/main/compliance_check_tasks.css.scss @@ -1,36 +1,4 @@ #workspace.compliance_check_tasks.new, #workspace.compliance_check_tasks.create { - padding: 0; - margin-top: -0.3em; - margin-bottom: 1em; - - - - .inputs ol { - margin-top: -0.3em; - margin-bottom: 1em; - padding: 0; - width: 100%; - } - .inputs ol li { padding : 0.3em 0; } - - .inputs ol li textarea { - width: 54%; - } - .inputs ol li label { - width: 40%; - margin-top: -0.3em; - } - - .inputs ol li.fl label { width: 40%; margin-top: -0.3em; } - .inputs ol li.fl input { width: 21%; padding: 0; } - - .inputs ol li.fl1 {float: left; width: 70% ;} - .inputs ol li.fl1 label {width: 57%; margin-top: -0.3em; } - .inputs ol li.fl1 input { width: 30%; } - - .inputs ol li.fl2 {float: left; width: 25% ;} - .inputs ol li.fl2 label {width: 10%; margin-top: -0.3em;} - .inputs ol li.fl2 input { width: 85%; } } diff --git a/app/controllers/export_tasks_controller.rb b/app/controllers/export_tasks_controller.rb index d9a43cdc5..ba5104342 100644 --- a/app/controllers/export_tasks_controller.rb +++ b/app/controllers/export_tasks_controller.rb @@ -17,6 +17,7 @@ class ExportTasksController < ChouetteController end def create + @available_exports = available_exports begin create! do |success, failure| success.html { redirect_to referential_exports_path(@referential) } @@ -31,7 +32,6 @@ class ExportTasksController < ChouetteController def references references_type = params[:filter].pluralize references = @referential.send(references_type).where("name ilike ?", "%#{params[:q]}%").select("id, name") - puts references.inspect respond_to do |format| format.json do render :json => references.collect { |child| { :id => child.id, :name => child.name } } diff --git a/app/controllers/import_tasks_controller.rb b/app/controllers/import_tasks_controller.rb index 617721956..8eeafab51 100644 --- a/app/controllers/import_tasks_controller.rb +++ b/app/controllers/import_tasks_controller.rb @@ -18,6 +18,7 @@ class ImportTasksController < ChouetteController end def create + @available_imports = available_imports begin create! do |success, failure| success.html { redirect_to referential_imports_path(@referential) } diff --git a/app/models/export_task.rb b/app/models/export_task.rb index c346d0597..a00b4e4ae 100644 --- a/app/models/export_task.rb +++ b/app/models/export_task.rb @@ -8,10 +8,6 @@ class ExportTask define_model_callbacks :initialize, only: :after - # TODO : Move in configuration - @@root = "#{Rails.root}/tmp/exports" - cattr_accessor :root - enumerize :data_format, in: %w( neptune netex gtfs hub kml ) attr_accessor :referential_id, :user_id, :user_name, :references_type, :data_format, :name, :projection_type, :reference_ids @@ -20,7 +16,6 @@ class ExportTask validates_presence_of :user_name validates_presence_of :name validates_presence_of :data_format - validates_presence_of :references_type def initialize( params = {} ) run_callbacks :initialize do diff --git a/app/views/export_tasks/new.html.erb b/app/views/export_tasks/new.html.erb index 6e5397f0e..6cb34665f 100644 --- a/app/views/export_tasks/new.html.erb +++ b/app/views/export_tasks/new.html.erb @@ -9,7 +9,8 @@ <% @available_exports.each do |export_task| %> <%= semantic_form_for [@referential, export_task], :as => :export_task, :url => referential_export_tasks_path(@referential), :namespace => export_task.data_format ,:html => { :id => "#{export_task.data_format}", :class => "tab-pane highlight"} do |form| %> <%= form.inputs do %> - <%= form.input :user_name, :as => :hidden, :input_html => { :value => current_user.name } %> <%= form.input :user_id, :as => :hidden, :input_html => { :value => current_user.id } %> + <%= form.input :user_name, :as => :hidden, :input_html => { :value => current_user.name } %> + <%= form.input :user_id, :as => :hidden, :input_html => { :value => current_user.id } %> <%= form.input :data_format, :as => :hidden %> <%= form.input :referential_id, :as => :hidden, :input_html => { :value => @referential.id } %> <%= form.input :name %> diff --git a/app/views/exports/_export.erb b/app/views/exports/_export.erb index 71ab1e0d9..5cf924960 100644 --- a/app/views/exports/_export.erb +++ b/app/views/exports/_export.erb @@ -14,7 +14,7 @@ </div> </div> <div class="panel-body"> - <p><%= link_to( image_tag("icons/file_#{export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, export.id) ) if !export.aborted? %></p> + <p><%= link_to( image_tag("icons/file_#{export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, export.id) ) if export.file_path %></p> </div> <div class="panel-footer"> <div class="history"> diff --git a/app/views/exports/show.html.erb b/app/views/exports/show.html.erb index 28b150e46..7852635aa 100644 --- a/app/views/exports/show.html.erb +++ b/app/views/exports/show.html.erb @@ -2,14 +2,12 @@ <%= title_tag job_status_title(@export) %> </div> -<% if !@export.aborted? %> <div class="export_show"> <div class="links"> - <%= link_to( image_tag("icons/file_#{@export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) %> + <%= link_to( image_tag("icons/file_#{@export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) if @export.file_path %> </div> <%= render( :partial => "shared/ie_report.html", :locals => { :referential => @referential, :job => @export} ) %> </div> -<% end %> <% content_for :sidebar do %> <ul class="actions"> diff --git a/app/views/imports/_import.erb b/app/views/imports/_import.erb index 11dae5638..717e51b75 100644 --- a/app/views/imports/_import.erb +++ b/app/views/imports/_import.erb @@ -14,13 +14,9 @@ </div> </div> <div class="panel-body"> - <p><%= link_to image_tag("icons/file_#{import.filename_extension}.png") + t("imports.show.imported_file"), imported_file_referential_import_path(@referential, import.id) if !import.aborted? %></p> - <% if import.rule_parameter_set && !import.aborted? %> - <p><%= link_to image_tag("icons/link_page.png") + t("imports.show.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, import.id) %></p> - <% end %> - <% if import.compliance_check && !import.aborted? %> - <p><%= link_to image_tag("icons/link_page.png") + t("imports.show.compliance_check"), compliance_check_referential_import_path(@referential, import.id) %></p> - <% end %> + <p><%= link_to image_tag("icons/file_#{import.filename_extension}.png") + t("imports.show.imported_file"), imported_file_referential_import_path(@referential, import.id) if import.file_path %></p> + <p><%= link_to image_tag("icons/link_page.png") + t("imports.show.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, import.id) if import.rule_parameter_set %></p> + <p><%= link_to image_tag("icons/link_page.png") + t("imports.show.compliance_check"), compliance_check_referential_import_path(@referential, import.id) if import.compliance_check %></p> </div> <div class="panel-footer"> <div class="history"> diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb index 90524eedc..4e94f111d 100644 --- a/app/views/imports/show.html.erb +++ b/app/views/imports/show.html.erb @@ -2,20 +2,14 @@ <%= title_tag job_status_title(@import) %> </div> -<% if !@import.aborted? %> <div class="import_show"> <div class="links"> - <%= link_to image_tag("icons/file_#{@import.filename_extension}.png") + t("imports.show.imported_file"), imported_file_referential_import_path(@referential, @import.id) if !@import.aborted? %> - <% if @import.rule_parameter_set %> - <%= link_to image_tag("icons/link_page.png") + t("imports.show.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, @import.id) %> - <% end %> - <% if @import.compliance_check %> - <%= link_to image_tag("icons/link_page.png") + t("imports.show.compliance_check"), compliance_check_referential_import_path(@referential, @import.id) %> - <% end %> + <%= link_to image_tag("icons/file_#{@import.filename_extension}.png") + t("imports.show.imported_file"), imported_file_referential_import_path(@referential, @import.id) if @import.file_path %> + <%= link_to image_tag("icons/link_page.png") + t("imports.show.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, @import.id) if @import.rule_parameter_set %> + <%= link_to image_tag("icons/link_page.png") + t("imports.show.compliance_check"), compliance_check_referential_import_path(@referential, @import.id) if @import.compliance_check %> </div> <%= render( :partial => "shared/ie_report.html", :locals => { :referential => @referential, :job => @import} ) %> </div> -<% end %> <% content_for :sidebar do %> <ul class="actions"> diff --git a/config/locales/compliance_check_tasks.en.yml b/config/locales/compliance_check_tasks.en.yml new file mode 100644 index 000000000..3b303c1f3 --- /dev/null +++ b/config/locales/compliance_check_tasks.en.yml @@ -0,0 +1,16 @@ +en: + compliance_check_tasks: + new: + title: "Create a new validation" + submit: "Create a validation" + all: "All" + flash: "Validation task on queue, refresh page to see progression" + actions: + new: "Add a validation" + activemodel: + attributes: + compliance_check_task: + name: "Compliance check name" + references_type: "Subset" + reference_ids: "Subset ids" + object_id_prefix: "Neptune Id prefix"
\ No newline at end of file diff --git a/config/locales/compliance_check_tasks.yml b/config/locales/compliance_check_tasks.fr.yml index 45194cfc7..43707574e 100644 --- a/config/locales/compliance_check_tasks.yml +++ b/config/locales/compliance_check_tasks.fr.yml @@ -1,13 +1,3 @@ -en: - compliance_check_tasks: - new: - title: "Create a new validation" - submit: "Create a validation" - all: "All" - flash: "Validation task on queue, refresh page to see progression" - actions: - new: "Add a validation" - fr: compliance_check_tasks: new: @@ -17,3 +7,10 @@ fr: flash: "La demande de validation est mise en file d'attente, veuillez rafraichir régulièrement la page pour en suivre la progression" actions: new: "Ajouter une validation" + activemodel: + attributes: + compliance_check_task: + name: "Nom de la validation" + references_type: "Sous ensemble" + reference_ids: "Identifiants du sous ensemble" + rule_parameter_set_id: "Jeu de paramètres pour validation" diff --git a/config/locales/exports.yml b/config/locales/exports.yml deleted file mode 100644 index 83af97332..000000000 --- a/config/locales/exports.yml +++ /dev/null @@ -1,470 +0,0 @@ -en: - exports: - actions: - new: "New export" - destroy: "Destroy" - destroy_confirm: "Are you sure you want destroy this export?" - new: - title: "New export" - all: "All" - flash: "Export task on queue, refresh page to see progression" - fields_gtfs_export: - warning: "Filter on stop areas export only GTFS stops and transfers files, these may contain extra attributes" - index: - title: "Exports" - warning: "" - show: - report: "Report" - not_yet_started: "On queue" - exported_file: "Exported file" - completed: "[ Completed ]" - failed: "[ Failed ]" - pending: "[ In the treatment queue ]" - processing: "[ In progress... ]" - graph: - files: - title_zip: "Export results for files in zip" - title_default: "Export result for %{extension} file" - error: "Errors" - ignored: "Ignored" - ok: "Success" - lines: - title: "Exported objects" - objects_label: "Objects count" - lines_stats: "Lines" - routes_stats: "Routes" - connection_links_stats: "Connection Links" - time_tables_stats: "Timetables" - stop_areas_stats: "Stop Areas" - access_points_stats: "Access Points" - vehicle_journeys_stats: "Vehicle Journeys" - journey_patterns_stats: "Journey Patterns" - statuses: - created: "Pending ..." - scheduled: "Processing ..." - terminated: "Completed" - canceled: "Canceled" - aborted: "Failed" - compliance_check_task: "Validate Report" - severities: - info: "Information" - uncheck: "Unchecked" - ok: "Ok" - warning: "Warning" - error: "Error" - fatal: "Fatal" - activemodel: - models: - export: - zero: "export" - one: "export" - other: "exports" - neptune_export: - zero: "export" - one: "Neptune export" - other: "exports" - csv_export: - zero: "export" - one: "CSV export" - other: "exports" - gtfs_export: - zero: "export" - one: "GTFS export" - other: "exports" - netex_export: - zero: "export" - one: "NeTEx export" - other: "exports" - attributes: - export: - resources: "File to export" - created_at: "Created on" - status: "Status" - references_type: "subset" - no_save: "No save" - rule_parameter_set_id: "Rule parameter set for compliance check" - 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" - ignore_last_word: "ignore last word" - ignore_end_chars: "ignore last chars" - formtastic: - titles: - export: - max_distance_for_commercial: "Maximal distance to merge homonymous stops in commercial stop in meter" - max_distance_for_connection_link: "Maximal distance to link stops by connection link stop in meter" - ignore_last_word: "ignore last word on stop name in homonymous detection (inappliable when just one word occurs)" - ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection" -fr: - exports: - actions: - new: "Nouvel export" - destroy: "Supprimer cet export" - destroy_confirm: "Etes vous sûr de supprimer cet export ?" - new: - title: "Nouvel export" - all: "Tout" - flash: "La demande d'export est mise en file d'attente, veuillez rafraichir régulièrement la page pour en suivre la progression" - fields_gtfs_export: - warning: "Le filtre sur arrêts exporte uniquement les fichiers GTFS stops et transfers gtfs, ceux-ci pouvant contenir des attributs supplémentaires" - index: - title: "Exports" - warning: "" - show: - report: "Rapport" - not_yet_started: "En file d'attente" - exported_file: "Fichier exporté" - completed: "[ Terminé ]" - failed: "[ Echoué ]" - pending: "[ En file d'attente ]" - processing: "[ En progression... ]" - graph: - files: - title_zip: "Résultat d'export des fichiers du zip" - title_default: "Résultat d'export du fichier %{extension}" - error: "Erreurs" - ignored: "Ignorés" - ok: "Succès" - lines: - title: "Volume de données lues par type de donnée" - objects_label: "Quantité lue" - lines_stats: "Lignes" - routes_stats: "Séquences d'arrêts" - connection_links_stats: "Correspondances" - time_tables_stats: "Calendriers" - stop_areas_stats: "Zones d'arrèt" - access_points_stats: "Accès" - vehicle_journeys_stats: "Courses" - journey_patterns_stats: "Missions" - table: - line: - name: "Nom" - save: "Sauvegarde" - routes: "Séquences d'arrêts" - connection_links: "Correspondances" - time_tables: "Calendriers" - stop_areas: "Zones d'arrèt" - access_points: "Accès" - vehicle_journeys: "Courses" - journey_patterns: "Missions" - not_saved: "Non Sauvé" - saved: "Sauvé" - save_error: "Sauvegarde en erreur" - statuses: - created: "En attente ..." - scheduled: "En cours ..." - terminated: "Achevé" - canceled: "Annulé" - aborted: "Echoué" - compliance_check_task: "Validation" - severities: - info: "Information" - uncheck: "Non testé" - ok: "Ok" - warning: "Alerte" - error: "Erreur" - fatal: "Fatal" - activemodel: - models: - export: - zero: "export" - one: "export" - other: "exports" - neptune_export: - zero: "export" - one: "export Neptune" - other: "exports" - csv_export: - zero: "export" - one: "export CSV" - other: "exports" - gtfs_export: - zero: "export" - one: "export GTFS" - other: "exports" - netex_export: - zero: "export" - one: "export NeTEx" - other: "exports" - attributes: - export: - resources: "Fichier à exporter" - created_at: "Créé le" - status: "Status" - no_save: "Pas de sauvegarde" - references_type: "Sous ensemble" - rule_parameter_set_id: "Jeu de paramètres pour validation" - 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" - ignore_last_word: "ignorer le dernier mot" - ignore_end_chars: "ignorer les n derniers caractères" - formtastic: - titles: - export: - max_distance_for_commercial: "Distance maximale entre deux arrêts homonymes pour créer les zones d'arrêt (en mètre)" - max_distance_for_connection_link: "Distance maximale entre deux arrêts pour créer les correspondances (en mètre)" - ignore_last_word: "Ignorer le dernier mot pour détecter l'homonymie des noms d'arrêt (inapplicable quand le nom ne comporte qu'un mot)" - ignore_end_chars: "Ignorer les n derniers caractères du nom de l'arrêt pour détecter l'homonymie" -en: - exports: - export: - exported_file: "Exported file" - actions: - new: "New export" - destroy: "Destroy" - destroy_confirm: "Are you sure you want destroy this export?" - download: "Download" - new: - title: "New export" - all: "All" - flash: "Export task on queue, refresh page to see progression" - flash2: "On success, a link for download will be displayed" - fields_gtfs_export: - warning: "Stop areas choice provide only stops and transfers gtfs files, with extra data" - index: - title: "Exports" - warning: "" - show: - report: "Report" - statuses: - pending: "Pending ..." - processing: "Processing ..." - completed: "Completed" - failed: "Failed" - export_log_messages: - messages: - started: "Started export" - completed: "Completed export" - failed: "Failed export" - undefined: "%{key} undefined" - overflow: "Can't export more than %{count} %{data} in a single KML export operation. You should proceed with some exports, each one based on less selected lines." - LINE_COUNT: "Exported line count : %{0}" - GROUP_OF_LINES_COUNT: "Exported group of lines count : %{0}" - COMMUNE_COUNT: "City count : %{0}" - TRANSPORT_MODE_COUNT: "Transport Mode count : %{0}" - ROUTE_COUNT: "Route count : %{0}" - ITL_COUNT: "Boardings alightings constraints count : %{0}" - JOURNEY_PATTERN_COUNT: "Journey pattern count : %{0}" - QUAY_AND_BOARDING_POSITION_COUNT: "Quays and Boarding positions count : %{0}" - COMMERCIAL_COUNT: "Commercial stop points count : %{0}" - STOP_PLACE_COUNT: "Stop places count : %{0}" - ITL_COUNT: "ITL count : %{0}" - CONNECTION_LINK_COUNT: "Connection link count : %{0}" - ACCES_LINK_COUNT: "Access Link count : %{0}" - ACCES_POINT_COUNT: "Access Point count : %{0}" - TIME_TABLE_COUNT: "Time Table count : %{0}" - DIRECTION_COUNT: "Direction count : %{0}" - SCHEMA_COUNT: "Schema count : %{0}" - VEHICLE_JOURNEY_COUNT: "Vehicle journey count : %{0}" - VEHICLE_JOURNEY_OPERATION_COUNT: "Vehicle journey operation count : %{0}" - VEHICLE_JOURNEY_AT_STOP_COUNT: "Vehicle journey At Stop count : %{0}" - PHYSICAL_STOP_AREA_COUNT: "Physical Stop Areas count : %{0}" - COMMERCIAL_STOP_AREA_COUNT: "Logical Stop Areas count : %{0}" - NETWORK_COUNT: "Networks count : %{0}" - COMPANY_COUNT: "Companies count : %{0}" - EXPORT: "%{0} Export" - EXPORTED_LINE: "Line %{0} (%{1}) exported" - EMPTY_LINE: "Line without valid vehicle journey : not exported" - EXPORT_ERROR: "Error durring export" - EXCEPTION: "Origin %{0}" - WRONG_DATA: "Missing arguments to produce log message %{0}" - # old report for backward compatibility - NEPTUNE_EXPORT: "Neptune Export" - NEPTUNE_EXPORTED_LINE: "Line %{0} (%{1}) exported" - NEPTUNE_EMPTY_LINE: "Line %{0} (%{1}) without valid vehicle journey : not exported" - GTFS_EXPORT: "GTFS Export" - GTFS_OK: "Export GTFS terminated" - GTFS_NO_LINE: "No line to export" - GTFS_MISSING_PARAMETER: "Missing parameter : %{0}" - GTFS_UNKNOWN_PARAMETER: "Unknown parameter : %{0}" - GTFS_FILE_ACCESS: "Unable to access file %{0}" - GTFS_EMPTY_TIMETABLE: "Timetable without date nor period %{0}" - GTFS_EMPTY_DATA: "No %{0} data to export" - GTFS_INVALID_DATA: "%{0} %{1} : invalid data %{2}=%{3}" - GTFS_MISSING_DATA: "%{0} %{1} : missing value for : %{2}" - CSV_EXPORT: "CSV Export" - CSV_OK_LINE: "Line %{0} exported" - CSV_TOO_MUCH_ROUTES: "Line %{0} rejected : more than 2 routes" - NETEX_EXPORT: "NeTEx Export" - NETEX_EXPORTED_LINE: "Line %{0} (%{1}) exported" - NETEX_EMPTY_LINE: "Line %{0} (%{1}) without valid vehicle journey : not exported" - severities: - info: "Information" - ok: "Ok" - warning: "Warning" - error: "Error" - fatal: "Fatal" - activemodel: - models: - export: - one: "export" - other: "exports" - kml_export: "KML export" - hub_export: "HUB export" - neptune_export: "Neptune export" - csv_export: "CSV export" - gtfs_export: "GTFS export" - netex_export: "NeTEx export" - attributes: - export: - status: "Status" - created_at: "Created on" - references_type: "Associated Data Type" - reference_ids: "Associated Data" - time_zone: "Time Zone" - start_date: "Start of period" - end_date: "End of period" - object_id_prefix: "objectId prefix to be ignored" - extensions: "add extra fields in comments" - export_log_message: - created_at: "Date" - position: "N." - full_message: "Message" - formtastic: - titles: - export: - time_zone: "according to TZ encoding (see http://en.wikipedia.org/wiki/Tz_database)" - object_id_prefix: "when prefix has this value, it will be removed to build GTFS id" - start_date: "reduce export to vehicle journeys running from this date" - end_date: "reduce export to vehicle journeys running until this date" - vjas: - size: "HUB export not allowed. The number of vehicle journeys at stops (%{size}) is greater than 50000." - dates: - not_nul: "HUB Export interrupted. Start date and end date must be provided." - area_types: - quay: "Quays and Boarding Positions" - commercial_stop_point: "Commercial Stop Points" - stop_place: "Stop Places" - itl: "Restriction Constraints" -fr: - exports: - export: - exported_file: "Fichier exporté" - actions: - new: "Nouvel export" - destroy: "Supprimer cet export" - destroy_confirm: "Etes vous sûr de supprimer cet export ?" - download: "Télécharger" - new: - title: "Nouvel export" - all: "Toutes" - flash: "La demande d'export est mise en file d'attente, veuillez rafraichir régulièrement la page pour en suivre la progression" - flash2: "Une fois l'export terminé, un lien sera disponible pour télécharger le résultat" - fields_gtfs_export: - warning: "Le filtre sur arrêts produit uniquement les fichiers GTFS stops et transfers gtfs, ceux-ci contenant alors des attributs supplémentaires" - index: - title: "Exports" - warning: "" - show: - report: "Rapport" - statuses: - pending: "En attente ..." - processing: "En cours ..." - completed: "Achevé" - failed: "Echoué" - export_log_messages: - messages: - started: "Export démarré" - completed: "Export achevé avec succès" - failed: "Export interrompu" - undefined: "%{key} non défini" - overflow: "Impossible d'exporter plus de %{count} %{data} en un seul export. Veuillez procéder par exports successifs en sélectionnant une moindre quantité de lignes." - LINE_COUNT: "Nombre de lignes exportées : %{0}" - GROUP_OF_LINES_COUNT: "Nombre de groupe de lignes exportés : %{0}" - COMMUNE_COUNT: "Nombre de communes : %{0}" - TRANSPORT_MODE_COUNT: "Nombre de modes de transport : %{0}" - ROUTE_COUNT: "Nombre de séquences d'arrêts exportées : %{0}" - ITL_COUNT: "Nombre de contraintes de montées / descentes : %{0}" - QUAY_AND_BOARDING_POSITION_COUNT: "Nombre d'arrêts physiques exportés : %{0}" - COMMERCIAL_COUNT: "Nombre d'arrêts commerciaux exportés : %{0}" - STOP_PLACE_COUNT: "Nombres de pôles d'échange exportés : %{0}" - ITL_COUNT: "Nombre d'ITL exportées : %{0}" - JOURNEY_PATTERN_COUNT: "Nombre de missions exportées : %{0}" - CONNECTION_LINK_COUNT: "Nombre de correspondances exportées : %{0}" - ACCES_LINK_COUNT: "Nombre de liaison d'accès exportées : %{0}" - ACCES_POINT_COUNT: "Nombre de points d'accès exportés : %{0}" - TIME_TABLE_COUNT: "Nombre de tableaux de marche : %{0}" - DIRECTION_COUNT: "Nombre de directions : %{0}" - SCHEMA_COUNT: "Nombre de schémas : %{0}" - VEHICLE_JOURNEY_COUNT: "Nombre de courses : %{0}" - VEHICLE_JOURNEY_OPERATION_COUNT: "Nombre de courses opérations : %{0}" - VEHICLE_JOURNEY_AT_STOP_COUNT: "Nombre d'horaires : %{0}" - PHYSICAL_STOP_AREA_COUNT: "Nombre d'arrêts physiques : %{0}" - COMMERCIAL_STOP_AREA_COUNT: "Nombre d'arrêts logiques : %{0}" - NETWORK_COUNT: "Nombre de réseaux : %{0}" - COMPANY_COUNT: "Nombre de transporteurs : %{0}" - EXPORT: "Export %{0}" - EXPORTED_LINE: "Ligne %{0} (%{1}) exportée" - EMPTY_LINE: "Ligne sans course valide : non exportée" - EXPORT_ERROR: "Erreur lors de l'export" - EXCEPTION: "Cause %{0}" - WRONG_DATA: "Il manque des données pour afficher le message de log %{0}" - # old report for backward compatibility - NEPTUNE_EXPORT: "Export Neptune" - NEPTUNE_EXPORTED_LINE: "Ligne %{0} (%{1}) exportée" - NEPTUNE_EMPTY_LINE: "Ligne %{0} (%{1}) sans course valide : non exportée" - GTFS_EXPORT: "Export GTFS" - GTFS_OK: "Export GTFS terminé" - GTFS_NO_LINE: "Pas de ligne à exporter" - GTFS_MISSING_PARAMETER: "Paramètre %{0} manquant" - GTFS_UNKNOWN_PARAMETER: "Paramètre %{0} inconnu" - GTFS_FILE_ACCESS: "Accès au fichier %{0} impossible" - GTFS_EMPTY_TIMETABLE: "Calendier sans date ni periode %{0}" - GTFS_EMPTY_DATA: "Pas de donné de type %{0} à exporter" - GTFS_INVALID_DATA: "%{0} %{1} : attribut %{2}=%{3} invalide" - GTFS_MISSING_DATA: "%{0} %{1} : valeur manquante : %{2}" - CSV_EXPORT: "Export CSV" - CSV_OK_LINE: "Ligne %{0} exportée" - CSV_TOO_MUCH_ROUTES: "Ligne %{0} non exportable : plus de 2 séquences d'arrêt" - NETEX_EXPORT: "Export NeTEx" - NETEX_EXPORTED_LINE: "Ligne %{0} (%{1}) exportée" - NETEX_EMPTY_LINE: "Ligne %{0} (%{1}) sans course valide : non exportée" - severities: - info: "Information" - ok: "Ok" - warning: "Alerte" - error: "Erreur" - fatal: "Fatal" - activemodel: - models: - export: - one: "export" - other: "exports" - kml_export: "export KML" - hub_export: "export HUB" - neptune_export: "export Neptune " - csv_export: "export CSV" - gtfs_export: "export GTFS " - netex_export: "export NeTEx " - attributes: - export: - status: "Status" - created_at: "Créé le" - references_type: "Type de données incluses" - reference_ids: "Données incluses" - time_zone: "Fuseau horaire" - start_date: "Début de période" - end_date: "Fin de période" - object_id_prefix: "Préfixe d'identifiant Neptune à ignorer" - extensions: "ajout de champs supplémentaires dans les commentaires" - export_log_message: - created_at: "Date" - position: "No" - full_message: "Message" - formtastic: - titles: - export: - time_zone: "selon le codage TZ (http://fr.wikipedia.org/wiki/Tz_database)" - object_id_prefix: "lorsque le préfixe d'identifiant Netpune prend cette valeur, il n'est pas utilisé pour composer l'identifiant GTFS" - start_date: "limite l'export aux courses circulant à partir de cette date" - end_date: "limite l'export aux courses circulant jusqu'à cette date" - vjas: - size: "L'Export HUB est impossible. Le nombre d'horaires (%{size}) est supérieure à 50000." - dates: - not_nul: "Export HUB interrompu. Les dates de début et de fin doivent êtres renseignées." - area_types: - quay: "Arrêts" - commercial_stop_point: "Arrêts commerciaux" - stop_place: "Pôles d'échange" - itl: "ITL" diff --git a/config/locales/import_tasks.yml b/config/locales/import_tasks.yml deleted file mode 100644 index d016d9664..000000000 --- a/config/locales/import_tasks.yml +++ /dev/null @@ -1,208 +0,0 @@ -en: - import_tasks: - actions: - new: "New import" - destroy: "Destroy" - destroy_confirm: "Are you sure you want destroy this import?" - new: - title: "New import" - all: "All" - flash: "Import task on queue, refresh page to see progression" - fields_gtfs_import: - warning: "Filter on stop areas import only GTFS stops and transfers files, these may contain extra attributes" - index: - title: "Imports" - warning: "" - show: - report: "Report" - not_yet_started: "On queue" - imported_file: "Imported file" - completed: "[ Completed ]" - failed: "[ Failed ]" - pending: "[ In the treatment queue ]" - processing: "[ In progress... ]" - graph: - files: - title_zip: "Import results for files in zip" - title_default: "Import result for %{extension} file" - error: "Errors" - ignored: "Ignored" - ok: "Success" - lines: - title: "Imported objects" - objects_label: "Objects count" - lines_stats: "Lines" - routes_stats: "Routes" - connection_links_stats: "Connection Links" - time_tables_stats: "Timetables" - stop_areas_stats: "Stop Areas" - access_points_stats: "Access Points" - vehicle_journeys_stats: "Vehicle Journeys" - journey_patterns_stats: "Journey Patterns" - statuses: - created: "Pending ..." - scheduled: "Processing ..." - terminated: "Completed" - canceled: "Canceled" - aborted: "Failed" - compliance_check_task: "Validate Report" - severities: - info: "Information" - uncheck: "Unchecked" - ok: "Ok" - warning: "Warning" - error: "Error" - fatal: "Fatal" - activerecord: - models: - import_task: - zero: "import" - one: "import" - other: "imports" - neptune_import: - zero: "import" - one: "Neptune import" - other: "imports" - csv_import: - zero: "import" - one: "CSV import" - other: "imports" - gtfs_import: - zero: "import" - one: "GTFS import" - other: "imports" - netex_import: - zero: "import" - one: "NeTEx import" - other: "imports" - attributes: - import_task: - resources: "File to import" - created_at: "Created on" - status: "Status" - references_type: "subset" - no_save: "No save" - rule_parameter_set_id: "Rule parameter set for compliance check" - 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" - ignore_last_word: "ignore last word" - ignore_end_chars: "ignore last chars" - formtastic: - titles: - import_task: - max_distance_for_commercial: "Maximal distance to merge homonymous stops in commercial stop in meter" - max_distance_for_connection_link: "Maximal distance to link stops by connection link stop in meter" - ignore_last_word: "ignore last word on stop name in homonymous detection (inappliable when just one word occurs)" - ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection" -fr: - import_tasks: - actions: - new: "Nouvel import" - destroy: "Supprimer cet import" - destroy_confirm: "Etes vous sûr de supprimer cet import ?" - new: - title: "Nouvel import" - all: "Tout" - flash: "La demande d'import est mise en file d'attente, veuillez rafraichir régulièrement la page pour en suivre la progression" - fields_gtfs_import: - warning: "Le filtre sur arrêts importe uniquement les fichiers GTFS stops et transfers gtfs, ceux-ci pouvant contenir des attributs supplémentaires" - index: - title: "Imports" - warning: "" - show: - report: "Rapport" - not_yet_started: "En file d'attente" - imported_file: "Fichier importé" - completed: "[ Terminé ]" - failed: "[ Echoué ]" - pending: "[ En file d'attente ]" - processing: "[ En progression... ]" - graph: - files: - title_zip: "Résultat d'import des fichiers du zip" - title_default: "Résultat d'import du fichier %{extension}" - error: "Erreurs" - ignored: "Ignorés" - ok: "Succès" - lines: - title: "Volume de données lues par type de donnée" - objects_label: "Quantité lue" - lines_stats: "Lignes" - routes_stats: "Séquences d'arrêts" - connection_links_stats: "Correspondances" - time_tables_stats: "Calendriers" - stop_areas_stats: "Zones d'arrèt" - access_points_stats: "Accès" - vehicle_journeys_stats: "Courses" - journey_patterns_stats: "Missions" - table: - line: - name: "Nom" - save: "Sauvegarde" - routes: "Séquences d'arrêts" - connection_links: "Correspondances" - time_tables: "Calendriers" - stop_areas: "Zones d'arrèt" - access_points: "Accès" - vehicle_journeys: "Courses" - journey_patterns: "Missions" - not_saved: "Non Sauvé" - saved: "Sauvé" - save_error: "Sauvegarde en erreur" - statuses: - created: "En attente ..." - scheduled: "En cours ..." - terminated: "Achevé" - canceled: "Annulé" - aborted: "Echoué" - compliance_check_task: "Validation" - severities: - info: "Information" - uncheck: "Non testé" - ok: "Ok" - warning: "Alerte" - error: "Erreur" - fatal: "Fatal" - activerecord: - models: - import_task: - zero: "import" - one: "import" - other: "imports" - neptune_import: - zero: "import" - one: "import Neptune" - other: "imports" - csv_import: - zero: "import" - one: "import CSV" - other: "imports" - gtfs_import: - zero: "import" - one: "import GTFS" - other: "imports" - netex_import: - zero: "import" - one: "import NeTEx" - other: "imports" - attributes: - import_task: - resources: "Fichier à importer" - created_at: "Créé le" - status: "Status" - no_save: "Pas de sauvegarde" - references_type: "Sous ensemble" - rule_parameter_set_id: "Jeu de paramètres pour validation" - 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" - ignore_last_word: "ignorer le dernier mot" - ignore_end_chars: "ignorer les n derniers caractères" - formtastic: - titles: - import_task: - max_distance_for_commercial: "Distance maximale entre deux arrêts homonymes pour créer les zones d'arrêt (en mètre)" - max_distance_for_connection_link: "Distance maximale entre deux arrêts pour créer les correspondances (en mètre)" - ignore_last_word: "Ignorer le dernier mot pour détecter l'homonymie des noms d'arrêt (inapplicable quand le nom ne comporte qu'un mot)" - ignore_end_chars: "Ignorer les n derniers caractères du nom de l'arrêt pour détecter l'homonymie" diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml index f1e478ed7..8d642dd62 100644 --- a/config/locales/imports.en.yml +++ b/config/locales/imports.en.yml @@ -9,7 +9,7 @@ en: warning: "" show: report: "Report" - imported_file: "Imported file" + imported_file: "Original file" rule_parameter_set: "Rule parameter set" compliance_check: "Validation" compliance_check_of: "Validation of import: " diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml index 6e24bab2c..b3d784b12 100644 --- a/config/locales/imports.fr.yml +++ b/config/locales/imports.fr.yml @@ -9,7 +9,7 @@ fr: warning: "" show: report: "Rapport" - imported_file: "Fichier importé" + imported_file: "Fichier source" rule_parameter_set: "Jeu de paramètres" compliance_check: "Validation" compliance_check_of: "Validation de l'import : " diff --git a/config/locales/imports.yml b/config/locales/imports.yml deleted file mode 100644 index 5b78bf02c..000000000 --- a/config/locales/imports.yml +++ /dev/null @@ -1,198 +0,0 @@ -en: - imports: - actions: - new: "New import" - destroy: "Destroy" - destroy_confirm: "Are you sure you want destroy this import?" - new: - title: "New import" - all: "All" - flash: "Import task on queue, refresh page to see progression" - fields_gtfs_import: - warning: "Filter on stop areas import only GTFS stops and transfers files, these may contain extra attributes" - index: - title: "Imports" - warning: "" - show: - report: "Report" - imported_file: "Imported file" - graph: - files: - title_zip: "Import results for files in zip" - title_default: "Import result for %{extension} file" - error: "Errors" - ignored: "Ignored" - ok: "Success" - lines: - title: "Imported objects" - objects_label: "Objects count" - lines_stats: "Lines" - routes_stats: "Routes" - connection_links_stats: "Connection Links" - time_tables_stats: "Timetables" - stop_areas_stats: "Stop Areas" - access_points_stats: "Access Points" - vehicle_journeys_stats: "Vehicle Journeys" - journey_patterns_stats: "Journey Patterns" - statuses: - started: "Started" - scheduled: "Processing ..." - terminated: "Completed" - canceled: "Canceled" - aborted: "Failed" - compliance_check_task: "Validate Report" - severities: - info: "Information" - uncheck: "Unchecked" - ok: "Ok" - warning: "Warning" - error: "Error" - fatal: "Fatal" - activemodel: - models: - import: - zero: "import" - one: "import" - other: "imports" - neptune_import: - zero: "import" - one: "Neptune import" - other: "imports" - csv_import: - zero: "import" - one: "CSV import" - other: "imports" - gtfs_import: - zero: "import" - one: "GTFS import" - other: "imports" - netex_import: - zero: "import" - one: "NeTEx import" - other: "imports" - attributes: - import: - resources: "File to import" - created_at: "Created on" - status: "Status" - references_type: "subset" - no_save: "No save" - rule_parameter_set_id: "Rule parameter set for compliance check" - 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" - ignore_last_word: "ignore last word" - ignore_end_chars: "ignore last chars" - formtastic: - titles: - import: - max_distance_for_commercial: "Maximal distance to merge homonymous stops in commercial stop in meter" - max_distance_for_connection_link: "Maximal distance to link stops by connection link stop in meter" - ignore_last_word: "ignore last word on stop name in homonymous detection (inappliable when just one word occurs)" - ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection" -fr: - imports: - actions: - new: "Nouvel import" - destroy: "Supprimer cet import" - destroy_confirm: "Etes vous sûr de supprimer cet import ?" - new: - title: "Nouvel import" - all: "Tout" - flash: "La demande d'import est mise en file d'attente, veuillez rafraichir régulièrement la page pour en suivre la progression" - fields_gtfs_import: - warning: "Le filtre sur arrêts importe uniquement les fichiers GTFS stops et transfers gtfs, ceux-ci pouvant contenir des attributs supplémentaires" - index: - title: "Imports" - warning: "" - show: - report: "Rapport" - imported_file: "Fichier importé" - graph: - files: - title_zip: "Résultat d'import des fichiers du zip" - title_default: "Résultat d'import du fichier %{extension}" - error: "Erreurs" - ignored: "Ignorés" - ok: "Succès" - lines: - title: "Volume de données lues par type de donnée" - objects_label: "Quantité lue" - lines_stats: "Lignes" - routes_stats: "Séquences d'arrêts" - connection_links_stats: "Correspondances" - time_tables_stats: "Calendriers" - stop_areas_stats: "Zones d'arrèt" - access_points_stats: "Accès" - vehicle_journeys_stats: "Courses" - journey_patterns_stats: "Missions" - table: - line: - name: "Nom" - save: "Sauvegarde" - routes: "Séquences d'arrêts" - connection_links: "Correspondances" - time_tables: "Calendriers" - stop_areas: "Zones d'arrèt" - access_points: "Accès" - vehicle_journeys: "Courses" - journey_patterns: "Missions" - not_saved: "Non Sauvé" - saved: "Sauvé" - save_error: "Sauvegarde en erreur" - statuses: - created: "En file d'attente..." - scheduled: "En cours..." - terminated: "Achevé" - canceled: "Annulé" - aborted: "Echoué" - compliance_check_task: "Validation" - severities: - info: "Information" - uncheck: "Non testé" - ok: "Ok" - warning: "Alerte" - error: "Erreur" - fatal: "Fatal" - activemodel: - models: - import: - zero: "import" - one: "import" - other: "imports" - neptune_import: - zero: "import" - one: "import Neptune" - other: "imports" - csv_import: - zero: "import" - one: "import CSV" - other: "imports" - gtfs_import: - zero: "import" - one: "import GTFS" - other: "imports" - netex_import: - zero: "import" - one: "import NeTEx" - other: "imports" - attributes: - import: - resources: "Fichier à importer" - created_at: "Créé le" - status: "Status" - no_save: "Pas de sauvegarde" - references_type: "Sous ensemble" - rule_parameter_set_id: "Jeu de paramètres pour validation" - 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" - ignore_last_word: "ignorer le dernier mot" - ignore_end_chars: "ignorer les n derniers caractères" - formtastic: - titles: - import: - max_distance_for_commercial: "Distance maximale entre deux arrêts homonymes pour créer les zones d'arrêt (en mètre)" - max_distance_for_connection_link: "Distance maximale entre deux arrêts pour créer les correspondances (en mètre)" - ignore_last_word: "Ignorer le dernier mot pour détecter l'homonymie des noms d'arrêt (inapplicable quand le nom ne comporte qu'un mot)" - ignore_end_chars: "Ignorer les n derniers caractères du nom de l'arrêt pour détecter l'homonymie" |