Merge pull request #788 from sparc-request/wth-organization-lock-message

wth - small change to locked organization modal

app/views/service_requests/modals/_locked_organization_modal.html.haml

@@ -28,7 +28,7 @@
       .modal-body
         #modal_errors
         .form-group.text-center
-          = raw(t('proper.catalog.locked_organization.warning', organization: organization.name, request: "#{protocol.id}-#{ssr.ssr_id}", title: "#{protocol.short_title}", contact_name: "#{identity.first_name} #{identity.last_name}", contact_info: identity.phone.blank? ? identity.email : identity.phone))
+          = raw(t('proper.catalog.locked_organization.warning', organization: organization.name, request: "#{protocol.id}-#{ssr.ssr_id}", protocol_type: "#{protocol.type}", title: "#{protocol.short_title}", contact_name: "#{identity.first_name} #{identity.last_name}", contact_info: identity.phone.blank? ? identity.email : identity.phone))
       .modal-footer
         .center-block
           %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } }

config/locales/proper.en.yml

@@ -74,7 +74,7 @@ en:
         warning: "Deleting this service from the service cart will be irreversible and will cause it to be deleted from the associated protocol (%{protocol_id}). Are you sure you want to proceed?"
       locked_organization:
         header: "Locked Organization"
-        warning: "%{organization} services are already present on request %{request} pertaining to this Study/Project, %{title}.<br>Please contact %{contact_name} at %{contact_info} to edit existing request."
+        warning: "%{organization} services are already present on request %{request} pertaining to this %{protocol_type}, %{title}.<br>Please contact %{contact_name} at %{contact_info} to edit existing request."
 
     ############
     # PROTOCOL #