Skip to content

add translation format for at_csv.rb and usage section #3235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pengyin-shan merged 6 commits into from
Nov 29, 2022
Merged

add translation format for at_csv.rb and usage section #3235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
edf0b5b
add translation format for at_csv.rb
pengyin-shan Nov 14, 2022
9ac45a3
fix rubocop
pengyin-shan Nov 14, 2022
acd8fa0
add tranlsation formats for usage section
pengyin-shan Nov 15, 2022
67cd052
move the <p> tag out of translation section
pengyin-shan Nov 15, 2022
3942501
Merge branch 'development' into add_translation
briri Nov 29, 2022
04fdd61
Merge branch 'development' into add_translation
pengyin-shan Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/user/at_csv.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/views/guidance_groups/_guidance_group_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
%>
<div class="form-group col-xs-8">
<%= 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 %>
</div>

<div class='form-input col-xs-8'>
<%= form.check_box :published, data: { toggle: 'tooltip' }, title: published_tip %>
<%= form.label :published, class: "control-label" %>
<%= form.label(:published, _("Published"), class: "control-label") %>
</div>
<%# Only display the optional subset flag if allowed. Otherwise default to 'false' %>
<% if allow_subset_flag %>
<div class='form-input col-xs-8'>
<%= 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) ') %>
</div>
<% else %>
<%= form.hidden_field :optional_subset, value: "0" %>
Expand Down
8 changes: 7 additions & 1 deletion app/views/plans/_request_feedback_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<div class="col-xs-12">
<% if plan.owner_and_coowners.include?(current_user) && plan.owner.org.feedback_enabled? %>
<h2><%= _('Request expert feedback') %></h2>
<p><%= _("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.") %></p>
<p>
<%=
_("Click below to give data management staff at %{owner_org}, the Plan Owner's org, access to read and comment on your plan.") % {
Copy link
Copy Markdown
Contributor

@briri briri Nov 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pulling that variable out of the string 👍🏻

owner_org: plan.owner.org.name,
}
%>
</p>
<div class="well well-sm">
<%= 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 } %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/usage/_total_usage.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<div class="col-md-3">
<div class="col-xs-6">
<i class="fas fa-users f-large"></i>
<p class="fontsize-h4"><%= user_count.to_i %> Total users</p>
<p class="fontsize-h4"><%= user_count.to_i %> <%= _('Total users') %></p>
</div>
<div class="col-xs-6">
<i class="fas fa-files f-large"></i>
<p class="fontsize-h4"><%= plan_count.to_i %> Total plans</p>
<p class="fontsize-h4"><%= plan_count.to_i %> <%= _( 'Total plans') %></p>
<%= form_tag('/usage', method: :get, id: :filter_plans_form) do |f| %>
<%= label_tag :filtered do %>
<%= check_box_tag(:filtered, "true", @filtered) %>
Expand Down