Merge pull request #143 from portagenetwork/integration

Merge to Deployment Portage for 3.0.4-3.0.4 release
portagenetwork · Feb 25, 2022 · 4bce240 · 4bce240
2 parents 4688e72 + f035cef
commit 4bce240
Show file tree

Hide file tree

Showing 14 changed files with 317 additions and 206 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [3.0.4+portage-3.0.4] - 2022-02-25
+  - Update translation for some wording
+
 ## [3.0.4+portage-3.0.3] - 2020-02-24
 
   ### Changed
@@ -17,7 +20,7 @@
   ### Added
   - Danger workflow to automate code review tasks
 
-## [3.0.4+portage-3.0.1] - 2020-01-17
+## [3.0.4+portage-3.0.1] - 2022-01-17
 
 ### Changed
   - Update mysql installation process for the Github action

diff --git a/app/views/guidance_groups/_guidance_group_form.html.erb b/app/views/guidance_groups/_guidance_group_form.html.erb
@@ -5,18 +5,18 @@ 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>
 <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>
 <div class="form-group col-xs-8">
   <%= form.hidden_field :org_id %>

diff --git a/app/views/plans/_request_feedback_form.html.erb b/app/views/plans/_request_feedback_form.html.erb
@@ -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.") % {
+         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>

diff --git a/app/views/usage/_filtered_value.html.erb b/app/views/usage/_filtered_value.html.erb
@@ -2,7 +2,7 @@
 
 <div class="panel panel-default">
   <div class="panel-body">
-    <h3><%= label %></h3>
+    <h3><%= _(label) %></h3>
     <strong style="font-size: 36px"><%= value || 0 %></strong>
   </div>
 </div>
diff --git a/app/views/usage/_total_usage.html.erb b/app/views/usage/_total_usage.html.erb
@@ -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)  %>

diff --git a/app/views/usage/filter.js.erb b/app/views/usage/filter.js.erb
@@ -1,5 +1,5 @@
 // Using straight (non-jquery) JS here because the js.erb does not have access to JQuery!
 // TODO: We should fix this and load JS and other assets correctly when we move to Rails 5
 //       it would be much cleaner to just rerender the html.erb
-document.getElementById('filter_ranged').innerHTML = '<%= escape_javascript(render partial: "filtered_value", locals: { label: "New #{@topic}", value: @ranged.to_i }) %>';
-document.getElementById('filter_total').innerHTML = '<%= escape_javascript(render partial: "filtered_value", locals: { label: "Total #{@topic}", value: @total.to_i }) %>';
+document.getElementById('filter_ranged').innerHTML = '<%= escape_javascript(render partial: "filtered_value", locals: { label: _("New %{topic}") % {topic: @topic }, value: @ranged.to_i }) %>';
+document.getElementById('filter_total').innerHTML = '<%= escape_javascript(render partial: "filtered_value", locals: { label: _("Total %{topic}") % {topic: @topic }, value: @total.to_i }) %>';
diff --git a/config/locale/app.pot b/config/locale/app.pot
@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2022 integration
-# This file is distributed under the same license as the integration package.
+# Copyright (C) 2022 roadmap
+# This file is distributed under the same license as the roadmap package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: integration 1.0\n"
+"Project-Id-Version: roadmap 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-02-09 18:22-0500\n"
-"PO-Revision-Date: 2022-02-09 18:22-0500\n"
+"POT-Creation-Date: 2022-02-16 17:37-0500\n"
+"PO-Revision-Date: 2022-02-16 17:37-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -1313,13 +1313,13 @@ msgid "Phase"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
-msgid "Section"
+#: ../../app/models/exported_plan.rb:114
+msgid "Question"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
-msgid "Question"
+#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+msgid "Section"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:28
@@ -1859,6 +1859,7 @@ msgstr ""
 
 #: ../../app/views/contact_us/contacts/_new_left.html.erb:4
 #: ../../app/views/contributors/_form.html.erb:10
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:8
 #: ../../app/views/org_admin/conditions/_webhook_form.html.erb:14
 #: ../../app/views/org_admin/departments/edit.html.erb:14
 #: ../../app/views/org_admin/departments/new.html.erb:14
@@ -1931,7 +1932,7 @@ msgstr ""
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
 #: ../../app/views/layouts/_branding.html.erb:36
-#: ../../app/views/layouts/_footer.html.erb:17
+#: ../../app/views/layouts/_footer.html.erb:18
 #: ../../app/views/layouts/_footer.html.erb:27
 #: ../../app/views/layouts/_footer.html.erb:36
 #: ../../app/views/layouts/_footer.html.erb:45
@@ -2096,15 +2097,15 @@ msgid "Thank you for registering. Please confirm your email address"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:5
-msgid "or copy"
+msgid "Click here to confirm your account"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:5
 msgid "into your browser"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:5
-msgid "Click here to confirm your account"
+msgid "or copy"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:11
@@ -2485,6 +2486,27 @@ msgid ""
 "this subset guidance when answering questions in the 'create plan' wizard."
 msgstr ""
 
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
+#: ../../app/views/org_admin/templates/_form.html.erb:38
+#: ../../app/views/org_admin/templates/_row.html.erb:10
+#: ../../app/views/org_admin/templates/_row.html.erb:13
+#: ../../app/views/org_admin/templates/_show.html.erb:19
+#: ../../app/views/org_admin/templates/_show.html.erb:22
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidances/_index.html.erb:41
+#: ../../app/views/paginable/templates/_customisable.html.erb:31
+#: ../../app/views/paginable/templates/_customisable.html.erb:34
+#: ../../app/views/paginable/templates/_history.html.erb:8
+#: ../../app/views/paginable/templates/_organisational.html.erb:36
+#: ../../app/views/paginable/templates/_organisational.html.erb:39
+msgid "Published"
+msgstr ""
+
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:8
+msgid "Optional subset"
+msgstr ""
+
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
 msgid " (e.g. School/ Department) "
 msgstr ""
@@ -2779,20 +2801,20 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
+#: ../../app/views/layouts/_footer.html.erb:13
 #: ../../app/views/layouts/_footer.html.erb:16
-#: ../../app/views/layouts/_footer.html.erb:25
+msgid "Digital Research Alliance of Canada"
+msgstr ""
+
+#: ../../app/views/layouts/_footer.html.erb:16
+#: ../../app/views/layouts/_footer.html.erb:26
 #: ../../app/views/layouts/_footer.html.erb:35
 #: ../../app/views/layouts/_footer.html.erb:44
 #: ../../app/views/layouts/_footer.html.erb:51
 #: ../../app/views/layouts/_footer.html.erb:57
 msgid "(opens in a new window)"
 msgstr ""
 
-#: ../../app/views/layouts/_footer.html.erb:22
-#: ../../app/views/layouts/_footer.html.erb:25
-msgid "Digital Research Alliance of Canada"
-msgstr ""
-
 #: ../../app/views/layouts/_footer.html.erb:32
 #: ../../app/views/layouts/_footer.html.erb:35
 msgid "Canadian Association of Research Libraries"
@@ -3527,21 +3549,6 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: ../../app/views/org_admin/templates/_form.html.erb:38
-#: ../../app/views/org_admin/templates/_row.html.erb:10
-#: ../../app/views/org_admin/templates/_row.html.erb:13
-#: ../../app/views/org_admin/templates/_show.html.erb:19
-#: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
-#: ../../app/views/paginable/guidances/_index.html.erb:41
-#: ../../app/views/paginable/templates/_customisable.html.erb:31
-#: ../../app/views/paginable/templates/_customisable.html.erb:34
-#: ../../app/views/paginable/templates/_history.html.erb:8
-#: ../../app/views/paginable/templates/_organisational.html.erb:36
-#: ../../app/views/paginable/templates/_organisational.html.erb:39
-msgid "Published"
-msgstr ""
-
 #: ../../app/views/org_admin/templates/_form.html.erb:40
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
@@ -3881,7 +3888,7 @@ msgstr ""
 
 #: ../../app/views/orgs/admin_edit.html.erb:22
 #: ../../app/views/plans/_navigation.html.erb:27
-#: ../../app/views/plans/_request_feedback_form.html.erb:13
+#: ../../app/views/plans/_request_feedback_form.html.erb:17
 #: ../../app/views/static_pages/help.html.erb:53
 msgid "Request feedback"
 msgstr ""
@@ -3971,10 +3978,6 @@ msgid ""
 "ou sure?"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:8
-msgid "Optional subset"
-msgstr ""
-
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:34
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:44
@@ -4146,14 +4149,14 @@ msgstr ""
 
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:73
 msgid ""
-"Are you sure you wish to remove this public plan? This will remove it from the"
-" Public DMPs page but any collaborators will still be able to access it."
+"Are you sure you wish to remove this plan? Any collaborators will still be abl"
+"e to access it."
 msgstr ""
 
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:73
 msgid ""
-"Are you sure you wish to remove this plan? Any collaborators will still be abl"
-"e to access it."
+"Are you sure you wish to remove this public plan? This will remove it from the"
+" Public DMPs page but any collaborators will still be able to access it."
 msgstr ""
 
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17
@@ -4555,11 +4558,17 @@ msgstr ""
 msgid "Request expert feedback"
 msgstr ""
 
-#: ../../app/views/plans/_request_feedback_form.html.erb:11
+#: ../../app/views/plans/_request_feedback_form.html.erb:8
+msgid ""
+"<p>Click below to give data management staff at %{owner_org}, the Plan Owner's"
+" org, access to read and comment on your plan.</p>"
+msgstr ""
+
+#: ../../app/views/plans/_request_feedback_form.html.erb:15
 msgid "You can continue to edit and download the plan in the interim."
 msgstr ""
 
-#: ../../app/views/plans/_request_feedback_form.html.erb:17
+#: ../../app/views/plans/_request_feedback_form.html.erb:21
 msgid "Feedback has been requested."
 msgstr ""
 
@@ -5829,6 +5838,14 @@ msgstr ""
 msgid "Statistics on your Templates"
 msgstr ""
 
+#: ../../app/views/usage/_total_usage.html.erb:7
+msgid "Total users"
+msgstr ""
+
+#: ../../app/views/usage/_total_usage.html.erb:11
+msgid "Total plans"
+msgstr ""
+
 #: ../../app/views/usage/_total_usage.html.erb:15
 msgid "Excluding Test Plans"
 msgstr ""
@@ -5886,6 +5903,14 @@ msgstr ""
 msgid "There is no data available for users joined yet."
 msgstr ""
 
+#: ../../app/views/usage/filter.js.erb:5
+msgid "New %{topic}"
+msgstr ""
+
+#: ../../app/views/usage/filter.js.erb:8
+msgid "Total %{topic}"
+msgstr ""
+
 #: ../../app/views/user_mailer/_email_signature.html.erb:16
 msgid "You may change your notification preferences on your profile page. "
 msgstr ""
@@ -6036,15 +6061,15 @@ msgid " is creating a Data Management Plan and has answered "
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " to "
+msgid " based on the template "
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " in a plan called "
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " based on the template "
+msgid " to "
 msgstr ""
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5

diff --git a/config/locale/en_CA/LC_MESSAGES/app.mo b/config/locale/en_CA/LC_MESSAGES/app.mo