diff options
| -rw-r--r-- | app/views/companies/index.html.slim | 2 | ||||
| -rw-r--r-- | app/views/lines/index.html.slim | 2 | ||||
| -rw-r--r-- | app/views/networks/index.html.slim | 2 | ||||
| -rw-r--r-- | app/views/stop_areas/index.html.slim | 2 | ||||
| -rw-r--r-- | config/locales/companies.en.yml | 3 | ||||
| -rw-r--r-- | config/locales/companies.fr.yml | 3 | ||||
| -rw-r--r-- | config/locales/lines.en.yml | 3 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 3 | ||||
| -rw-r--r-- | config/locales/networks.en.yml | 3 | ||||
| -rw-r--r-- | config/locales/networks.fr.yml | 3 | ||||
| -rw-r--r-- | config/locales/stop_areas.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/stop_areas.fr.yml | 1 |
12 files changed, 18 insertions, 10 deletions
diff --git a/app/views/companies/index.html.slim b/app/views/companies/index.html.slim index 0c69079f8..5a82855b4 100644 --- a/app/views/companies/index.html.slim +++ b/app/views/companies/index.html.slim @@ -5,7 +5,7 @@ .panel.panel-default .panel-heading .input-group.col-md-12 - = f.text_field :name_cont, placeholder: t('.name'), class: 'form-control' + = f.text_field :name_or_objectid_cont, placeholder: t('.name_or_objectid'), class: 'form-control' .input-group-btn button.btn.btn-default type="submit" i.fa.fa-search diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim index 36a75fb98..0929b3c96 100644 --- a/app/views/lines/index.html.slim +++ b/app/views/lines/index.html.slim @@ -4,7 +4,7 @@ .panel.panel-default .panel-heading .input-group.col-md-9 - = f.text_field :name_or_number_cont, placeholder: "#{t('.name_or_number')}", class: 'form-control' + = f.text_field :name_or_number_or_objectid_cont, placeholder: t('.name_or_number_or_objectid'), class: 'form-control' .input-group-btn button.btn.btn-default type="submit" i.fa.fa-search diff --git a/app/views/networks/index.html.slim b/app/views/networks/index.html.slim index 587552729..a35fa3d1a 100644 --- a/app/views/networks/index.html.slim +++ b/app/views/networks/index.html.slim @@ -4,7 +4,7 @@ .panel.panel-default .panel-heading .input-group.col-md-12 - = f.text_field :name_cont, placeholder: "#{t('.name')}", class: 'form-control' + = f.text_field :name_or_objectid_cont, placeholder: t('.name_or_objectid'), class: 'form-control' .input-group-btn button.btn.btn-default type="submit" i.fa.fa-search diff --git a/app/views/stop_areas/index.html.slim b/app/views/stop_areas/index.html.slim index b6328c6f9..79d29c010 100644 --- a/app/views/stop_areas/index.html.slim +++ b/app/views/stop_areas/index.html.slim @@ -7,7 +7,7 @@ .panel.panel-default .panel-heading .input-group.col-md-9 - = f.text_field :name_cont, placeholder: "#{t('.name')}", class: 'form-control' + = f.text_field :name_or_objectid_cont, placeholder: t('.name_or_objectid'), class: 'form-control' .input-group-btn button.btn.btn-default type="submit" diff --git a/config/locales/companies.en.yml b/config/locales/companies.en.yml index 7393a2af7..74b622c47 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" + name_or_objectid: "Search by name or by objectid" advanced_search: "Advanced search" activerecord: models: @@ -65,4 +66,4 @@ en: registration_number: "Positif integer, unique key, of no more than 8 digits." objectid: "[prefix]:Company:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 3." referential_companies: - <<: *en_companies
\ No newline at end of file + <<: *en_companies diff --git a/config/locales/companies.fr.yml b/config/locales/companies.fr.yml index 909ee1045..a5f5b4c02 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" + name_or_objectid: "Recherche par nom ou objectid" advanced_search: "Recherche avancée" activerecord: models: @@ -65,4 +66,4 @@ fr: registration_number: "Entier positif, clé unique, d'un maximum de 8 chiffres." objectid: "[prefixe]:Company:[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 = 3." referential_companies: - <<: *fr_companies
\ No newline at end of file + <<: *fr_companies diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index 596c93dac..81e84518f 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -23,6 +23,7 @@ en: deactivated: "Disabled line" title: "Lines" name_or_number: "Search by name or number" + name_or_number_or_objectid: "Search by name, number or objectid" no_networks: "No networks" no_companies: "No companies" no_group_of_lines: "No group of lines" @@ -117,4 +118,4 @@ en: objectid: "[prefix]:Line:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 14." number: "Only alphanumerical or underscore characters. Maximum length = 6." referential_lines: - <<: *en_lines
\ No newline at end of file + <<: *en_lines diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 2b325e220..c383a1c4f 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -23,6 +23,7 @@ fr: deactivated: "Ligne désactivée" title: "Lignes" name_or_number: "Recherche par nom ou indice" + name_or_number_or_objectid: "Recherche par nom, indice ou objectid" no_networks: "Aucun réseaux" no_companies: "Aucun transporteurs" no_group_of_lines: "Aucun groupes de ligne" @@ -117,4 +118,4 @@ fr: objectid: "[prefixe]:Line:[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 = 14." number: "Caractères autorisés : alphanumériques et 'souligné'. Longueur maximale = 6." referential_lines: - <<: *fr_lines
\ No newline at end of file + <<: *fr_lines diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml index 69b45050e..49ae3e16d 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" + name_or_objectid: "Search by name or by objectid" advanced_search: "Advanced search" activerecord: models: @@ -62,4 +63,4 @@ en: registration_number: "Positif integer, unique key, of no more than 8 digits." objectid: "[prefix]:PTNetwork:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 3." referential_networks: - <<: *en_networks
\ No newline at end of file + <<: *en_networks diff --git a/config/locales/networks.fr.yml b/config/locales/networks.fr.yml index c31982b43..4640d03e5 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" + name_or_objectid: "Recherche par nom ou objectid" advanced_search: "Recherche avancée" activerecord: models: @@ -62,4 +63,4 @@ fr: registration_number: "Entier positif, clé unique, d'un maximum de 8 chiffres." objectid: "[prefixe]:PTNetwork:[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 = 3." referential_networks: - <<: *fr_networks
\ No newline at end of file + <<: *fr_networks diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml index 4197daaa2..415cd404e 100644 --- a/config/locales/stop_areas.en.yml +++ b/config/locales/stop_areas.en.yml @@ -51,6 +51,7 @@ en: index: title: "Stop areas" name: "Search by name" + name_or_objectid: "Search by name or by objectid" zip_code: "Zip Code" selection: "Filter on" selection_all: "All" diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml index b552a3483..87bec9eeb 100644 --- a/config/locales/stop_areas.fr.yml +++ b/config/locales/stop_areas.fr.yml @@ -56,6 +56,7 @@ fr: access_link_legend_2: "cliquer sur les flêches pour créer/éditer un lien" index: name: "Recherche par nom" + name_or_objectid: "Recherche par nom ou par objectid" zip_code: "Code Postal" title: "Arrêts" selection: "Filtrer sur" |
