diff options
41 files changed, 140 insertions, 166 deletions
diff --git a/app/helpers/stop_areas_helper.rb b/app/helpers/stop_areas_helper.rb index a255a2038..db8d40920 100644 --- a/app/helpers/stop_areas_helper.rb +++ b/app/helpers/stop_areas_helper.rb @@ -12,7 +12,7 @@ module StopAreasHelper end def genealogical_title - return t(".stop_areas.genealogical.genealogical_routing") if @stop_area.stop_area_type == 'itl' + return t("stop_areas.genealogical.genealogical_routing") if @stop_area.stop_area_type == 'itl' t("stop_areas.genealogical.genealogical") end diff --git a/app/views/compliance_checks/detailed_errors_index.csv.erb b/app/views/compliance_checks/detailed_errors_index.csv.erb index 17fb6f2c3..9ab7598ea 100644 --- a/app/views/compliance_checks/detailed_errors_index.csv.erb +++ b/app/views/compliance_checks/detailed_errors_index.csv.erb @@ -1,2 +1,2 @@ <%= I18n.t("activemodel.attributes.compliance_check_result.severity") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.rule_code") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.object") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.resource") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.title") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.detail") %> -<% @compliance_check.compliance_check_validation_report.tests.each do |r| %><% if r.errors.present? %><% r.errors.first(10).each do |error| %><% case r.severity %><% when "warning" %><%= I18n.t "compliance_check_result.severities.warning_txt" %><% when "error" %><%= I18n.t "compliance_check_result.severities.error_txt" %><% end %>;<%= r.test_id %>;<% if error["source"].present? %><%= error["source"]["objectid"] if error["source"]["objectid"].present? %>;<% if error["source"]["object_path"].present? %><%= object_url(@referential_id, error) %><% elsif error["source"]["file"].present? %><%= File.basename(error["source"]["file"]["filename"]) +" - " %><%= I18n.t "compliance_check_results.index.column" %>:<%= error["source"]["file"]["column_number"] %>,<%= I18n.t "compliance_check_results.index.line" %>:<%= error["source"]["file"]["line_number"] %><% end %>;<% else %>;;<% end %><%= I18n.t("activemodel.attributes.compliance_check_result."+r.test_id) %>;<%= I18n.t("compliance_check_result.details.detail_" + error["error_id"], object_labels_hash(error) )%><%= "\n" %><% end %><% end %><% end %> +<% @compliance_check.compliance_check_validation_report.tests.each do |r| %><% if r.errors.present? %><% r.errors.first(10).each do |error| %><% case r.severity %><% when "warning" %><%= I18n.t "compliance_check_result.severities.warning_txt" %><% when "error" %><%= I18n.t "compliance_check_result.severities.error_txt" %><% end %>;<%= r.test_id %>;<% if error["source"].present? %><%= error["source"]["objectid"] if error["source"]["objectid"].present? %>;<% if error["source"]["object_path"].present? %><%= object_url(@referential_id, error) %><% elsif error["source"]["file"].present? %><%= File.basename(error["source"]["file"]["filename"]) +" - " %><%= I18n.t "compliance_check_results.index.column" %>:<%= error["source"]["file"]["column_number"] %>,<%= I18n.t "compliance_check_results.index.line" %>:<%= error["source"]["file"]["line_number"] %><% end %>;<% else %>;;<% end %><%= I18n.t("activemodel.attributes.compliance_check_result."+r.test_id) %>;<%= I18n.t("compliance_check_result.details.detail_#{error['error_id']}", object_labels_hash(error) )%><%= "\n" %><% end %><% end %><% end %> diff --git a/app/views/devise/shared/links.erb b/app/views/devise/shared/links.erb index 9d74c7a0e..a3a2f0b9b 100644 --- a/app/views/devise/shared/links.erb +++ b/app/views/devise/shared/links.erb @@ -3,7 +3,7 @@ <%- if controller_name != 'sessions' %> <li> - <%= link_to t('devise.sessions.actions.new'), new_session_path(resource_name) %> + <%= link_to t('devise.sessions.new.title'), new_session_path(resource_name) %> </li> <% end -%> @@ -13,19 +13,19 @@ <%- if devise_mapping.recoverable? && controller_name != 'passwords' %> <li> - <%= link_to t('devise.passwords.actions.new'), new_password_path(resource_name) %> + <%= link_to t('devise.passwords.new'), new_password_path(resource_name) %> </li> <% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> <li> - <%= link_to t('devise.confirmations.actions.new'), new_confirmation_path(resource_name) %> + <%= link_to t('devise.confirmations.new'), new_confirmation_path(resource_name) %> </li> <% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> <li> - <%= link_to t('devise.unlocks.actions.new'), new_unlock_path(resource_name) %> + <%= link_to t('devise.unlock.new.title'), new_unlock_path(resource_name) %> </li> <% end -%> </ul> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index 572fea1c6..e59aa0003 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,4 +1,4 @@ -<h2>Resend unlock instructions</h2> +<h2><%= t('devise.unlock.new.title') %></h2> <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> @@ -6,7 +6,7 @@ <p><%= f.label :email %><br /> <%= f.text_field :email %></p> - <p><%= f.submit "Resend unlock instructions" %></p> + <p><%= f.submit t('devise.unlock.new.title') %></p> <% end %> <%= render "links" %>
\ No newline at end of file diff --git a/app/views/referential_stop_areas/_form.html.erb b/app/views/referential_stop_areas/_form.html.erb index d4fcf25e3..6ad9ba703 100644 --- a/app/views/referential_stop_areas/_form.html.erb +++ b/app/views/referential_stop_areas/_form.html.erb @@ -15,7 +15,7 @@ <input class="typeahead form-control input-lg" maxlength="255" type="text" placeholder="<%= t('.address') %>" /> </div> <% unless @stop_area.projection.blank? or @stop_area.projection_type_label.empty? %> - <%= form.input :projection_xy, :label => t("projection_xy", :projection => @referential.projection_type_label), :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.projection_xy")} %> + <%= form.input :projection_xy, :label => t("activerecord.attributes.stop_area.projection_xy", :projection => @referential.projection_type_label), :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.projection_xy")} %> <% end %> <%= form.input :coordinates, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.coordinates")} %> <%= form.input :street_name %> @@ -27,7 +27,7 @@ </div> </div> <div class="stop_areas.stop_area.general_info"> - <h3><%= t("stop_area.general") %></h3> + <h3><%= t("stop_areas.stop_area.general") %></h3> <%= form.inputs do %> <%= form.input :objectid, :required => !@stop_area.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.objectid")} %> <%= form.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")} %> diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb index b0152297d..af1b9ed3a 100644 --- a/app/views/stop_areas/_form.html.erb +++ b/app/views/stop_areas/_form.html.erb @@ -15,7 +15,7 @@ <input class="typeahead form-control input-lg" maxlength="255" type="text" placeholder="<%= t('.address') %>" /> </div> <% unless @stop_area.projection.blank? or @stop_area.projection_type_label.empty? %> - <%= form.input :projection_xy, :label => t("projection_xy", :projection => @referential.projection_type_label), :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.projection_xy")} %> + <%= form.input :projection_xy, :label => t("activerecord.attributes.stop_area.projection_xy", :projection => @referential.projection_type_label), :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.projection_xy")} %> <% end %> <%= form.input :coordinates, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.coordinates")} %> <%= form.input :street_name %> @@ -27,7 +27,7 @@ </div> </div> <div class="stop_areas.stop_area.general_info"> - <h3><%= t("stop_area.general") %></h3> + <h3><%= t("stop_areas.stop_area.general") %></h3> <%= form.inputs do %> <%= form.input :objectid, :required => !@stop_area.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.objectid")} %> <%= form.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")} %> diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index ab1fa9dae..c9477e19a 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -18,6 +18,7 @@ data: ## Default: - config/locales/%{locale}.yml ## More files: + - config/locales/*.%{locale}.yml - config/locales/**/*.%{locale}.yml ## Another gem (replace %#= with %=): # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml" diff --git a/config/locales/access_links.en.yml b/config/locales/access_links.en.yml index 048261fc1..a90085588 100644 --- a/config/locales/access_links.en.yml +++ b/config/locales/access_links.en.yml @@ -38,7 +38,7 @@ en: objectid: "Neptune identifier" object_version: "Version" creation_time: "Created on" - creatorid: "Created by " + creator_id: "Created by " formtastic: titles: access_link: diff --git a/config/locales/access_points.en.yml b/config/locales/access_points.en.yml index f304c7621..997d84a34 100644 --- a/config/locales/access_points.en.yml +++ b/config/locales/access_points.en.yml @@ -51,7 +51,7 @@ en: objectid: "Neptune identifier" object_version: "Version" creation_time: "Created on" - creatorid: "Created by" + creator_id: "Created by" coordinates: "Coordinates (lat,lng)" zip_code: "Zip code" city_name: "City" diff --git a/config/locales/companies.en.yml b/config/locales/companies.en.yml index 14f389bf0..760ef91e4 100644 --- a/config/locales/companies.en.yml +++ b/config/locales/companies.en.yml @@ -14,6 +14,7 @@ en: index: title: "Companies" name: "Search by name" + advanced_search: "Advanced search" activerecord: models: company: diff --git a/config/locales/companies.fr.yml b/config/locales/companies.fr.yml index ccb425f1d..b3b437220 100644 --- a/config/locales/companies.fr.yml +++ b/config/locales/companies.fr.yml @@ -14,6 +14,7 @@ fr: index: title: "Transporteurs" name: "Recherche par nom" + advanced_search: "Recherche avancée" activerecord: models: company: diff --git a/config/locales/compliance_check_results.en.yml b/config/locales/compliance_check_results.en.yml index dcc0f4598..7a71f83f0 100644 --- a/config/locales/compliance_check_results.en.yml +++ b/config/locales/compliance_check_results.en.yml @@ -318,6 +318,7 @@ en: 2-NEPTUNE-Timetable-1: "Utilité des calendriers." 2-NEPTUNE-Timetable-2: "Utilité des calendriers." 2-NEPTUNE-Timetable-2: "Validité des dates de début et de fin des périodes des calendriers" + 2-NEPTUNE-Timetable-3: "Validité des dates de début et de fin des périodes des calendriers" 2-NEPTUNE-VehicleJourney-1: "Existence de la séquence d'arrêt <ChouetteRoute> référencée par la course <VehicleJourney>." 2-NEPTUNE-VehicleJourney-2: "Existence de la mission <JourneyPattern> référencée par la course <VehicleJourney>." 2-NEPTUNE-VehicleJourney-3: "Existence de la ligne <Line> référencée par la course <VehicleJourney>." @@ -413,6 +414,8 @@ en: 3-Route-8: "Vérification de l'utilisation des arrêts par les missions" 3-Route-9: "Vérification de l’existence d’une mission passant par tous les arrêts de la séquence" 3-JourneyPattern-1: "Vérification de double définition de missions" + 3-JourneyPattern-2: "Vérification de l’existence d’une mission passant par tous les arrêts de la séquence" + 3-JourneyPattern-3: "Vérification de double définition de missions" 3-VehicleJourney-1: "Vérification de la chronologie des horaires de passage à un arrêt" 3-VehicleJourney-2: "Vérification de la vitesse de transfert entre deux arrêts" 3-VehicleJourney-3: "Vérification de la cohérence des courses successives desservant deux mêmes arrêts" diff --git a/config/locales/compliance_check_results.fr.yml b/config/locales/compliance_check_results.fr.yml index c630e3e83..19f436582 100644 --- a/config/locales/compliance_check_results.fr.yml +++ b/config/locales/compliance_check_results.fr.yml @@ -426,6 +426,7 @@ fr: 4-GroupOfLine-1: "Vérification de contraintes sur les attributs des groupes de lignes" 4-StopArea-1: "Vérification de contraintes sur les attributs des arrêts" 4-StopArea-2: "Vérification de l'existance d'un arrêt commercial pour les arrêts physiques" + 4-StopArea-3: "Vérification de la cohérence entre les noms de communes et leur code INSEE" 4-AccessPoint-1: "Vérification de contraintes sur les attributs des accès" 4-AccessLink-1: "Vérification de contraintes sur les attributs des liens d'accès" 4-ConnectionLink-1: "Vérification de contraintes sur les attributs des correspondances" diff --git a/config/locales/compliance_check_tasks.en.yml b/config/locales/compliance_check_tasks.en.yml index 3b303c1f3..61e56473c 100644 --- a/config/locales/compliance_check_tasks.en.yml +++ b/config/locales/compliance_check_tasks.en.yml @@ -13,4 +13,5 @@ en: name: "Compliance check name" references_type: "Subset" reference_ids: "Subset ids" - object_id_prefix: "Neptune Id prefix"
\ No newline at end of file + object_id_prefix: "Neptune Id prefix" + rule_parameter_set_id: "Jeu de paramètres pour validation"
\ No newline at end of file diff --git a/config/locales/compliance_check_tasks.fr.yml b/config/locales/compliance_check_tasks.fr.yml index 43707574e..d6cc88b1e 100644 --- a/config/locales/compliance_check_tasks.fr.yml +++ b/config/locales/compliance_check_tasks.fr.yml @@ -13,4 +13,5 @@ fr: name: "Nom de la validation" references_type: "Sous ensemble" reference_ids: "Identifiants du sous ensemble" + object_id_prefix: "Préfixe Neptune Id" rule_parameter_set_id: "Jeu de paramètres pour validation" diff --git a/config/locales/compliance_checks.en.yml b/config/locales/compliance_checks.en.yml index 85e146c40..c9bac8bc3 100644 --- a/config/locales/compliance_checks.en.yml +++ b/config/locales/compliance_checks.en.yml @@ -8,6 +8,8 @@ en: show: title: "Neptune Validation" summary: "Rapport de conformité à la norme NEPTUNE" + details: "Details" + parameters: "Tests parameters" completed: "[ Completed ]" failed: "[ Failed ]" pending: "[ In the treatment queue ]" @@ -16,6 +18,7 @@ en: export_csv: "CSV format" report: validation_success: "Validation successfully passed." + action_report: "Action report" actions: destroy_confirm: "Do you confirm to destroy this validation ?" destroy: "Destroy this validation" @@ -33,10 +36,32 @@ en: terminated: "Completed" canceled: "Canceled" aborted: "Failed" + uncheck_count: + zero: "no unappliable" + one: "one unappliable" + other: "%{count} unappliables" + ok_count: + zero: "No successful test" + one: "One successful test" + other: "%{count} successful tests" + warning_count: + zero: "no warning" + one: "one warning" + other: "%{count} warnings" + error_count: + zero: "no error" + one: "one error" + other: "%{count} errors" + fatal_count: + zero: "no fatal error" + one: "one fatal error" + other: "%{count} fatal errors" + import: "Import" + rule_parameter_set: "Rule parameter set" file_validation_log_messages: messages: undefined: "%{key} undefined" - TooMuchDetails: ( %{0} erreurs / warnings supplémentaires ) + TooMuchDetails: ( %{0} errors / suppl. warnings ) ONE: "Catégorie 1 : Syntaxe" severities: uncheck: "Unchecked" @@ -48,12 +73,12 @@ en: rule_parameter_set: "Rule Parameter Set" activemodel: models: - file_validation: + compliance_check: zero: "Validation" one: "Validation" other: "Validation" attributes: - file_validation: + compliance_check: created_at: "Executed at" references_type: "Associated Data Type" reference_ids: "Associated Data" @@ -62,7 +87,7 @@ en: status: "Status" file_name: "Tested data" projection_reference: "Système de projection de référence" - file_validation_log_message: + compliance_check_log_message: created_at: "Date" position: "N." full_message: "Message" diff --git a/config/locales/compliance_checks.fr.yml b/config/locales/compliance_checks.fr.yml index 85255d6f1..14ae7e943 100644 --- a/config/locales/compliance_checks.fr.yml +++ b/config/locales/compliance_checks.fr.yml @@ -62,12 +62,15 @@ fr: messages: undefined: "%{key} non défini" TooMuchDetails: "( %{0} erreurs / warnings supplémentaires )" + ONE: "Catégorie 1 : Syntaxe" severities: uncheck: "Non testé" ok: "Ok" warning: "Alerte" error: "Erreur" fatal: "Fatal" + import: "Import Report" + rule_parameter_set: "Rule Parameter Set" activemodel: models: compliance_check: @@ -83,6 +86,7 @@ fr: resources: "Fichier à valider" status: "Status" file_name: "Jeu de données" + projection_reference: "Système de projection de référence" compliance_check_log_message: created_at: "Date" position: "N." diff --git a/config/locales/connection_links.en.yml b/config/locales/connection_links.en.yml index 914ce0de5..ceb53cf0f 100644 --- a/config/locales/connection_links.en.yml +++ b/config/locales/connection_links.en.yml @@ -19,6 +19,7 @@ en: index: title: "Connection links" name: "Search by name" + advanced_search: "Advanced search" departure: "Start of link" arrival: "End of link" selection: "Selection" diff --git a/config/locales/connection_links.fr.yml b/config/locales/connection_links.fr.yml index 07569a89e..76f1a9b7b 100644 --- a/config/locales/connection_links.fr.yml +++ b/config/locales/connection_links.fr.yml @@ -18,6 +18,7 @@ fr: to: "vers" index: name: "Recherche par nom" + advanced_search: "Recherche avancée" title: "Correspondances" departure: "Arrêt de départ" arrival: "Arrêt d'arrivée" diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 25a5bbeba..af6feed2c 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -35,6 +35,9 @@ validating conformance of data wrt Neptune (French standard NFP 99 506)." new_password: New password new_password_confirmation: New password confirmation commit: Update password + unlock: + new: + title: "Resend unlock instructions" links: sign_in: "Sign in" sign_up: "Sign up" diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml index b909eeaef..81371ba4c 100644 --- a/config/locales/devise.fr.yml +++ b/config/locales/devise.fr.yml @@ -36,6 +36,9 @@ norme Neptune (NFP 99 506)" new_password: Nouveau mot de passe new_password_confirmation: Confirmation du nouveau mot de passe commit: Changer de mot de passe + unlock: + new: + title: "Renvoyer les instructions de déblocage du compte" links: sign_in: "Se connecter" sign_up: "S'inscrire" diff --git a/config/locales/group_of_lines.en.yml b/config/locales/group_of_lines.en.yml index 00c1e1373..757ed51cf 100644 --- a/config/locales/group_of_lines.en.yml +++ b/config/locales/group_of_lines.en.yml @@ -15,6 +15,7 @@ en: index: title: "Group of Lines" name: "Search by name" + advanced_search: 'Advanced search' form: lines: "Associated lines" activerecord: diff --git a/config/locales/group_of_lines.fr.yml b/config/locales/group_of_lines.fr.yml index 653862fd4..b9b7b8bd2 100644 --- a/config/locales/group_of_lines.fr.yml +++ b/config/locales/group_of_lines.fr.yml @@ -15,6 +15,7 @@ fr: index: title: "Groupes de lignes" name: "Recherche par nom" + advanced_search: 'Recherche avancée' form: lines: "Lignes associées" activerecord: diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml index 379d184b6..856dd6d15 100644 --- a/config/locales/journey_patterns.en.yml +++ b/config/locales/journey_patterns.en.yml @@ -10,6 +10,7 @@ en: edit: "Edit this journey pattern" destroy: "Remove this journey pattern" destroy_confirm: A"re you sure you want destroy this journey pattern ?" + edit_route_sections: "Update route sections" new: title: "Add a new journey pattern" edit: diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml index bdf220ab0..78860514a 100644 --- a/config/locales/journey_patterns.fr.yml +++ b/config/locales/journey_patterns.fr.yml @@ -10,6 +10,7 @@ fr: edit: "Modifier cette mission" destroy: "Supprimer cette mission" destroy_confirm: "Etes vous sûr de vouloir détruire cette mission ?" + edit_route_sections: "Modifier les sections de parcours" new: title: "Ajouter une mission" edit: diff --git a/config/locales/journey_patterns.yml b/config/locales/journey_patterns.yml deleted file mode 100644 index 3e2ddec99..000000000 --- a/config/locales/journey_patterns.yml +++ /dev/null @@ -1,137 +0,0 @@ -en: - journey_patterns: - journey_pattern: - from_to: "From '%{departure}' to '%{arrival}'" - stop_count: "%{count}/%{route_count} stops" - vehicle_journeys_count: "Vehicle journeys: %{count}" - vehicle_journey_at_stops: "Vehicle journey at stops" - actions: - new: "Add a new journey_pattern" - edit: "Edit this journey pattern" - destroy: "Remove this journey pattern" - destroy_confirm: "Are you sure you want destroy this journey pattern ?" - edit_route_sections: "Edit Shape" - new: - title: "Add a new journey pattern" - edit: - title: "Update journey pattern %{journey_pattern}" - show: - title: "Journey Pattern %{journey_pattern}" - stop_points: "Stop point on journey pattern list" - index: - title: "Journey Patterns" - form: - warning: "Be careful, selection is also applied to the %{count} vehicle journeys associated to this journey pattern" - activerecord: - models: - journey_pattern: - zero: "journey pattern" - one: "journey pattern" - other: "journey patterns" - attributes: - journey_pattern: - route: "Route" - name: "Name" - published_name: "Published name" - comment: "Comments" - registration_number: "Registration number" - stop_point_ids: "Route's stop selection" - objectid: "Neptune identifier" - object_version: "Version" - creation_time: "Created on" - creator_id: "Created by" - formtastic: - titles: - journey_pattern: - name: "Only alphanumerical or underscore characters." - registration_number: "Positif integer." - objectid: "[prefix]:JourneyPattern:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character" - neptune: - journey_pattern: - name: "Only alphanumerical or underscore characters." - registration_number: "Positif integer." - objectid: "[prefix]:JourneyPattern:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character" - netex: - journey_pattern: - name: "Only alphanumerical or underscore characters." - registration_number: "Positif integer." - objectid: "[prefix]:JourneyPattern:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character" - gtfs: - journey_pattern: - name: "Only alphanumerical or underscore characters." - registration_number: "Positif integer." - objectid: "[prefix]:JourneyPattern:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character" - hub: - journey_pattern: - name: "Only alphanumerical or underscore characters. Maximum length = 75." - registration_number: "Positif integer, unique key, of no more than 8 digits." - objectid: "[prefix]:JourneyPattern:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 30." - -fr: - journey_patterns: - journey_pattern: - from_to: "De '%{departure}' à '%{arrival}'" - stop_count: "%{count}/%{route_count} arrêts" - vehicle_journeys_count: "Courses: %{count}" - vehicle_journey_at_stops: "Horaires des courses" - actions: - new: "Ajouter une mission" - edit: "Modifier cette mission" - destroy: "Supprimer cette mission" - destroy_confirm: "Etes vous sûr de vouloir détruire cette mission ?" - edit_route_sections: "Modifier le tracé" - new: - title: "Ajouter une mission" - edit: - title: "Modifier la mission %{journey_pattern}" - show: - title: "Mission %{journey_pattern}" - stop_points: "Liste des arrêts de la mission" - index: - title: "Missions" - form: - warning: "Attention, la sélection s'applique aussi aux %{count} courses de la mission" - activerecord: - models: - journey_pattern: - zero: "mission" - one: "mission" - other: "missions" - attributes: - journey_pattern: - route: "Séquence d'arrêts" - name: "Nom" - published_name: "Nom public" - comment: "Commentaire" - registration_number: "Numéro d'enregistrement" - stop_point_ids: "Sélection des arrêts desservis" - objectid: "Identifiant Neptune" - object_version: "Version" - creation_time: "Créé le" - creator_id: "Créé par" - formtastic: - titles: - journey_pattern: - name: "Caractères autorisés : alphanumériques et 'souligné'." - registration_number: "Entier positif." - objectid: "[prefixe]:JourneyPattern:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'" - neptune: - journey_pattern: - name: "Caractères autorisés : alphanumériques et 'souligné'." - registration_number: "Entier positif." - objectid: "[prefixe]:JourneyPattern:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'" - netex: - journey_pattern: - name: "Caractères autorisés : alphanumériques et 'souligné'." - registration_number: "Entier positif." - objectid: "[prefixe]:JourneyPattern:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'" - gtfs: - journey_pattern: - name: "Caractères autorisés : alphanumériques et 'souligné'." - registration_number: "Entier positif." - objectid: "[prefixe]:JourneyPattern:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'" - hub: - journey_pattern: - name: "Caractères autorisés : alphanumériques et 'souligné'. Longueur maximale = 75." - registration_number: "Entier positif, clé unique, d'un maximum de 8 chiffres." - objectid: "[prefixe]:JourneyPattern:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 30." diff --git a/config/locales/layouts.en.yml b/config/locales/layouts.en.yml index aa9985a53..debff05e5 100644 --- a/config/locales/layouts.en.yml +++ b/config/locales/layouts.en.yml @@ -39,3 +39,15 @@ en: mail: "Contact us" newsletter: "Newsletter" forum: "Forum" + true: "yes" + false: "no" + or: "or" + back: "Back" + today: "Today" + yesterday: "Yestersday" + edit_periods: "Edit periods" + delete_periods: "Delete periods" + attributes: + author: "Edited by" + created_at: "Created at" + updated_at: "Updated at"
\ No newline at end of file diff --git a/config/locales/lines_en.yml b/config/locales/lines.en.yml index 21994bc23..d03b5eadc 100644 --- a/config/locales/lines_en.yml +++ b/config/locales/lines.en.yml @@ -8,9 +8,9 @@ en: destroy_selection_confirm: "Are you sure you want destroy those lines?" import: "Import lines" export_kml: "Export KML line" - export__kml_all: "Export KML lines" + export_kml_all: "Export KML lines" export_hub: "Export HUB line" - export__hub_all: "Export HUB lines" + export_hub_all: "Export HUB lines" new: title: "Add a new line" edit: diff --git a/config/locales/lines_fr.yml b/config/locales/lines.fr.yml index 5729800c7..4b871d4ad 100644 --- a/config/locales/lines_fr.yml +++ b/config/locales/lines.fr.yml @@ -20,8 +20,8 @@ fr: itineraries: "Liste des séquences d'arrêts de la ligne" group_of_lines: "Groupes de lignes" index: - name_or_number: "Recherche par nom ou indice" title: "Lignes" + name_or_number: "Recherche par nom ou indice" no_networks: "Aucun réseaux" no_companies: "Aucun transporteurs" no_group_of_lines: "Aucun groupes de ligne" diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml index ccb4dd791..0a5555b43 100644 --- a/config/locales/networks.en.yml +++ b/config/locales/networks.en.yml @@ -14,6 +14,7 @@ en: index: title: "Networks" name: "Search by name" + advanced_search: "Advanced search" activerecord: models: network: diff --git a/config/locales/networks.fr.yml b/config/locales/networks.fr.yml index d8572326e..1abd6e1c0 100644 --- a/config/locales/networks.fr.yml +++ b/config/locales/networks.fr.yml @@ -14,6 +14,7 @@ fr: index: title: "Réseaux" name: "Recherche par nom" + advanced_search: "Recherche avancée" activerecord: models: network: diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml index 4064db841..74342e9e0 100644 --- a/config/locales/referentials.en.yml +++ b/config/locales/referentials.en.yml @@ -57,6 +57,7 @@ en: access_points: "Access Points" time_tables: "Time tables" connection_links: "Connection links" + route_sections: "Route sections" quays: "quays" boarding_positions: "boarding positions" commercial_stops: "commercial stops" diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml index 140c5b296..a556916bf 100644 --- a/config/locales/stop_areas.en.yml +++ b/config/locales/stop_areas.en.yml @@ -66,9 +66,9 @@ en: title: "Manage parent of stop area %{stop_area}" add_children: title: "Manage children of stop area %{stop_area}" - add_lines: + add_routing_lines: title: "Manage lines of routing constraint %{stop_area}" - add_stops: + add_routing_stops: title: "Manage stop areas of routing constraint %{stop_area}" activerecord: models: @@ -80,6 +80,7 @@ en: stop_area: name: "Name" registration_number: "Registration number" + published_name: "Published name" comment: "Comments" stop_area_type: "Area type" nearest_topic_name: "Nearest point of interest" @@ -101,7 +102,7 @@ en: objectid: "Neptune identifier" object_version: "Version" creation_time: "Created on" - creatorid: "Created by" + creator_id: "Created by" children_ids: "Children" routing_stop_ids: "Attached stops" routing_line_ids: "Attached lines" diff --git a/config/locales/subscriptions.en.yml b/config/locales/subscriptions.en.yml index 95f7bd160..56a3eddeb 100644 --- a/config/locales/subscriptions.en.yml +++ b/config/locales/subscriptions.en.yml @@ -7,6 +7,8 @@ en: actions: new: "Create an account" activemodel: + models: + subscription: "account" attributes: subscription: organisation_name: "Organisation" diff --git a/config/locales/time_tables.en.yml b/config/locales/time_tables.en.yml index b25439a1b..72a934421 100644 --- a/config/locales/time_tables.en.yml +++ b/config/locales/time_tables.en.yml @@ -41,12 +41,17 @@ en: overlap_date: "Overlap date" selected_date: "Date directly included" selected_period: "Date included in period" + properties_show: + resume: "From %{start_date} to %{end_date}" + resume_empty: "Empty timetable" index: - title: "Timetables" comment: "Search by name" tag_search: "Tags : hollidays,public holliday" - from: "From : " - to: " to : " + from: "From: " + to: " to: " + start_date: "mm/jj/aaaa" + end_date: "mm/jj/aaaa" + title: "timetables" selection: "Selection" selection_all: "All" advanced_search: "Advanced Search" @@ -74,6 +79,7 @@ en: creation_time: "Created on" creator_id: "Created by " calendars: "Calendar view" + calendar_details: "Calendar details" dates: "Peculiar dates" date: "On" excluded_dates: "Excluded dates" @@ -81,6 +87,7 @@ en: period_start: "From" period_end: "to" tag_search: "Tags" + tag_list: "Tags" formtastic: titles: time_table: diff --git a/config/locales/time_tables.fr.yml b/config/locales/time_tables.fr.yml index b1c9998dc..d2d693c93 100644 --- a/config/locales/time_tables.fr.yml +++ b/config/locales/time_tables.fr.yml @@ -41,6 +41,9 @@ fr: overlap_date: "Date en doublon" selected_date: "Date incluse directement" selected_period: "Date incluse par période" + properties_show: + resume: "Validité comprise du %{start_date} au %{end_date}" + resume_empty: "Calendrier vide" index: comment: "Recherche par nom" tag_search: "Tags : vacances,jour fériés" diff --git a/config/locales/validation_reports.en.yml b/config/locales/validation_reports.en.yml index 5dd8d23ef..3eb4f1b2c 100644 --- a/config/locales/validation_reports.en.yml +++ b/config/locales/validation_reports.en.yml @@ -302,6 +302,8 @@ en: 3-Route-8: "Vérification de l'utilisation des arrêts par les missions" 3-Route-9: "Vérification de l’existence d’une mission passant par tous les arrêts de la séquence" 3-JourneyPattern-1: "Vérification de double définition de missions" + 3-JourneyPattern-2: "Vérification de l’existence d’une mission passant par tous les arrêts de la séquence" + 3-JourneyPattern-3: "Vérification de double définition de missions" 3-VehicleJourney-1: "Vérification de la chronologie des horaires de passage à un arrêt" 3-VehicleJourney-2: "Vérification de la vitesse de transfert entre deux arrêts" 3-VehicleJourney-3: "Vérification de la cohérence des courses successives desservant deux mêmes arrêts" diff --git a/config/locales/validation_reports.fr.yml b/config/locales/validation_reports.fr.yml index 8b1757c3a..5929f7144 100644 --- a/config/locales/validation_reports.fr.yml +++ b/config/locales/validation_reports.fr.yml @@ -315,6 +315,7 @@ fr: 4-GroupOfLine-1: "Vérification de contraintes sur les attributs des groupes de lignes" 4-StopArea-1: "Vérification de contraintes sur les attributs des arrêts" 4-StopArea-2: "Vérification de l'existance d'un arrêt commercial pour les arrêts physiques" + 4-StopArea-3: "Vérification de la cohérence entre les noms de communes et leur code INSEE" 4-AccessPoint-1: "Vérification de contraintes sur les attributs des accès" 4-AccessLink-1: "Vérification de contraintes sur les attributs des liens d'accès" 4-ConnectionLink-1: "Vérification de contraintes sur les attributs des correspondances" diff --git a/config/locales/validation_tasks.en.yml b/config/locales/validation_tasks.en.yml index 9c3e6d719..1b142e992 100644 --- a/config/locales/validation_tasks.en.yml +++ b/config/locales/validation_tasks.en.yml @@ -39,6 +39,20 @@ en: access_points_stats: "Access Points" vehicle_journeys_stats: "Vehicle Journeys" journey_patterns_stats: "Journey Patterns" + table: + line: + name: "Name" + save: "Save" + routes: "Routes" + connection_links: "Connection links" + time_tables: "Time tables" + stop_areas: "Stop areas" + access_points: "Access points" + vehicle_journeys: "Vehicle journeys" + journey_patterns: "Journey patterns" + not_saved: "Not saved" + saved: "Saved" + save_error: "Save error" statuses: created: "Pending ..." scheduled: "Processing ..." diff --git a/config/locales/validations.en.yml b/config/locales/validations.en.yml index 939056d39..5bac62ff3 100644 --- a/config/locales/validations.en.yml +++ b/config/locales/validations.en.yml @@ -18,6 +18,8 @@ en: validated_file: "Validated file" title: "Neptune Validation" summary: "Rapport de conformité à la norme NEPTUNE" + details: "Details" + parameters: "Tests parameters" completed: "[ Completed ]" failed: "[ Failed ]" pending: "[ In the treatment queue ]" @@ -42,6 +44,20 @@ en: access_points_stats: "Access Points" vehicle_journeys_stats: "Vehicle Journeys" journey_patterns_stats: "Journey Patterns" + table: + line: + name: "Name" + save: "Save" + routes: "Routes" + connection_links: "Connection links" + time_tables: "Time tables" + stop_areas: "Stop areas" + access_points: "Acces points" + vehicle_journeys: "Vehicle journeys" + journey_patterns: "Journey patterns" + not_saved: "Not saved" + saved: "Saved" + save_error: "Save error" statuses: created: "Pending ..." scheduled: "Processing ..." diff --git a/config/locales/vehicle_journeys.en.yml b/config/locales/vehicle_journeys.en.yml index 4f5f763b4..0687c32aa 100644 --- a/config/locales/vehicle_journeys.en.yml +++ b/config/locales/vehicle_journeys.en.yml @@ -96,7 +96,7 @@ en: published_journey_name: "Published Name" published_journey_identifier: "Published Identifier" facility: "Facility" - vehicletypeidentifier: "Vehicle Type Identifier" + vehicle_type_identifier: "Vehicle Type Identifier" time_table_ids: "Calendar list" vehicle_journey_at_stop_ids: "Time list" journey_frequency_ids: "Timeband" |