diff --git a/app/models/user/at_csv.rb b/app/models/user/at_csv.rb index 81d79bc1c2..8cddb0f74e 100644 --- a/app/models/user/at_csv.rb +++ b/app/models/user/at_csv.rb @@ -4,8 +4,8 @@ class User # Helper to export a list of Users as CSV class AtCsv - HEADERS = ['Name', 'E-Mail', 'Created Date', 'Last Activity', 'Plans', - 'Current Privileges', 'Active', 'Department'].freeze + HEADERS = [_('Name'), _('E-Mail'), _('Created Date'), _('Last Activity'), _('Plans'), + _('Current Privileges'), _('Active'), _('Department')].freeze def initialize(users) @users = users diff --git a/app/views/guidance_groups/_guidance_group_form.html.erb b/app/views/guidance_groups/_guidance_group_form.html.erb index a0384f0095..b5bd06bd25 100644 --- a/app/views/guidance_groups/_guidance_group_form.html.erb +++ b/app/views/guidance_groups/_guidance_group_form.html.erb @@ -5,20 +5,20 @@ published_tip = _("Check this box when you are ready for guidance associated wit subset_tip = _("If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box. Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard.") %>
- <%= form.label :name, class: "control-label" %> + <%= form.label(:name, _('Name'), class: "control-label") %> <%= form.text_field :name, class: "form-control", spellcheck: true, aria: { required: true }, data: { toggle: 'tooltip' }, title: name_tip %>
<%= form.check_box :published, data: { toggle: 'tooltip' }, title: published_tip %> - <%= form.label :published, class: "control-label" %> + <%= form.label(:published, _("Published"), class: "control-label") %>
<%# Only display the optional subset flag if allowed. Otherwise default to 'false' %> <% if allow_subset_flag %>
<%= form.check_box :optional_subset, data: { toggle: 'tooltip' }, title: subset_tip %> - <%= form.label :optional_subset, class: "control-label" %><%= _(' (e.g. School/ Department) ') %> + <%= form.label(:optional_subset, _("Optional subset"), class: "control-label") %><%= _(' (e.g. School/ Department) ') %>
<% else %> <%= form.hidden_field :optional_subset, value: "0" %> diff --git a/app/views/plans/_request_feedback_form.html.erb b/app/views/plans/_request_feedback_form.html.erb index 0001332f82..777b419b20 100644 --- a/app/views/plans/_request_feedback_form.html.erb +++ b/app/views/plans/_request_feedback_form.html.erb @@ -4,7 +4,13 @@
<% if plan.owner_and_coowners.include?(current_user) && plan.owner.org.feedback_enabled? %>

<%= _('Request expert feedback') %>

-

<%= _("Click below to give data management staff at #{plan.owner.org.name}, the Plan Owner's org, access to read and comment on your plan.") %>

+

+ <%= + _("Click below to give data management staff at %{owner_org}, the Plan Owner's org, access to read and comment on your plan.") % { + owner_org: plan.owner.org.name, + } + %> +

<%= sanitize plan.owner.org.feedback_msg.to_s % { user_name: current_user.name(false), plan_name: plan.title, organisation_email: current_user.org.contact_email } %>
diff --git a/app/views/usage/_total_usage.html.erb b/app/views/usage/_total_usage.html.erb index ad27cdd515..e1c0e67023 100644 --- a/app/views/usage/_total_usage.html.erb +++ b/app/views/usage/_total_usage.html.erb @@ -4,11 +4,11 @@
-

<%= user_count.to_i %> Total users

+

<%= user_count.to_i %> <%= _('Total users') %>

-

<%= plan_count.to_i %> Total plans

+

<%= plan_count.to_i %> <%= _( 'Total plans') %>

<%= form_tag('/usage', method: :get, id: :filter_plans_form) do |f| %> <%= label_tag :filtered do %> <%= check_box_tag(:filtered, "true", @filtered) %>