From b644950e4e85df0501276dc262f109ded4e405c2 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 28 Jul 2020 09:53:35 +0200 Subject: [PATCH] Fix I18n markup --- app/services/reports/docx/draw_my_module.rb | 8 +++----- .../reports/elements/_my_module_element.html.erb | 15 +++++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/services/reports/docx/draw_my_module.rb b/app/services/reports/docx/draw_my_module.rb index b588dfa6d..cf1889102 100644 --- a/app/services/reports/docx/draw_my_module.rb +++ b/app/services/reports/docx/draw_my_module.rb @@ -46,12 +46,10 @@ module Reports::Docx::DrawMyModule text I18n.t('projects.reports.elements.module.status') text ' ' text "[#{status.name}]", color: status.color.delete('#') - text ' ' - text I18n.l(my_module.completed_on, format: :full) end @docx.p do - text I18n.t 'projects.reports.elements.module.tags_header' + text I18n.t('projects.reports.elements.module.tags_header') if tags.any? my_module.tags.each do |tag| text ' ' @@ -59,7 +57,7 @@ module Reports::Docx::DrawMyModule end else text ' ' - text I18n.t 'projects.reports.elements.module.no_tags' + text I18n.t('projects.reports.elements.module.no_tags') end end @@ -67,7 +65,7 @@ module Reports::Docx::DrawMyModule html = custom_auto_link(my_module.description, team: @report_team) html_to_word_converter(html) else - @docx.p I18n.t 'projects.reports.elements.module.no_description' + @docx.p I18n.t('projects.reports.elements.module.no_description') end @docx.p diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb index dc5f748f2..0f2527762 100644 --- a/app/views/reports/elements/_my_module_element.html.erb +++ b/app/views/reports/elements/_my_module_element.html.erb @@ -6,7 +6,7 @@
- <%=t "projects.reports.elements.module.user_time", timestamp: l(timestamp, format: :full) %> + <%= t("projects.reports.elements.module.user_time", timestamp: l(timestamp, format: :full)) %>
<%= render partial: "reports/elements/element_controls.html.erb", locals: { show_sort: true } %> @@ -29,25 +29,24 @@ <% if my_module.started_on.present? %> <%= t('projects.reports.elements.module.started_on', started_on: l(my_module.started_on, format: :full)) %> <% else %> - <%=t "projects.reports.elements.module.no_start_date" %> + <%= t("projects.reports.elements.module.no_start_date") %> <% end %>

<% if my_module.due_date.present? %> - <%=t "projects.reports.elements.module.due_date", due_date: l(my_module.due_date, format: :full) %> + <%= t("projects.reports.elements.module.due_date", due_date: l(my_module.due_date, format: :full)) %> <% else %> - <%=t "projects.reports.elements.module.no_due_date" %> + <%= t("projects.reports.elements.module.no_due_date") %> <% end %>

<% status = my_module.my_module_status %> <%=t "projects.reports.elements.module.status" %> <%= status.name %> - <%= l(my_module.completed_on, format: :full) %>

- <%=t "projects.reports.elements.module.tags_header" %> + <%= t("projects.reports.elements.module.tags_header") %>
<% if my_module.tags.any? %> <% my_module.tags.each do |tag| %> @@ -57,7 +56,7 @@ <% end %> <% else %>
- <%=t "projects.reports.elements.module.no_tags" %> + <%= t("projects.reports.elements.module.no_tags") %>
<% end %>
@@ -68,7 +67,7 @@ team: current_team, base64_encoded_imgs: for_export_all) %> <% else %> - <%=t "projects.reports.elements.module.no_description" %> + <%= t("projects.reports.elements.module.no_description") %> <% end %>