aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcedricnjanga2017-11-06 15:03:35 +0100
committercedricnjanga2017-11-06 15:03:35 +0100
commit8bf117ced2e8fda3d2137cbdb964d3dba8b1bfbf (patch)
treed02602210f6d9c3d003ffa839e1787f905bf0af5
parent3c156ca69dbf7de93b5e011eda39a28f626ce7c1 (diff)
downloadchouette-core-8bf117ced2e8fda3d2137cbdb964d3dba8b1bfbf.tar.bz2
Refs #4919 Fix translations on ComplianceControl#show
-rw-r--r--app/views/compliance_controls/show.html.slim11
-rw-r--r--config/locales/compliance_controls.en.yml3
-rw-r--r--config/locales/compliance_controls.fr.yml2
3 files changed, 8 insertions, 8 deletions
diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim
index bfd0d459b..f7ec118b0 100644
--- a/app/views/compliance_controls/show.html.slim
+++ b/app/views/compliance_controls/show.html.slim
@@ -27,11 +27,6 @@
end \
)
- if @compliance_control.compliance_control_block
- = definition_list t('metadatas'),
- {}.merge( \
- {}.tap do |hash| \
- @compliance_control.compliance_control_block.condition_attributes.each do |k, v| \
- hash[ComplianceControl.human_attribute_name(k)] = v \
- end \
- end \
- )
+ = definition_list t('compliance_controls.show.metadatas.compliance_control_block'),
+ I18n.t('activerecord.attributes.compliance_control_blocks.transport_mode') => I18n.t("enumerize.transport_mode.#{@compliance_control.compliance_control_block.transport_mode}"),
+ I18n.t('activerecord.attributes.compliance_control_blocks.transport_submode') => I18n.t("enumerize.transport_submode.#{@compliance_control.compliance_control_block.transport_submode}") \ No newline at end of file
diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
index 618ecfb08..2d9c76d51 100644
--- a/config/locales/compliance_controls.en.yml
+++ b/config/locales/compliance_controls.en.yml
@@ -19,6 +19,9 @@ en:
mandatory_control_type: "A control type must be selected"
show:
title: "Compliance control"
+ metadatas:
+ compliance_control_block: "Control block informations"
+ new:
index:
title: "Compliance control"
new:
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index 55efc78ea..c7dd2797a 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -19,6 +19,8 @@ fr:
mandatory_control_type: "Un type de contrôle doit être sélectionné"
show:
title: "Consulter un contrôle"
+ metadatas:
+ compliance_control_block: "Informations sur le groupe de contrôle"
new:
title: "Ajouter un contrôle"
edit: