diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb index 8a6deae..0eaf063 100644 --- a/app/controllers/orgs_controller.rb +++ b/app/controllers/orgs_controller.rb @@ -45,7 +45,7 @@ @orgs = Org.joins(:identifier_schemes).where('identifier_schemes.name = ?', 'shibboleth').sort{|x,y| x.name <=> y.name } if @orgs.empty? - flash[:alert] = _('No institutions are currently registered.') + flash[:alert] = _('No organisations are currently registered.') redirect_to user_shibboleth_omniauth_authorize_path end end @@ -67,12 +67,12 @@ #initiate shibboleth login sequence redirect_to "#{url}?target=#{target}&entityID=#{shib_entity.first.identifier}" else - flash[:alert] = _('Your institution does not seem to be properly configured.') + flash[:alert] = _('Your organisation does not seem to be properly configured.') redirect_to shibboleth_ds_path end else - flash[:notice] = _('Please choose an institution') + flash[:notice] = _('Please choose an organisation') redirect_to shibboleth_ds_path end end diff --git a/app/helpers/plans_helper.rb b/app/helpers/plans_helper.rb index 0187c2a..1b9cb6d 100644 --- a/app/helpers/plans_helper.rb +++ b/app/helpers/plans_helper.rb @@ -39,7 +39,7 @@ def display_visibility(val) case val when 'organisationally_visible' - return "#{_('Institution')}" + return "#{_('Organisation')}" when 'publicly_visible' return "#{_('Public')}" when 'privately_visible' @@ -52,7 +52,7 @@ def visibility_tooltip(val) case val when 'organisationally_visible' - return _('Institution: anyone at my institution can view.') + return _('Organisation: anyone at my organisation can view.') when 'publicly_visible' return _('Public: anyone can view.') else diff --git a/app/helpers/settings_template_helper.rb b/app/helpers/settings_template_helper.rb index 255c95e..ea18f38 100644 --- a/app/helpers/settings_template_helper.rb +++ b/app/helpers/settings_template_helper.rb @@ -17,7 +17,7 @@ elsif admin_field == 'funder' return _('Funder') elsif admin_field == 'institution' - return _('Institution') + return _('Organisation') elsif admin_field == 'orcid' return _('Your ORCID') end diff --git a/app/views/devise/registrations/_external_identifier.html.erb b/app/views/devise/registrations/_external_identifier.html.erb index 79cfa5a..1097360 100644 --- a/app/views/devise/registrations/_external_identifier.html.erb +++ b/app/views/devise/registrations/_external_identifier.html.erb @@ -6,11 +6,11 @@ title: _("ORCID provides a persistent digital identifier that distinguishes you from other researchers. Learn more at orcid.org"), 'data-toggle': "tooltip" %> <% elsif scheme.name.downcase == 'shibboleth' %> - +   - <%= link_to _('Link your institutional credentials'), + <%= link_to _('Link your organisational credentials'), Rails.application.routes.url_helpers.send("user_shibboleth_omniauth_authorize_path"), - title: _("Link your institutional credentials to access your account with them."), + title: _("Link your organisational credentials to access your account with them."), 'data-toggle': "tooltip" %> <% end %> <% else %> @@ -30,11 +30,11 @@ <%= "#{scheme.user_landing_url}/#{id.identifier}" %> <% end %> <% elsif scheme.name.downcase == 'shibboleth' %> - <% titletext = _("Your account has been linked to your institution. You can now login with that method.") %> - <% unlinktext = _("Unlink your account from your institution. You can link again at any time.") %> - <% unlinkconf = _("Are you sure you want to unlink your institutional credentials?") %> + <% titletext = _("Your account has been linked to your organisation. You can now login with that method.") %> + <% unlinktext = _("Unlink your account from your organisation. You can link again at any time.") %> + <% unlinkconf = _("Are you sure you want to unlink your organisational credentials?") %> <% if scheme.user_landing_url.nil? %> - +   <%= titletext %> <% else %> diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb index 058dc8c..0a86324 100644 --- a/app/views/devise/registrations/_personal_details.html.erb +++ b/app/views/devise/registrations/_personal_details.html.erb @@ -42,7 +42,7 @@
<% if scheme.name.downcase == 'shibboleth' %> <% elsif scheme.name.downcase == 'orcid' %> <%= label_tag(:scheme_name, 'ORCID', class: 'control-label') %> diff --git a/app/views/guidance_groups/_guidance_group_form.html.erb b/app/views/guidance_groups/_guidance_group_form.html.erb index e64f904..e7b5d18 100644 --- a/app/views/guidance_groups/_guidance_group_form.html.erb +++ b/app/views/guidance_groups/_guidance_group_form.html.erb @@ -1,6 +1,6 @@
<%= f.label _('Name'), for: :name, class: "control-label" %> - <%= f.text_field :name, as: :string, class: "form-control", 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the institution or department name.'), 'aria-required': true %> + <%= f.text_field :name, as: :string, class: "form-control", 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the organisation or department name.'), 'aria-required': true %>
diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb index 2ecbe1a..1730ddd 100644 --- a/app/views/guidance_groups/admin_edit.html.erb +++ b/app/views/guidance_groups/admin_edit.html.erb @@ -11,7 +11,7 @@
<%= f.label _('Name'), for: :name, class: "control-label" %> - <%= f.text_field :name, as: :string, class: "form-control", 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will tell the end user where the guidance has come from. We suggest you use the institution or department name e.g. "OU" or "Maths & Stats"') %> + <%= f.text_field :name, as: :string, class: "form-control", 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will tell the end user where the guidance has come from. We suggest you use the organisation or department name e.g. "OU" or "Maths & Stats"') %>
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb index bacfe5c..2a65260 100644 --- a/app/views/guidance_groups/admin_new.html.erb +++ b/app/views/guidance_groups/admin_new.html.erb @@ -10,7 +10,7 @@ <%= form_for :guidance_group, url: {action: "admin_create"}, id: 'admin_create_guidance_group_form' do |f| %>
<%= f.label _('Name'), for: :name, class: "control-label" %> - <%= f.text_field :name, as: :string, class: "form-control", 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will tell the end user where the guidance has come from. We suggest you use the institution or department name e.g. "OU" or "Maths & Stats"') %> + <%= f.text_field :name, as: :string, class: "form-control", 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will tell the end user where the guidance has come from. We suggest you use the organisation or department name e.g. "OU" or "Maths & Stats"') %>
diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb index 3cecb9b..3478f88 100644 --- a/app/views/guidances/admin_index.html.erb +++ b/app/views/guidances/admin_index.html.erb @@ -3,7 +3,7 @@

<%= _('Guidance') %>

- <%= _("First create a guidance group. This could be institution wide or a subset e.g. a particular College / School, Institute or department. When you create guidance you'll be asked to assign it to a guidance group.") %> + <%= _("First create a guidance group. This could be organisation wide or a subset e.g. a particular College / School, Institute or department. When you create guidance you'll be asked to assign it to a guidance group.") %>

diff --git a/app/views/guidances/new_edit.html.erb b/app/views/guidances/new_edit.html.erb index af133d4..1da2a29 100644 --- a/app/views/guidances/new_edit.html.erb +++ b/app/views/guidances/new_edit.html.erb @@ -14,7 +14,7 @@
<%= render partial: 'org_admin/shared/theme_selector', locals: { f: f, all_themes: themes, - popover_message: _('Select one or more themes that are relevant to this guidance. This will display your generic institution-level guidance, as well as that from other sources e.g. the %{org_name} guidance or any Schools/Departments that you provide guidance for.') % { org_name: (current_user.org.abbreviation.present? ? current_user.org.abbreviation : current_user.org.name ) } } %> + popover_message: _('Select one or more themes that are relevant to this guidance. This will display your generic organisation-level guidance, as well as that from other sources e.g. the %{org_name} guidance or any Schools/Departments that you provide guidance for.') % { org_name: (current_user.org.abbreviation.present? ? current_user.org.abbreviation : current_user.org.name ) } } %>
<%= f.label _('Guidance group'), for: :guidance_group_id, class: 'control-label' %> <%= f.collection_select(:guidance_group_id, guidance_groups, diff --git a/app/views/org_admin/templates/index.html.erb b/app/views/org_admin/templates/index.html.erb index c4de34a..4cb0ca6 100644 --- a/app/views/org_admin/templates/index.html.erb +++ b/app/views/org_admin/templates/index.html.erb @@ -16,7 +16,7 @@ <% end %>

- <%= _('If you wish to add an institutional template for a Data Management Plan, use the \'create template\' button. You can create more than one template if desired e.g. one for researchers and one for PhD students. Your template will be presented to users within your institution when no funder templates apply. If you want to add questions to funder templates use the \'customise template\' options below.') %> + <%= _('If you wish to add an organisational template for a Data Management Plan, use the \'create template\' button. You can create more than one template if desired e.g. one for researchers and one for PhD students. Your template will be presented to users within your organisation when no funder templates apply. If you want to add questions to funder templates use the \'customise template\' options below.') %>

diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb index a5f8e72..615127a 100644 --- a/app/views/orgs/shibboleth_ds.html.erb +++ b/app/views/orgs/shibboleth_ds.html.erb @@ -1,6 +1,6 @@
-

Find your institution to sign in

+

<%= _('Find your organisation to sign in') %>

@@ -8,7 +8,7 @@
<%= form_for 'shibboleth_ds', url: shibboleth_ds_path, html: {id: 'shibboleth_ds'} do |f| %>
- <%= f.label(:org_name, _('Look up your institution here'), class: "control-label") %> + <%= f.label(:org_name, _('Look up your organisation here'), class: "control-label") %> <% if @orgs.length <= 10 %>