diff options
| -rw-r--r-- | app/helpers/history_helper.rb | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 4 | ||||
| -rw-r--r-- | config/locales/fr.yml | 4 | ||||
| -rw-r--r-- | config/locales/layouts.yml | 13 |
4 files changed, 10 insertions, 15 deletions
diff --git a/app/helpers/history_helper.rb b/app/helpers/history_helper.rb index 6557257e9..3ad38a11e 100644 --- a/app/helpers/history_helper.rb +++ b/app/helpers/history_helper.rb @@ -32,8 +32,7 @@ module HistoryHelper def history_tag(object) field_set_tag t("layouts.history_tag.title"), class: "history_tag" do content_tag :ul do - [:created_at, :updated_at, :user_name, :name, :organisation_name, - :referential_name, :no_save, :clean_repository].each do |field| + [:created_at, :updated_at, :user_name, :no_save].each do |field| concat history_tag_li(object, field) end end @@ -47,6 +46,7 @@ module HistoryHelper key = t("layouts.history_tag.#{field}") value = object.public_send(field) value = l(value, format: :short) if value.is_a?(Time) + value = t(value.to_s) if value.in?([true, false]) content_tag(:li, "#{key} : #{value}") end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 54c288773..4ebdcc94c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,5 +1,7 @@ en: + "true": "Yes" + "false": "No" time: formats: hour: "%Hh%M" - minute: "%M min"
\ No newline at end of file + minute: "%M min" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 8ccfaacbf..6522fa211 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,5 +1,7 @@ fr: + "true": "Oui" + "false": "Non" time: formats: hour: "%Hh%M" - minute: "%M min"
\ No newline at end of file + minute: "%M min" diff --git a/config/locales/layouts.yml b/config/locales/layouts.yml index 7435f93c4..361f2322f 100644 --- a/config/locales/layouts.yml +++ b/config/locales/layouts.yml @@ -17,11 +17,7 @@ en: created_at: "Created at" updated_at: "Updated at" user_name: "User" - name: "Name" - organisation_name: "Organisation name" - referential_name: "Referential name" - clean_repository: "Clean Repository" - no_save: "No save" + no_save: "No backup" flash_messages: success: "Success" error: "Error" @@ -62,11 +58,7 @@ fr: created_at: "Créé le" updated_at: "Mise à jour le" user_name: "Auteur" - name: "Name" - organisation_name: "Organisation name" - referential_name: "Referential name" - clean_repository: "Clean Repository" - no_save: "No save" + no_save: "Pas de sauvergarde" flash_messages: success: "Succès" error: "Erreur" @@ -100,4 +92,3 @@ fr: author: "Modifié par" created_at: "Créé le" updated_at: "Modifié le" - |