diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/simple_form_bootstrap.rb | 11 | ||||
| -rw-r--r-- | config/locales/compliance_check_sets.en.yml | 9 | ||||
| -rw-r--r-- | config/locales/compliance_check_sets.fr.yml | 9 | ||||
| -rw-r--r-- | config/locales/enumerize.en.yml | 12 | ||||
| -rw-r--r-- | config/locales/enumerize.fr.yml | 11 | ||||
| -rw-r--r-- | config/locales/lines.en.yml | 4 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 4 | ||||
| -rw-r--r-- | config/locales/source_types.en.yml | 13 | ||||
| -rw-r--r-- | config/locales/source_types.fr.yml | 13 | 
9 files changed, 56 insertions, 30 deletions
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb index d90ea6398..4b9bd320d 100644 --- a/config/initializers/simple_form_bootstrap.rb +++ b/config/initializers/simple_form_bootstrap.rb @@ -132,6 +132,17 @@ SimpleForm.setup do |config|        ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block small' }      end    end + +  config.wrappers :multi_select_inline, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| +    b.use :html5 +    b.optional :readonly +    b.use :label, class: 'control-label' +    b.wrapper tag: 'div', class: 'form-inline col-sm-8 col-xs-7' do |ba| +      ba.use :input, class: 'form-control' +      ba.use :error, wrap_with: {tag: 'span', class: 'help-block small'} +      ba.use :hint, wrap_with: {tag: 'p', class: 'help-block small'} +    end +  end    # Wrappers for forms and inputs using the Bootstrap toolkit.    # Check the Bootstrap docs (http://getbootstrap.com)    # to learn about the different styles for forms and inputs, diff --git a/config/locales/compliance_check_sets.en.yml b/config/locales/compliance_check_sets.en.yml index 5aa6f9740..e6bec2b55 100644 --- a/config/locales/compliance_check_sets.en.yml +++ b/config/locales/compliance_check_sets.en.yml @@ -17,6 +17,10 @@ en:      search_no_results: No control reports match your search      executed:        title: Executed control report %{name} +    show: +      table_state: "%{lines_status} lines imported on %{lines_in_compliance_check_set} in the archive" +      table_explanation: "These controls apply to all imported data and condition the construction of your organization's offer." +      metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a"    activerecord:      attributes:        compliance_check_set: @@ -26,6 +30,11 @@ en:          assigned_to: Assigned to          compliance_control_set: Compliance control set          name: Name +      compliance_check_resources: +        name: Name of the line +        status: Status +        metrics: Test results +        download: Download      models:        compliance_check_block:          one: compliance_control_set diff --git a/config/locales/compliance_check_sets.fr.yml b/config/locales/compliance_check_sets.fr.yml index 8ad5af904..b526261a9 100644 --- a/config/locales/compliance_check_sets.fr.yml +++ b/config/locales/compliance_check_sets.fr.yml @@ -13,6 +13,10 @@ fr:      search_no_results: Aucun rapport de contrôle ne correspond à votre recherche      executed:        title: Jeu de contrôles exécutés %{name} +    show: +      table_state: "%{lines_status} lignes importées sur %{lines_in_compliance_check_set} présentes dans l'archive" +      table_explanation: Ces contrôles s’appliquent pour toutes les données importées et conditionnent la construction de l’offre de votre organisation +      metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a"    activerecord:      attributes:        compliance_check_set: @@ -22,6 +26,11 @@ fr:          assigned_to: Affectation          compliance_control_set: jeu de contrôle          name: Nom +      compliance_check_resource: +        name: Nom de la ligne +        status: État +        metrics: Résultat des tests +        download: Télécharger      models:        compliance_check_block:          zero:  "Groupe de contrôle" diff --git a/config/locales/enumerize.en.yml b/config/locales/enumerize.en.yml index f5e51171b..bfd7b8c22 100644 --- a/config/locales/enumerize.en.yml +++ b/config/locales/enumerize.en.yml @@ -244,3 +244,15 @@ en:        streetCableCar: 'Street cable car'        allFunicularServices: 'All funicular services'        undefinedFunicular: 'Undefined funicular' +    source_type_name: +      name: "Source types" +      public_and_private_utilities: "Public and private utilities" +      road_authorities: "Road authorities" +      transit_operator: "Transit operator" +      public_transport: "Public transport" +      passenger_transport_coordinating_authority: "Passenger transport coordinating authority" +      travel_information_service_provider: "Travel information service provider" +      travel_agency: "Travel_agency" +      individual_subject_of_travel_itinerary: "Individual subject of travel itinerary" +      other_information: "Other information" + diff --git a/config/locales/enumerize.fr.yml b/config/locales/enumerize.fr.yml index a5845971b..b2eab665d 100644 --- a/config/locales/enumerize.fr.yml +++ b/config/locales/enumerize.fr.yml @@ -242,3 +242,14 @@ fr:        streetCableCar: 'Tramway (2)'        allFunicularServices: 'Tous services de funiculaire'        undefinedFunicular: 'Funiculaire non défini' +    source_type_name: +      name: "Type de source" +      public_and_private_utilities: "Service public ou privé" +      road_authorities: "Autorité routière" +      transit_operator: "Exploitant de transport public" +      public_transport: "Transport public" +      passenger_transport_coordinating_authority: "Autorité organisatrice de transport public" +      travel_information_service_provider: "Opérateur de voyage (voyagiste/tour operator ...)" +      travel_agency: "Agence de voyage" +      individual_subject_of_travel_itinerary: "Voyageur individuel" +      other_information: "Autre source d'information" diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index cbca6baab..a69c3b0ba 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -62,10 +62,10 @@ en:      attributes:        line:          id: "ID" -        network: "Network" +        network_id: "Network"          networks:            name: "Network" -        company: "Company" +        company_id: "Company"          companies:            name: "Company"          registration_number: "Registration number" diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index fa23f8369..160cc4ab4 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -63,10 +63,10 @@ fr:      attributes:        line:          id: "ID" -        network: "Réseau" +        network_id: "Réseau"          networks:            name: "Réseau" -        company: "Transporteur principal" +        company_id: "Transporteur principal"          companies:            name: "Transporteur principal"          registration_number: "Nom court" diff --git a/config/locales/source_types.en.yml b/config/locales/source_types.en.yml deleted file mode 100644 index 1cea5ed2c..000000000 --- a/config/locales/source_types.en.yml +++ /dev/null @@ -1,13 +0,0 @@ -en: -  source_types: -    name: "Source type" -    label: -      public_and_private_utilities: "public and private utilities" -      road_authorities: "road authorities" -      transit_operator: "transit operator" -      public_transport: "public transport" -      passenger_transport_coordinating_authority: "passenger transport coordinating authority" -      travel_information_service_provider: "travel information service provider" -      travel_agency: "travel_agency" -      individual_subject_of_travel_itinerary: "individual subject of travel itinerary" -      other_information: "other information" diff --git a/config/locales/source_types.fr.yml b/config/locales/source_types.fr.yml deleted file mode 100644 index 6979a14b7..000000000 --- a/config/locales/source_types.fr.yml +++ /dev/null @@ -1,13 +0,0 @@ -fr: -  source_types: -    name: "Type de source" -    label: -      public_and_private_utilities: "Service public ou privé" -      road_authorities: "Autorité routière" -      transit_operator: "Exploitant de transport public" -      public_transport: "Transport public" -      passenger_transport_coordinating_authority: "Autorité organisatrice de transport public" -      travel_information_service_provider: "Opérateur de voyage (voyagiste/tour operator ...)" -      travel_agency: "Agence de voyage" -      individual_subject_of_travel_itinerary: "Voyageur individuel" -      other_information: "Autre source d'information"  | 
