diff options
| author | Zog | 2018-02-05 11:26:54 +0100 |
|---|---|---|
| committer | cedricnjanga | 2018-04-10 20:52:21 -0700 |
| commit | 9f374650488fdbfd86fbbdc66cfebda4e9f5a551 (patch) | |
| tree | 3dfaf0d4b642f388e78c0c3f9f31969a6287c241 | |
| parent | 38f89197a5f09d7c29c483850793e6b52cead20e (diff) | |
| download | chouette-core-9f374650488fdbfd86fbbdc66cfebda4e9f5a551.tar.bz2 | |
Refs 5846; Fix wrong translation
And a very small css fix
| -rw-r--r-- | app/assets/stylesheets/components/_referential_overview.sass | 1 | ||||
| -rw-r--r-- | app/views/lines/show.html.slim | 2 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/components/_referential_overview.sass b/app/assets/stylesheets/components/_referential_overview.sass index 7a0cc98c5..cf440b22c 100644 --- a/app/assets/stylesheets/components/_referential_overview.sass +++ b/app/assets/stylesheets/components/_referential_overview.sass @@ -24,6 +24,7 @@ .time-travel padding-top: 3px padding-bottom: 4px + height: 43px a.btn:first-child margin-right: 1px a.btn:last-child diff --git a/app/views/lines/show.html.slim b/app/views/lines/show.html.slim index 96bb5bb0d..9e1ae6d6f 100644 --- a/app/views/lines/show.html.slim +++ b/app/views/lines/show.html.slim @@ -6,7 +6,7 @@ .row .col-lg-6.col-md-6.col-sm-12.col-xs-12 = definition_list t('metadatas'), - { t('id_codif') => @line.get_objectid.short_id, + { t('objectid') => @line.get_objectid.short_id, @line.human_attribute_name(:deactivated) => (@line.deactivated? ? t('false') : t('true')), @line.human_attribute_name(:network_id) => (@line.network.nil? ? t('lines.index.unset') : @line.network.name), @line.human_attribute_name(:company_id) => (@line.company.nil? ? t('lines.index.unset') : @line.company.name), diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 058238710..6f4a2e9bf 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -40,7 +40,7 @@ fr: deactivated: "Ligne désactivée" title: "Lignes" line: "Ligne %{line}" - name_or_number_or_objectid: "Recherche par nom, nom court ou ID Codif..." + name_or_number_or_objectid: "Recherche par nom, nom court ou ID..." no_networks: "Aucun réseaux" no_companies: "Aucun transporteurs" no_group_of_lines: "Aucun groupes de ligne" |