Merge branch 'master' into development

Author: briri

app/controllers/org_admin/plans_controller.rb

@@ -37,8 +37,7 @@ def feedback_complete
       # rubocop:enable LineLength
     else
       redirect_to org_admin_plans_path,
-        alert: _("Unable to notify user that you have finished providing feedback."
-      )
+        alert: _("Unable to notify user that you have finished providing feedback.")
     end
   end
 

app/controllers/org_admin/templates_controller.rb

@@ -192,7 +192,8 @@ def update
       rescue ActiveSupport::JSON.parse_error
         render(json: {
           status: :bad_request,
-          msg: _("Error parsing links for a #{template_type(template)}")
+          msg: _("Error parsing links for a %{template}") %
+               { template: template_type(template) }
         })
         return
       rescue => e

app/controllers/plan_exports_controller.rb

@@ -8,6 +8,7 @@ def show
     @plan = Plan.includes(:answers).find(params[:plan_id])
 
     if privately_authorized? && export_params[:form].present?
+      skip_authorization
       @show_coversheet         = export_params[:project_details].present?
       @show_sections_questions = export_params[:question_headings].present?
       @show_unanswered         = export_params[:unanswered_questions].present?
@@ -93,7 +94,11 @@ def publicly_authorized?
   end
 
   def privately_authorized?
-    authorize @plan, :export?
+    if current_user.present?
+      PlanPolicy.new(current_user, @plan).export?
+    else
+      false
+    end
   end
 
   def export_params

app/models/concerns/exportable_plan.rb

@@ -117,20 +117,21 @@ def prepare_coversheet
   def prepare_coversheet_for_csv(csv, headings, hash)
     csv << [ hash[:attribution].many? ?
              _("Creators: ") :
-             _("Creator:"), _(hash[:attribution].join(", ")) ]
-    csv << [ "Affiliation: ", _(hash[:affiliation]) ]
+             _("Creator:"), _("%{authors}") % { authors: hash[:attribution].join(", ") } ]
+    csv << [ "Affiliation: ", _("%{affiliation}") % { affiliation: hash[:affiliation] } ]
     if hash[:funder].present?
-      csv << [ _("Template: "), _(hash[:funder]) ]
+      csv << [ _("Template: "), _("%{funder}") % { funder: hash[:funder] } ]
     else
-      csv << [ _("Template: "), _(hash[:template] + hash[:customizer]) ]
+      csv << [ _("Template: "), _("%{template}") % { template: hash[:template] + hash[:customizer] } ]
     end
     if self.grant_number.present?
-      csv << [ _("Grant number: "), _(self.grant_number) ]
+      csv << [ _("Grant number: "), _("%{grant_number}") % { grant_number: self.grant_number } ]
     end
     if self.description.present?
-      csv << [ _("Project abstract: "), _(Nokogiri::HTML(self.description).text) ]
+      csv << [ _("Project abstract: "), _("%{description}") %
+               { description: Nokogiri::HTML(self.description).text } ]
     end
-    csv << [ _("Last modified: "), _(self.updated_at.to_date.strftime("%d-%m-%Y")) ]
+    csv << [ _("Last modified: "), _("%{date}") % { date: self.updated_at.to_date.strftime("%d-%m-%Y") } ]
     csv << [ _("Copyright information:"),
              _("The above plan creator(s) have agreed that others may use as
              much of the text of this plan as they would like in their own plans,

app/views/user_mailer/sharing_notification.html.erb

@@ -9,8 +9,8 @@
     <%= _('Hello %{user_name}') %{ :user_name => user_name } %>
   </p>
   <p>
-    <%= _("Your colleague %{inviter_name} has invited you to contribute to "\
-            " their Data Management Plan in %{tool_name}") % {
+    <%= _("Your colleague %{inviter_name} has invited you to contribute to
+            their Data Management Plan in %{tool_name}") % {
       tool_name: tool_name,
       inviter_name: @inviter.name(false)
     } %>