diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb deleted file mode 100644 index ea11160..0000000 --- a/app/controllers/projects_controller.rb +++ /dev/null @@ -1,404 +0,0 @@ -class ProjectsController < ApplicationController - - # TODO: Delete this controller! It is no longer in use and `rake routes` does not even map to this any longer - - after_action :verify_authorized - - # GET /projects - # GET /projects.json - def index - authorize Project - ## TODO: Is this A magic String? the "Show_shib_link?" as we define it and users dont see cookies - if user_signed_in? then - if (current_user.shibboleth_id.nil? || current_user.shibboleth_id.length == 0) && !cookies[:show_shib_link].nil? && cookies[:show_shib_link] == "show_shib_link" then - flash.notice = ActionController::Base.helpers.link_to( - _('Link your %{application_name} account to your institutional credentials (UK users only)' % { :application_name => Rails.configuration.branding[:application][:name]}, - user_omniauth_shibboleth_path)).html_safe() - end - - @projects = current_user.projects.filter(params[:filter]) - @has_projects = current_user.projects.any? # unfiltered count - - respond_to do |format| - format.html # index.html.erb - end - else - respond_to do |format| - format.html { redirect_to edit_user_registration_path } - end - end - end - - # GET /projects/1 - # GET /projects/1.json - def show - @project = Project.find(params[:id]) - authorize @project - @show_form = false - if params[:show_form] == "yes" then - @show_form = true - end - if user_signed_in? && @project.readable_by(current_user.id) then - respond_to do |format| - format.html # show.html.erb - end - elsif user_signed_in? then - respond_to do |format| - format.html { redirect_to projects_url, notice: _('This account does not have access to that plan.') } - end - else - respond_to do |format| - format.html { redirect_to edit_user_registration_path } - end - end - end - - def new - if user_signed_in? then - @plan = Plan.new - authorize @plan - @funders = Org.funder.all - - respond_to do |format| - format.html # new.html.erb - end - else - respond_to do |format| - format.html { redirect_to edit_user_registration_path } - end - end - end - - - # GET /projects/1/edit - # Should this be removed? - def edit - @project = Project.find(params[:id]) - authorize @project - if !user_signed_in? then - respond_to do |format| - format.html { redirect_to edit_user_registration_path } - end - elsif !@project.editable_by(current_user.id) then - respond_to do |format| - format.html { redirect_to projects_url, notice: _('This account does not have access to that plan.') } - end - end - end - - def share - @project = Project.find(params[:id]) - authorize @project - if !user_signed_in? then - respond_to do |format| - format.html { redirect_to edit_user_registration_path } - end - elsif !@project.editable_by(current_user.id) then - respond_to do |format| - format.html { redirect_to projects_url, notice: _('This account does not have access to that plan.') } - end - end - end - - def export - @project = Project.find(params[:id]) - authorize @project - if !user_signed_in? then - respond_to do |format| - format.html { redirect_to edit_user_registration_path } - end - else - respond_to do |format| - format.html { render action: "export" } - - end - end - end - - # POST /projects - def create - return - if user_signed_in? then - @plan = Plan.new(params[:plan]) - authorize @project - if @project.dmptemplate.nil? && params[:project][:funder_id] != "" then # this shouldn't be necessary - see setter for funder_id in project.rb - funder = Org.find(params[:project][:funder_id]) - if funder.dmptemplates.count == 1 then - @project.dmptemplate = funder.published_templates.first - end - elsif @project.dmptemplate.nil? || params[:default_tag] == 'true' then - if @project.organisation.nil? || params[:default_tag] == 'true' || @project.organisation.published_templates.first.nil? then - @project.dmptemplate = Dmptemplate.find_by_is_default(true) - else - @project.dmptemplate = @project.organisation.published_templates.first - end - end - @project.principal_investigator = current_user.name(false) - - @project.title = _('My plan')+' ('+@project.dmptemplate.title+')' # We should use interpolated string since the order of the words from this message could vary among languages - @project.assign_creator(current_user.id) - respond_to do |format| - if @project.save - format.html { redirect_to({:action => "show", :id => @project.slug, :show_form => "yes"}, {:notice => _('Plan was successfully created.')}) } - else - format.html { render action: "new" } - end - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - end - - # PUT /projects/1 - # PUT /projects/1.json - def update - @project = Project.find(params[:id]) - authorize @project - if user_signed_in? && @project.editable_by(current_user.id) then - if @project.update_attributes(params[:project]) - respond_to do |format| - format.html { redirect_to({:action => "show", :id => @project.slug, notice: _('Plan was successfully updated.') }) } - end - else - respond_to do |format| - format.html { render action: "edit" } - end - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - end - - # DELETE /projects/1 - # DELETE /projects/1.json - def destroy - @project = Project.find(params[:id]) - authorize @project - if user_signed_in? && @project.editable_by(current_user.id) then - @project.destroy - - respond_to do |format| - format.html { redirect_to projects_url } - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - end - - # returns to AJAX call from frontend - # difficult to secure as it passes through params, and dosent curate data based - # on what the user can "view" or is public - - # GET /projects/possible_templates.json - def possible_templates - if !params[:funder].nil? && params[:funder] != "" && params[:funder] != "undefined" then - funder = Org.find(params[:funder]) - else - funder = nil - end - if !params[:institution].nil? && params[:institution] != "" && params[:institution] != "undefined" then - institution = Org.find(params[:institution]) - else - institution = nil - end - templates = {} - unless funder.nil? then - funder.published_templates.each do |t| - templates[t.id] = t.title - end - end - if templates.count == 0 && !institution.nil? then - institution.published_templates.each do |t| - templates[t.id] = t.title - end - institution.children.each do |o| - o.published_templates.each do |t| - templates[t.id] = t.title - end - end - end - respond_to do |format| - format.json { render json: templates.to_json } - end - end - - # returns to AJAX call from frontend - # difficult to secure as it passes through params, and dosent curate data based - # on what the user can "view" or is public - # ----------------------------------------------------------- - def possible_guidance - authorize @project - - if !params[:template].nil? && params[:template] != "" && params[:template] != "undefined" then - template = Dmptemplate.find(params[:template]) - else - template = nil - end - if !params[:institution].nil? && params[:institution] != "" && params[:institution] != "undefined" then - institution = Org.find(params[:institution]) - else - institution = nil - end - excluded_orgs = Org.funders + Org.institutions - guidance_groups = {} - ggs = GuidanceGroup.guidance_groups_excluding(excluded_orgs) - - ggs.each do |gg| - guidance_groups[gg.id] = gg.name - end - - #subset guidance that belong to the institution - unless institution.nil? then - authorize Project - optional_gg = GuidanceGroup.where("optional_subset = ? AND organisation_id = ?", true, institution.id) - optional_gg.each do|optional| - guidance_groups[optional.id] = optional.name - end - - institution.children.each do |o| - o.guidance_groups.each do |gg| - include = false - gg.guidances.each do |g| - if g.dmptemplate.nil? || g.dmptemplate_id == template.id then - include = true - break - end - end - if include then - guidance_groups[gg.id] = gg.name - end - end - end - end - - #If template belongs to a funder and that funder has subset guidance display then. - if !template.nil? && template.organisation.organisation_type.name == constant("organisation_types.funder") then - optional_gg = GuidanceGroup.where("optional_subset = ? AND organisation_id = ?", true, template.organisation_id) - optional_gg.each do|optional| - guidance_groups[optional.id] = optional.name - end - end - - - respond_to do |format| - format.json { render json: guidance_groups.to_json } - end - end - - private - def project_params - params.require(:project).permit(:title, :grant_number, :identifier, :description, - :principal_investigator, :principal_investigator_identifier, - :data_contact, :funder_name, :visibility, - :dmptemplate_id, :organisation_id, :funder_id, :institution_id, - :guidance_group_ids, :project_group_ids) - end - - def orgs_of_type(org_type_name, published_templates = false) - org_type = OrganisationType.find_by_name(org_type_name) - all_such_orgs = org_type.organisations - if published_templates then - with_published = Array.new - all_such_orgs.each do |o| - if o.published_templates.count > 0 then - with_published << o - end - end - return with_published.sort_by {|o| [o.sort_name, o.name] } - else - return all_such_orgs.sort_by {|o| [o.sort_name, o.name] } - end - end - - # ----------------------------------------------------------- - def get_available_templates - Template.find_by(published: true) - end - - # ----------------------------------------------------------- - # Some guidance is always available to the user regardless of - # the template or institution. - # - # TODO: Reevaluate this. We should probably only do this for - # guidance groups who have guidance attached to themes - # ----------------------------------------------------------- - def get_always_available_guidance - # Exclude Funders, Institutions, or children of Institutions - excluded_orgs = orgs_of_type(constant("organisation_types.funder")) + - orgs_of_type(constant("organisation_types.institution")) + - Org.orgs_with_parent_of_type(constant("organisation_types.institution")) - - GuidanceGroup.guidance_groups_excluding(excluded_orgs) - end - - # ----------------------------------------------------------- - # This is a simplified version of the old possible_guidance method - # above. It sends all possible guidance to the client instead of - # forcing the client to make ajax calls to change the available - # guidance list (that is now handled via JS clientside) - # - # TODO: Reevaluate whether or not this logic makes sense once the - # DB has been cleaned up - # ----------------------------------------------------------- - def get_available_guidance - guidance_groups = [] - - #subset guidance that belong to an institution - optional_gg = GuidanceGroup.where("optional_subset = ? AND organisation_id IS NOT NULL", true) - optional_gg.each do|optional| - guidance_groups << optional.id - - optional.organisation.children.each do |o| - o.guidance_groups.each do |gg| - guidance_groups << gg.id - end - end - end - - # If template belongs to a funder and is an optional_subset - optional_gg = GuidanceGroup.where("optional_subset = ? AND organisation_id IN (?)", true, orgs_of_type(constant("organisation_types.funder"))) - optional_gg.each do|optional| - guidance_groups << optional.id - end - - GuidanceGroup.where(id: guidance_groups) - end - - # ----------------------------------------------------------- - def generate_export - @exported_plan = ExportedPlan.new.tap do |ep| - ep.plan = @plan - ep.user = current_user ||= nil - #ep.format = request.format.try(:symbol) - ep.format = request.format.to_sym - plan_settings = @plan.settings(:export) - - Settings::Dmptemplate::DEFAULT_SETTINGS.each do |key, value| - ep.settings(:export).send("#{key}=", plan_settings.send(key)) - end - end - - @exported_plan.save! # FIXME: handle invalid request types without erroring? - file_name = @exported_plan.project_name - - respond_to do |format| - format.html - format.xml - format.json - format.csv { send_data @exported_plan.as_csv, filename: "#{file_name}.csv" } - format.text { send_data @exported_plan.as_txt, filename: "#{file_name}.txt" } - format.docx { headers["Content-Disposition"] = "attachment; filename=\"#{file_name}.docx\""} - format.pdf do - @formatting = @plan.settings(:export).formatting - render pdf: file_name, - margin: @formatting[:margin], - footer: { - center: t('helpers.plan.export.pdf.generated_by'), - font_size: 8, - spacing: (@formatting[:margin][:bottom] / 2) - 4, - right: '[page] of [topage]' - } - end - end - end -end diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 1cd51ea..448efa8 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -130,7 +130,7 @@ session[:locale] = current_user.get_locale unless current_user.get_locale.nil? set_gettext_locale #Method defined at controllers/application_controller.rb set_flash_message :notice, _('Details successfully updated.') - sign_in current_user, bypass_sign_in: true # Sign in the user bypassing validation in case his password changed + sign_in current_user, bypass: true # Sign in the user bypassing validation in case his password changed redirect_to edit_user_registration_path, notice: _('Details successfully updated.') else diff --git a/app/controllers/user_identifiers_controller.rb b/app/controllers/user_identifiers_controller.rb index 5ca04f4..6b78c8e 100644 --- a/app/controllers/user_identifiers_controller.rb +++ b/app/controllers/user_identifiers_controller.rb @@ -12,12 +12,12 @@ # If the requested identifier belongs to the current user remove it if user.user_identifiers.include?(identifier) identifier.destroy! - flash[:notice] = _('Successfully unlinked your account from %{is}') % {is: identifier.identifier_scheme.name} + flash[:notice] = _('Successfully unlinked your account from %{is}.') % {is: identifier.identifier_scheme.description} else - flash[:notice] = _('Unable to unlinked your account from %{is}') % {is: identifier.identifier_scheme.name} + flash[:notice] = _('Unable to unlink your account from %{is}.') % {is: identifier.identifier_scheme.description} end redirect_to edit_user_registration_path end -end \ No newline at end of file +end diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 16c0516..0c6a600 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -31,8 +31,14 @@ # Otherwise sign them in else - sign_in_and_redirect user, event: :authentication - set_flash_message(:notice, :success, kind: scheme.name) if is_navigational_format? + # Until ORCID becomes supported as a login method + if scheme.name == 'shibboleth' + set_flash_message(:notice, :success, kind: scheme.description) if is_navigational_format? + sign_in_and_redirect user, event: :authentication + else + flash[:notice] = t('identifier_schemes.new_login_success') + redirect_to new_user_registration_url + end end # The user is already logged in and just registering the uid with us @@ -43,9 +49,9 @@ identifier: request.env["omniauth.auth"].uid, user: current_user) - flash[:notice] = t('identifier_schemes.connect_success', scheme: scheme.name) + flash[:notice] = _('Your account has been successfully linked to %{scheme}.') % { scheme: scheme.description } else - flash[:notice] = t('identifier_schemes.connect_failure', scheme: scheme.name) + flash[:notice] = _('Unable to link your account to %{scheme}.') % { scheme: scheme.description } end end @@ -53,68 +59,8 @@ redirect_to edit_user_registration_path end end - - - # TODO: We should consider rolling the below function up into the - # generic handler above # ------------------------------------------------------------- - def shibboleth - if user_signed_in? && current_user.shibboleth_id.present? && current_user.shibboleth_id.length > 0 then - flash[:warning] = I18n.t('devise.failure.already_authenticated') - redirect_to root_path - else - auth = request.env['omniauth.auth'] || {} - - eppn = auth['extra']['raw_info']['eppn'] unless auth['extra'].nil? - uid = nil - if !eppn.blank? then - uid = eppn - elsif !auth['uid'].blank? then - uid = auth['uid'] - elsif !auth['extra'].nil? - if !auth['extra']['raw_info']['targeted-id'].blank? then - uid = auth['extra']['raw_info']['targeted-id'] - end - end - - if !uid.nil? && !uid.blank? then - s_user = User.where(shibboleth_id: uid).first - # Take out previous record if was not confirmed. - if !s_user.nil? && s_user.confirmed_at.nil? then - sign_out s_user - User.delete(s_user.id) - s_user = nil - end - # Stops Shibboleth ID being blocked if email incorrectly entered. - if !s_user.nil? && s_user.try(:persisted?) then - flash[:notice] = I18n.t('devise.omniauth_callbacks.success', :kind => 'Shibboleth') - sign_in s_user - redirect_to root_path - else - if user_signed_in? then - current_user.update_attribute('shibboleth_id', uid) - user_id = current_user.id - sign_out current_user - session.delete(:shibboleth_data) - s_user = User.find(user_id) - flash[:notice] = I18n.t('devise.omniauth_callbacks.success', :kind => 'Shibboleth') - - sign_in s_user - redirect_to edit_user_registration_path - else - session[:shibboleth_data] = request.env['omniauth.auth'] - session[:shibboleth_data][:uid] = uid - redirect_to new_user_registration_url(:nosplash => 'true') - end - end - else - redirect_to root_path - end - end - end - - # ------------------------------------------------------------- def failure redirect_to root_path end diff --git a/app/controllers/users/omniauth_shibboleth_request_controller.rb b/app/controllers/users/omniauth_shibboleth_request_controller.rb deleted file mode 100644 index bc0f9f4..0000000 --- a/app/controllers/users/omniauth_shibboleth_request_controller.rb +++ /dev/null @@ -1,26 +0,0 @@ -class Users::OmniauthShibbolethRequestController < ApplicationController - before_filter :authenticate_user!, only: :associate - - def redirect - if !current_user.nil? && !current_user.org.nil? - idp = params[:idp] || current_user.org.wayfless_entity - else - idp = params[:idp] - end - - # briley - April 10 2017 - Replaced the old path with the one currently defined in `rake routes` - #query_params = {target: user_omniauth_callback_path(:shibboleth)} - query_params = {target: user_shibboleth_omniauth_callback_path} - - unless idp.blank? - query_params[:entityID] = idp - end - redirect_to "#{Rails.application.config.shibboleth_login}?#{query_params.to_query}", status: 302 - end - - def associate - # This action is protected - can only be reached if user is already logged in. - # See before_filter - redirect_to user_omniauth_callback_path(:shibboleth) - end -end diff --git a/app/dashboards/plan_dashboard.rb b/app/dashboards/plan_dashboard.rb index e1a67fe..cb3b724 100644 --- a/app/dashboards/plan_dashboard.rb +++ b/app/dashboards/plan_dashboard.rb @@ -17,7 +17,7 @@ notes: Field::HasMany, roles: Field::HasMany, users: Field::HasMany, - plan_guidance_groups: Field::HasMany, + plans_guidance_groups: Field::HasMany, guidance_groups: Field::HasMany, exported_plans: Field::HasMany, setting_objects: Field::HasMany.with_options(class_name: "Settings::Template"), @@ -61,7 +61,7 @@ :notes, :roles, :users, - :plan_guidance_groups, + :plans_guidance_groups, :guidance_groups, :exported_plans, :setting_objects, @@ -94,7 +94,7 @@ :notes, :roles, :users, - :plan_guidance_groups, + :plans_guidance_groups, :guidance_groups, :exported_plans, :setting_objects, diff --git a/app/dashboards/plan_guidance_group_dashboard.rb b/app/dashboards/plan_guidance_group_dashboard.rb index df39d80..5e659c0 100644 --- a/app/dashboards/plan_guidance_group_dashboard.rb +++ b/app/dashboards/plan_guidance_group_dashboard.rb @@ -51,7 +51,7 @@ # Overwrite this method to customize how plan guidance groups are displayed # across all pages of the admin dashboard. # - # def display_resource(plan_guidance_group) - # "PlanGuidanceGroup ##{plan_guidance_group.id}" + # def display_resource(plans_guidance_group) + # "PlanGuidanceGroup ##{plans_guidance_group.id}" # end end diff --git a/app/models/annotation.rb b/app/models/annotation.rb deleted file mode 100644 index c235d0b..0000000 --- a/app/models/annotation.rb +++ /dev/null @@ -1,36 +0,0 @@ -class Annotation < ActiveRecord::Base - enum type: [:example_answer, :guidance] - ## - # Associations - belongs_to :org - belongs_to :question - - ## - # Possibly needed for active_admin - # -relies on protected_attributes gem as syntax depricated in rails 4.2 - attr_accessible :org_id, :question_id, :text, - :org, :question, :as => [:default, :admin] - - - validates :question, :org, presence: {message: _("can't be blank")} - - ## - # returns the text from the suggested_answer - # - # @return [String] the text from the suggested_answer - def to_s - "#{text}" - end - - - ## - # deep copy the given question_option and all it's associations - # - # @params [QuestionOption] question_option to be deep copied - # @return [QuestionOption] the saved, copied question_option - def self.deep_copy(annotation) - annotation_copy = annotation.dup - annotation_copy.save! - return annotation_copy - end -end \ No newline at end of file diff --git a/app/models/guidance_group.rb b/app/models/guidance_group.rb index 547d49b..892a47e 100644 --- a/app/models/guidance_group.rb +++ b/app/models/guidance_group.rb @@ -3,10 +3,11 @@ ## # Associations belongs_to :org - has_many :guidances + has_many :guidances, dependent: :destroy has_and_belongs_to_many :plans, join_table: :plans_guidance_groups # depricated but needed for migration "single_group_for_guidance" # has_and_belongs_to_many :guidances, join_table: "guidance_in_group" + ## # Possibly needed for active_admin diff --git a/app/models/plan_guidance_group.rb b/app/models/plan_guidance_group.rb deleted file mode 100644 index 7b76499..0000000 --- a/app/models/plan_guidance_group.rb +++ /dev/null @@ -1,11 +0,0 @@ -# Used to link plans to guidance groups -# the links are created at plan creation stage -# and link to all possible GGs -# then the selected field keeps track of which ones the user has turned on /off -# -class PlanGuidanceGroup < ActiveRecord::Base - belongs_to :plan - belongs_to :guidance_group - - attr_accessible :selected -end diff --git a/app/views/devise/registrations/_external_identifier.html.erb b/app/views/devise/registrations/_external_identifier.html.erb index bbc8d75..93c045a 100644 --- a/app/views/devise/registrations/_external_identifier.html.erb +++ b/app/views/devise/registrations/_external_identifier.html.erb @@ -1,27 +1,23 @@
); background-size: 16px 16px;"> + style="background-image: url(<%= "#{scheme.logo_url}" %>); background-size: 16px;"> <% if id.nil? || id.identifier == '' %> - - <%= link_to "#{t("identifier_schemes.schemes.#{scheme.name}.connect")}", - Rails.application.routes.url_helpers.send( - "user_#{scheme.name.downcase}_omniauth_authorize_path" - ), - title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip") %> - + <%= link_to "#{_("Create or Link your #{scheme.description} ID")}", + Rails.application.routes.url_helpers.send( + "user_#{scheme.name.downcase}_omniauth_authorize_path" + ), + title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip", default: "") + %> <% else %> - <% if t("identifier_schemes.schemes.#{scheme.name}.user_landing_page").nil? %> - <%= t("identifier_schemes.schemes.connect_success").gsub(/%\{scheme\}/, scheme.name.capitalize) %> - - <% else %> - <% uri = t("identifier_schemes.schemes.#{scheme.name}.user_landing_page").gsub(/%\{id\}/, id.identifier) %> - <%= link_to uri, uri, target: '_blank', - title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip") %> + <% if scheme.user_landing_url.nil? %> + <%= _("Your account has been linked to #{scheme.description}.") %> + <% else %> + <%= link_to "#{_("Your account has been linked to #{scheme.description}.")}", "#{scheme.user_landing_url}/#{id.identifier}", target: '_blank', + title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip", default: "") %> <% end %> - <%= link_to image_tag('remove.png', height: '16px', width: '16px'), destroy_user_identifier_path(id), method: :delete, - title: t("identifier_schemes.schemes.#{scheme.name}.disconnect_tooltip"), - data: {confirm: t("identifier_schemes.schemes.#{scheme.name}.disconnect_confirmation")} %> + title: _("Unlink your account from #{scheme.description}. You can link again at any time."), + data: {confirm: _("Are you sure you want to unlink your #{scheme.description} ID?")} %> <% end %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index a13492c..5acc77e 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -65,7 +65,7 @@ <% @identifier_schemes.each do |scheme| %> - <%= scheme.name %> + <%= scheme.description %> <%= render partial: 'external_identifier', locals: {scheme: scheme, @@ -88,9 +88,10 @@

- <% if Rails.application.config.shibboleth_enabled %> +


@@ -140,7 +142,7 @@

<%= _('Unlink institutional credentials alert') %>

- <%= raw _('

You are about to unlink %{application_name} of your institutional credentials, would you like to continue?

') % { :application_name => user_omniauth_shibboleth_path } %> + <%= raw _('

You are about to unlink %{application_name} of your institutional credentials, would you like to continue?

') % { :application_name => user_shibboleth_omniauth_authorize_path } %>
<%= _('Cancel') %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 5406165..9dd7c36 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,7 +1,7 @@ -

<%= t('helpers.sign_up') %>

-<% unless session[:shibboleth_data].nil? %> +

<%= _('Sign up') %>

+<% unless session["devise.shibboleth_data"].nil? %>

- <%= raw t('helpers.sign_up_shibboleth_alert_text_html')%> + <%= (_("%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
* If you do not have an account with %{application_name}, please complete the form below.
* If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly.") % { :application_name => Rails.configuration.branding[:application][:name] }).html_safe %>

<% cookies[:show_shib_link] = { value: 'show_shib_link', expires: 3.hours.from_now } %> <% end %> @@ -10,4 +10,4 @@
<%= render :partial => 'shared/register_form', locals: {extended: true} %> -
\ No newline at end of file + diff --git a/app/views/plans/edit.html.erb b/app/views/plans/edit.html.erb index 0fd2694..d44caea 100644 --- a/app/views/plans/edit.html.erb +++ b/app/views/plans/edit.html.erb @@ -13,7 +13,7 @@ <% status = @plan.status %>
<%space_used = status["space_used"].to_i - space_title = _('approx. %{space_used} of available space used (max %{num_pages} pages)') % { space_used: space_used, num_pages: @plan.template.settings(:export).max_pages } + space_title = _('approx. %{space_used}%% of available space used (max %{num_pages} pages)') % { space_used: space_used, num_pages: @plan.template.settings(:export).max_pages } answered = %(#{status["num_answers"]}/#{status["num_questions"]})%>
<%= answered -%> <%= _('questions answered')%> diff --git a/app/views/shared/_login_form.html.erb b/app/views/shared/_login_form.html.erb index e5259db..5bf1449 100644 --- a/app/views/shared/_login_form.html.erb +++ b/app/views/shared/_login_form.html.erb @@ -24,7 +24,7 @@ <% if request.fullpath != "/users/sign_up?nosplash=true" && session[:shibboleth_data].nil? then%>
    • diff --git a/app/views/user_mailer/sharing_notification.html.erb b/app/views/user_mailer/sharing_notification.html.erb index a3072aa..c96e029 100644 --- a/app/views/user_mailer/sharing_notification.html.erb +++ b/app/views/user_mailer/sharing_notification.html.erb @@ -3,7 +3,7 @@

    <%= _('A colleague has invited you to contribute to their Data Management Plan at ') %><%=Rails.configuration.branding[:application][:name]%>

    -

    <%= _('You have been given ') %><%= access_level %><%= _(' access to') %>"<%= link_to @role.plan.title, url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %>" <%=_(' by ')%><%= @user.firstname %>.

    +

    <%= _('You have been given ') %><%= @access_level %><%= _(' access to') %>"<%= link_to @role.plan.title, url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %>" <%=_(' by ')%><%= @user.firstname %>.

    <%= link_to _('Click here'), url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %><%= _(' to accept the invitation, (or copy ') %><%= url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %><%= _(' into your browser)')%> @@ -14,4 +14,4 @@
    <%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>.

    -<% end %> \ No newline at end of file +<% end %> diff --git a/config/initializers/devise.rb.example b/config/initializers/devise.rb.example index cce856a..63aa90d 100644 --- a/config/initializers/devise.rb.example +++ b/config/initializers/devise.rb.example @@ -250,7 +250,26 @@ # Any entries here MUST match a corresponding entry in the identifier_schemes table as # well as an identifier_schemes.schemes section in each locale file! - config.omniauth :orcid, 'client_id', 'client_secret', {'scope': '/authenticate'} + OmniAuth.config.full_host = 'https://my_service.hostname' + + config.omniauth :orcid, + 'client_id', 'client_secret', + { + #member: false, + } + + config.omniauth :shibboleth, + { + #debug: true, + #uid_field: "HTTP_REMOTE_USER", + #shib_application_id_field: "HTTP_SHIB_APPLICATION_ID", + #shib_session_id_field: "HTTP_SHIB_SESSION_ID", + fields: [], + info_fields: { + #affiliation: "HTTP_AFFILIATION", + }, + extra_fields: [], + } # ==> Warden configuration # If you want to use other strategies, that are not supported by Devise, or diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb deleted file mode 100644 index ddc6ce1..0000000 --- a/config/initializers/omniauth.rb +++ /dev/null @@ -1,20 +0,0 @@ -Rails.application.config.middleware.use OmniAuth::Builder do - provider :shibboleth, { - # We're using a UK Access Management Federation IdPs here - # Shibboleth server config needs to return eppn and persistent-id attributes - # Priority given to eppn in controller if present, assuming persistent-id always populated - # Doing this the omniauth way rather than using REMOTE_USER - # See controllers/users/omniauth_callbacks_controller.rb - # Shibboleth authentication is enabled in config/application.rb - :uid_field => :"persistent-id", - :fields => [], - :extra_fields => [ - :eppn, - :affiliation, - :entitlement, - :"unscoped-affiliation", - :"targeted-id", - :mail - ], - } -end diff --git a/config/locale/app.pot b/config/locale/app.pot index 5712f73..def014e 100644 --- a/config/locale/app.pot +++ b/config/locale/app.pot @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: app 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-02 14:54+0000\n" -"PO-Revision-Date: 2017-05-02 14:54+0000\n" +"POT-Creation-Date: 2017-05-08 16:51+0100\n" +"PO-Revision-Date: 2017-05-08 16:51+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -48,16 +48,43 @@ msgid " by " msgstr "" +msgid " has been removed by " +msgstr "" + +msgid " have changed. " +msgstr "" + +msgid " into your browser)" +msgstr "" + msgid " on " msgstr "" +msgid " once you click save!" +msgstr "" + +msgid " password. You can do this through the link below." +msgstr "" + +msgid " saved the following answer:" +msgstr "" + msgid " team" msgstr "" -msgid " to view/edit the plan" +msgid " to accept the invitation, (or copy " msgstr "" -msgid "\"While you were editing #{answer.user.name} saved the following answer:\"" +msgid " will help you to develop your Data Management Plan. If you have any queries or feedback as you use the tool, please contact us on " +msgstr "" + +msgid "\"Are you sure you want to unlink your #{scheme.description} ID?\"" +msgstr "" + +msgid "\"Unlink your account from #{scheme.description}. You can link again at any time.\"" +msgstr "" + +msgid "\"Your account has been linked to #{scheme.description}.\"" msgstr "" msgid "%d days" @@ -75,15 +102,15 @@ msgid "%{application_name}" msgstr "" +msgid "%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
    * If you do not have an account with %{application_name}, please complete the form below.
    * If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
    Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly." +msgstr "" + msgid "%{format} is not a valid exporting format. Available formats to export are %{available_formats}." msgstr "" msgid "%{value} is not a valid format" msgstr "" -msgid "'name' must be included in column list." -msgstr "" - msgid "(Using custom PDF formatting values)" msgstr "" @@ -186,9 +213,6 @@ msgid "API Information" msgstr "" -msgid "API Permission Granted" -msgstr "" - msgid "API token" msgstr "" @@ -246,6 +270,9 @@ msgid "Admin area" msgstr "" +msgid "All the best," +msgstr "" + msgid "An error has occurred while saving/resetting your export settings." msgstr "" @@ -324,6 +351,9 @@ msgid "Choose a template" msgstr "" +msgid "Click here" +msgstr "" + msgid "Click here to accept the invitation" msgstr "" @@ -354,9 +384,6 @@ msgid "Comment was successfully saved." msgstr "" -msgid "Configure" -msgstr "" - msgid "Contact Email" msgstr "" @@ -384,15 +411,6 @@ msgid "Customise" msgstr "" -msgid "Customised" -msgstr "" - -msgid "DMP access removed" -msgstr "" - -msgid "DMP permissions changed" -msgstr "" - msgid "Default" msgstr "" @@ -432,9 +450,6 @@ msgid "Dropdown" msgstr "" -msgid "Duplicate column name. Please only include each column once." -msgstr "" - msgid "E.g ORCID http://orcid.org/." msgstr "" @@ -522,9 +537,6 @@ msgid "File Name" msgstr "" -msgid "Filter" -msgstr "" - msgid "Filter plans" msgstr "" @@ -696,6 +708,9 @@ msgid "Main organisation" msgstr "" +msgid "Many thanks," +msgstr "" + msgid "Margin" msgstr "" @@ -822,6 +837,9 @@ msgid "Organization" msgstr "" +msgid "Original funder template has changed!" +msgstr "" + msgid "Otherwise leave blank." msgstr "" @@ -912,9 +930,6 @@ msgid "Please fill in the basic project details below and click 'Update' to save" msgstr "" -msgid "Please follow the link above to login to " -msgstr "" - msgid "Please only enter up to 165 characters, you have used" msgstr "" @@ -957,10 +972,10 @@ msgid "Publish" msgstr "" -msgid "Published" +msgid "Publish changes" msgstr "" -msgid "Published templates cannot be edited." +msgid "Published" msgstr "" msgid "Question" @@ -1047,9 +1062,6 @@ msgid "Selected option(s)" msgstr "" -msgid "Settings - My plans" -msgstr "" - msgid "Share" msgstr "" @@ -1080,10 +1092,13 @@ msgid "Size" msgstr "" -msgid "Someone has requested a link to change your" +msgid "Someone has requested a link to change your " msgstr "" -msgid "Successfully unlinked your account from %{is}" +msgid "Status" +msgstr "" + +msgid "Successfully unlinked your account from %{is}." msgstr "" msgid "Suggested answer" @@ -1128,10 +1143,16 @@ msgid "Thank you for registering. Please confirm your email address" msgstr "" -msgid "Thanks" +msgid "That email address is already registered." msgstr "" -msgid "That email address is already registered." +msgid "That template is not currently published." +msgstr "" + +msgid "The " +msgstr "" + +msgid "The edits in the box below will overwrite the existing answer from " msgstr "" msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." @@ -1140,9 +1161,6 @@ msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." msgstr "" -msgid "The table below lists the available columns that can be shown on the 'My plans' list. Choose which you would like to appear." -msgstr "" - msgid "Themes" msgstr "" @@ -1158,9 +1176,6 @@ msgid "These are the basic details for your organisation." msgstr "" -msgid "This account does not have access to that plan." -msgstr "" - msgid "This allows you to order questions within a section." msgstr "" @@ -1203,7 +1218,13 @@ msgid "Top banner text" msgstr "" -msgid "Unable to unlinked your account from %{is}" +msgid "Un-published" +msgstr "" + +msgid "Unable to link your account to %{scheme}." +msgstr "" + +msgid "Unable to unlink your account from %{is}." msgstr "" msgid "Unknown column name." @@ -1227,15 +1248,21 @@ msgid "Unlock my account" msgstr "" +msgid "Unpublish" +msgstr "" + +msgid "Unpublished" +msgstr "" + +msgid "Unpublished changes" +msgstr "" + msgid "Unsaved answers" msgstr "" msgid "Unsaved changes" msgstr "" -msgid "Update Customisation" -msgstr "" - msgid "Upload a new logo file" msgstr "" @@ -1269,6 +1296,9 @@ msgid "Website" msgstr "" +msgid "Welcome to " +msgstr "" + msgid "Welcome to %{application_name}" msgstr "" @@ -1278,15 +1308,15 @@ msgid "When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions." msgstr "" +msgid "While you were editing " +msgstr "" + msgid "Would you like to save them now?" msgstr "" msgid "Yes" msgstr "" -msgid "Yes [Original Template Has Changed]" -msgstr "" - msgid "You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?" msgstr "" @@ -1308,6 +1338,9 @@ msgid "You are not authorized to perform this action." msgstr "" +msgid "You are viewing a historical version of this template. You will not be able to make changes." +msgstr "" + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "" @@ -1317,16 +1350,25 @@ msgid "You can edit any of the details below." msgstr "" +msgid "You can not edit a historical version of this template." +msgstr "" + +msgid "You can not publish a historical version of this template." +msgstr "" + +msgid "You cannot delete historical versions of this template." +msgstr "" + msgid "You have altered answers but have not saved them:" msgstr "" msgid "You have been given " msgstr "" -msgid "You have been given access to a Data Management Plan" +msgid "You have been granted permission by your organisation to use our API. Your API token and instructions for using the API endpoints can be found " msgstr "" -msgid "You have been granted permission by your organisation to use our API." +msgid "You have un-published changes" msgstr "" msgid "You have unsaved answers in the following sections:" @@ -1347,13 +1389,13 @@ msgid "Your" msgstr "" -msgid "Your API token and instructions for using the API endpoints can be found here." -msgstr "" - msgid "Your ORCID" msgstr "" -msgid "Your access to" +msgid "Your access to " +msgstr "" + +msgid "Your account has been successfully linked to %{scheme}." msgstr "" msgid "Your account is linked to your institutional credentials." @@ -1368,13 +1410,13 @@ msgid "Your password must contain at least 8 characters." msgstr "" -msgid "Your password won't change until you access the link above and create a new one." +msgid "Your permissions relating to " msgstr "" -msgid "Your permissions relating to" +msgid "Your template has been published and is now available to users." msgstr "" -msgid "[Unpublished Changes]" +msgid "Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it" msgstr "" msgid "a day" @@ -1395,10 +1437,19 @@ msgid "about an hour" msgstr "" -msgid "access." +msgid "account has been locked due to an excessive number of unsuccessful sign in attempts." msgstr "" -msgid "account has been locked due to an excessive number of unsuccessful sign in attempts." +msgid "activerecord.errors.messages.record_invalid" +msgstr "" + +msgid "activerecord.errors.models.user.attributes.current_password.invalid" +msgstr "" + +msgid "activerecord.errors.models.user.attributes.email.blank" +msgstr "" + +msgid "activerecord.errors.models.user.attributes.password.blank" msgstr "" msgid "add guidance text" @@ -1410,7 +1461,7 @@ msgid "answered" msgstr "" -msgid "approx. %{space_used} of available space used (max %{num_pages} pages)" +msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "" msgid "by" @@ -1443,12 +1494,6 @@ msgid "guidance on" msgstr "" -msgid "has been removed." -msgstr "" - -msgid "have changed. You now have" -msgstr "" - msgid "height must be less than 100px" msgstr "" @@ -1494,9 +1539,6 @@ msgid "organisation" msgstr "" -msgid "password. You can do this through the link below." -msgstr "" - msgid "phase" msgstr "" @@ -1547,13 +1589,3 @@ msgid "{\"Error\":\"You do not have authorisation to view this endpoint\"}" msgstr "" - -# ActiveRecord model errors that we could not override in the model's validation definition -msgid "activerecord.errors.models.user.attributes.email.blank" -msgstr "can't be blank" -msgid "activerecord.errors.models.user.attributes.password.blank" -msgstr "can't be blank" -msgid "activerecord.errors.models.user.attributes.current_password.invalid" -msgstr "invalid email and/or password" -msgid "activerecord.errors.messages.record_invalid" -msgstr "unable to save your changes" diff --git a/config/locale/de/app.po b/config/locale/de/app.po index ed43d9b..f7a75fc 100644 --- a/config/locale/de/app.po +++ b/config/locale/de/app.po @@ -3,7 +3,6 @@ # This file is distributed under the same license as the app package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: app 1.0.0\n" @@ -53,19 +52,51 @@ msgid " by " msgstr " von " +#, fuzzy +msgid " has been removed by " +msgstr " von " + +msgid " have changed. " +msgstr "" + +#, fuzzy +msgid " into your browser)" +msgstr "into your browser)." + msgid " on " msgstr "" +msgid " once you click save!" +msgstr "" + +#, fuzzy +msgid " password. You can do this through the link below." +msgstr "password. You can do this through the link below." + +msgid " saved the following answer:" +msgstr "" + #, fuzzy msgid " team" msgstr "am" -msgid " to view/edit the plan" +#, fuzzy +msgid " to accept the invitation, (or copy " +msgstr "(or copy" + +msgid " will help you to develop your Data Management Plan. If you have any queries or feedback as you use the tool, please contact us on " msgstr "" #, fuzzy -msgid "\"While you were editing #{answer.user.name} saved the following answer:\"" -msgstr "user" +msgid "\"Are you sure you want to unlink your #{scheme.description} ID?\"" +msgstr "ID" + +msgid "\"Unlink your account from #{scheme.description}. You can link again at any time.\"" +msgstr "" + +#, fuzzy +msgid "\"Your account has been linked to #{scheme.description}.\"" +msgstr "Your " msgid "%d days" msgstr "" @@ -82,15 +113,16 @@ msgid "%{application_name}" msgstr "DMPonline" +#, fuzzy +msgid "%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
    * If you do not have an account with %{application_name}, please complete the form below.
    * If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
    Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly." +msgstr "DMPonline" + msgid "%{format} is not a valid exporting format. Available formats to export are %{available_formats}." msgstr "" msgid "%{value} is not a valid format" msgstr "" -msgid "'name' must be included in column list." -msgstr "'Name' muss in der Liste von Spalten enthalten sein." - msgid "(Using custom PDF formatting values)" msgstr "(Verwende eigene Werte bei PDF-Formatierung)" @@ -196,9 +228,6 @@ msgid "API Information" msgstr "" -msgid "API Permission Granted" -msgstr "" - msgid "API token" msgstr "" @@ -256,6 +285,9 @@ msgid "Admin area" msgstr "Administativer Bereich" +msgid "All the best," +msgstr "" + msgid "An error has occurred while saving/resetting your export settings." msgstr "" @@ -339,6 +371,9 @@ msgid "Choose a template" msgstr "" +msgid "Click here" +msgstr "" + msgid "Click here to accept the invitation" msgstr "Click here to accept the invitation" @@ -372,9 +407,6 @@ msgid "Comment was successfully saved." msgstr "Plan wurde erfolgreich angelegt." -msgid "Configure" -msgstr "Konfigurieren" - msgid "Contact Email" msgstr "Kontakt Email" @@ -402,15 +434,6 @@ msgid "Customise" msgstr "Anpassen" -msgid "Customised" -msgstr "" - -msgid "DMP access removed" -msgstr "" - -msgid "DMP permissions changed" -msgstr "" - msgid "Default" msgstr "Vorgabe" @@ -450,9 +473,6 @@ msgid "Dropdown" msgstr "Klappliste" -msgid "Duplicate column name. Please only include each column once." -msgstr "Doppelter Spaltenname. Bitte jede Spalte nur einmal einfügen." - msgid "E.g ORCID http://orcid.org/." msgstr "z.B. die ORCID (http://orcid.org/)." @@ -543,9 +563,6 @@ msgid "File Name" msgstr "Dateiname" -msgid "Filter" -msgstr "Filter" - msgid "Filter plans" msgstr "Filter Pläne" @@ -719,6 +736,9 @@ msgid "Main organisation" msgstr "Übergeordnete Organisation" +msgid "Many thanks," +msgstr "" + msgid "Margin" msgstr "Rand" @@ -845,6 +865,10 @@ msgid "Organization" msgstr "Organisation" +#, fuzzy +msgid "Original funder template has changed!" +msgstr "templates" + msgid "Otherwise leave blank." msgstr "Falls nicht, lassen Sie dieses Feld bitte unberührt." @@ -937,9 +961,6 @@ msgid "Please fill in the basic project details below and click 'Update' to save" msgstr "Bitte geben Sie im Folgenden die Projektdetails an und wählen 'Aktualisieren' aus, um die Änderungen zu speichern." -msgid "Please follow the link above to login to " -msgstr "" - msgid "Please only enter up to 165 characters, you have used" msgstr "Please only enter up to 165 characters, you have used" @@ -982,12 +1003,12 @@ msgid "Publish" msgstr "" +msgid "Publish changes" +msgstr "" + msgid "Published" msgstr "Veröffentlicht" -msgid "Published templates cannot be edited." -msgstr "" - msgid "Question" msgstr "Frage" @@ -1072,9 +1093,6 @@ msgid "Selected option(s)" msgstr "" -msgid "Settings - My plans" -msgstr "Einstellungen - Meine Pläne" - msgid "Share" msgstr "Teilen" @@ -1105,10 +1123,14 @@ msgid "Size" msgstr "Größe" -msgid "Someone has requested a link to change your" +#, fuzzy +msgid "Someone has requested a link to change your " msgstr "Someone has requested a link to change your" -msgid "Successfully unlinked your account from %{is}" +msgid "Status" +msgstr "" + +msgid "Successfully unlinked your account from %{is}." msgstr "" msgid "Suggested answer" @@ -1154,10 +1176,17 @@ msgid "Thank you for registering. Please confirm your email address" msgstr "Thank you for registering at %{application_name}. Please confirm your email address:" -msgid "Thanks" +msgid "That email address is already registered." msgstr "" -msgid "That email address is already registered." +#, fuzzy +msgid "That template is not currently published." +msgstr "templates" + +msgid "The " +msgstr "" + +msgid "The edits in the box below will overwrite the existing answer from " msgstr "" msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." @@ -1166,9 +1195,6 @@ msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." msgstr "Die hier ausgewählten Einträge werden in der Tabelle unten angezeigt. Sie können die Daten durch jeden ihrer Tabellenköpfe sortieren oder filtern, indem Sie eine Zeichenkette in der Suchbox eingeben." -msgid "The table below lists the available columns that can be shown on the 'My plans' list. Choose which you would like to appear." -msgstr "Die untere Tabelle listet die verfügbaren Spalten auf, welche in der Liste 'Meine Pläne' gezeigt werden können. Wählen Sie, welche erscheinen sollen." - msgid "Themes" msgstr "Themen" @@ -1184,9 +1210,6 @@ msgid "These are the basic details for your organisation." msgstr "Grundlegende Informationen über ihre Org." -msgid "This account does not have access to that plan." -msgstr "" - msgid "This allows you to order questions within a section." msgstr "Hier können sie die Reihenfolge der Fragen innerhalb eines Abschnittes bestimmen." @@ -1229,7 +1252,14 @@ msgid "Top banner text" msgstr "" -msgid "Unable to unlinked your account from %{is}" +#, fuzzy +msgid "Un-published" +msgstr "Veröffentlicht" + +msgid "Unable to link your account to %{scheme}." +msgstr "" + +msgid "Unable to unlink your account from %{is}." msgstr "" msgid "Unknown column name." @@ -1253,15 +1283,22 @@ msgid "Unlock my account" msgstr "Unlock my account" +msgid "Unpublish" +msgstr "" + +#, fuzzy +msgid "Unpublished" +msgstr "Veröffentlicht" + +msgid "Unpublished changes" +msgstr "" + msgid "Unsaved answers" msgstr "Ungesicherte Antworten" msgid "Unsaved changes" msgstr "Ungesicherte Änderungen" -msgid "Update Customisation" -msgstr "" - msgid "Upload a new logo file" msgstr "Laden Sie ein neues Logo-Datei" @@ -1295,6 +1332,10 @@ msgid "Website" msgstr "Web-Seite" +#, fuzzy +msgid "Welcome to " +msgstr "Willkommen." + msgid "Welcome to %{application_name}" msgstr "Welcome to %{application_name}" @@ -1304,15 +1345,15 @@ msgid "When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions." msgstr "Wenn Sie eine neue Phase in einer Vorlage anlegen, wird automatische eine Version erzeugt. Nachdem Sie das folgende Formular ausgefüllt haben, werden Ihnen Optionen zum erstellen von Abschnitten und Fragen angezeigt." +msgid "While you were editing " +msgstr "" + msgid "Would you like to save them now?" msgstr "Wollen Sie sie jetzt sichern?" msgid "Yes" msgstr "" -msgid "Yes [Original Template Has Changed]" -msgstr "" - msgid "You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?" msgstr "Sie sind dabei '%{guidance_group_name}' zu löschen. Das wird Auswirkungen auf die Hilfestellungen haben. Sind Sie sicher?" @@ -1334,6 +1375,10 @@ msgid "You are not authorized to perform this action." msgstr "" +#, fuzzy +msgid "You are viewing a historical version of this template. You will not be able to make changes." +msgstr "templates" + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "Hier können Sie einen Text als Beispiel oder Vorschlag angeben, der Nutzern bei der Beantwortung helfen soll. Der Text erscheint oberhalb des Antwortfeldes und kann kopiert und eingefügt werden." @@ -1343,16 +1388,29 @@ msgid "You can edit any of the details below." msgstr "Alle folgenden Angaben können bearbeitet werden." +#, fuzzy +msgid "You can not edit a historical version of this template." +msgstr "templates" + +#, fuzzy +msgid "You can not publish a historical version of this template." +msgstr "templates" + +#, fuzzy +msgid "You cannot delete historical versions of this template." +msgstr "templates" + msgid "You have altered answers but have not saved them:" msgstr "Geänderte Antworten wurden nicht gesichert:" msgid "You have been given " msgstr "" -msgid "You have been given access to a Data Management Plan" -msgstr "" +#, fuzzy +msgid "You have been granted permission by your organisation to use our API. Your API token and instructions for using the API endpoints can be found " +msgstr "Organisation" -msgid "You have been granted permission by your organisation to use our API." +msgid "You have un-published changes" msgstr "" #, fuzzy @@ -1376,14 +1434,15 @@ msgid "Your" msgstr "Your " -msgid "Your API token and instructions for using the API endpoints can be found here." -msgstr "" - msgid "Your ORCID" msgstr "Ihre ORCID" #, fuzzy -msgid "Your access to" +msgid "Your access to " +msgstr "Your " + +#, fuzzy +msgid "Your account has been successfully linked to %{scheme}." msgstr "Your " msgid "Your account is linked to your institutional credentials." @@ -1400,15 +1459,16 @@ msgstr "Ihr Passwort muss mindestens acht Zeichen enthalten." #, fuzzy -msgid "Your password won't change until you access the link above and create a new one." +msgid "Your permissions relating to " msgstr "Your " #, fuzzy -msgid "Your permissions relating to" -msgstr "Your " +msgid "Your template has been published and is now available to users." +msgstr "templates" -msgid "[Unpublished Changes]" -msgstr "" +#, fuzzy +msgid "Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it" +msgstr "templates" msgid "a day" msgstr "" @@ -1428,13 +1488,25 @@ msgid "about an hour" msgstr "" -msgid "access." -msgstr "" - #, fuzzy msgid "account has been locked due to an excessive number of unsuccessful sign in attempts." msgstr " account has been locked due to an excessive number of unsuccessful sign in attempts." +msgid "activerecord.errors.messages.record_invalid" +msgstr "" + +#, fuzzy +msgid "activerecord.errors.models.user.attributes.current_password.invalid" +msgstr "user" + +#, fuzzy +msgid "activerecord.errors.models.user.attributes.email.blank" +msgstr "user" + +#, fuzzy +msgid "activerecord.errors.models.user.attributes.password.blank" +msgstr "user" + msgid "add guidance text" msgstr "add guidance text" @@ -1449,7 +1521,7 @@ msgstr "Beantwortet " #, fuzzy -msgid "approx. %{space_used} of available space used (max %{num_pages} pages)" +msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "annährend %{space_used}% des verfügbaren Platzes wird verwendet (max. %{num_pages} Seiten)" msgid "by" @@ -1483,12 +1555,6 @@ msgid "guidance on" msgstr "" -msgid "has been removed." -msgstr "" - -msgid "have changed. You now have" -msgstr "" - msgid "height must be less than 100px" msgstr "" @@ -1541,9 +1607,6 @@ msgid "organisation" msgstr "Organisation" -msgid "password. You can do this through the link below." -msgstr "password. You can do this through the link below." - #, fuzzy msgid "phase" msgstr "Phase" @@ -1602,10 +1665,3 @@ msgid "{\"Error\":\"You do not have authorisation to view this endpoint\"}" msgstr "{\"Error\":\"You do not have authorisation to view this endpoint\"}" - -msgid "activerecord.errors.models.user.attributes.password.blank" -msgstr "" -msgid "activerecord.errors.models.user.attributes.current_password.invalid" -msgstr "" -msgid "activerecord.errors.messages.record_invalid" -msgstr "" diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po index 17b7bfa..276a045 100644 --- a/config/locale/en_GB/app.po +++ b/config/locale/en_GB/app.po @@ -3,7 +3,6 @@ # This file is distributed under the same license as the app package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: app 1.0.0\n" @@ -23,80 +22,93 @@ msgid " - " msgstr " - " -#, fuzzy msgid " - choosing default template for your institution" -msgstr " - " +msgstr " - choosing default template for your institution" -#, fuzzy msgid " - no funder or institution template, choosing default template" -msgstr " - " +msgstr " - no funder or institution template, choosing default template" -#, fuzzy msgid " - there are more than one to choose from" -msgstr " - " +msgstr " - there are more than one to choose from" -#, fuzzy msgid " - using template customised by your institution" -msgstr " by " +msgstr " - using template customised by your institution" -#, fuzzy msgid " I accept the terms and conditions *" -msgstr " I accept the terms and conditions *" +msgstr " I accept the terms and conditions *" -#, fuzzy msgid " access to" -msgstr " access to " +msgstr " access to" -#, fuzzy msgid " by" -msgstr " by " +msgstr " by" msgid " by " msgstr " by " +msgid " has been removed by " +msgstr " has been removed by " + +msgid " have changed. " +msgstr " have changed. " + +msgid " into your browser)" +msgstr " into your browser)." + msgid " on " msgstr " on " -#, fuzzy +msgid " once you click save!" +msgstr " once you click save!" + +msgid " password. You can do this through the link below." +msgstr " password. You can do this through the link below." + +msgid " saved the following answer:" +msgstr " saved the following answer:" + msgid " team" -msgstr "am" +msgstr " team" -msgid " to view/edit the plan" -msgstr "" +msgid " to accept the invitation, (or copy " +msgstr " to accept the invitation, (or copy " -#, fuzzy -msgid "\"While you were editing #{answer.user.name} saved the following answer:\"" -msgstr "user" +msgid " will help you to develop your Data Management Plan. If you have any queries or feedback as you use the tool, please contact us on " +msgstr " will help you to develop your Data Management Plan. If you have any queries or feedback as you use the tool, please contact us on " -#, fuzzy +msgid "\"Are you sure you want to unlink your #{scheme.description} ID?\"" +msgstr "\"Are you sure you want to unlink your #{scheme.description} ID?\"" + +msgid "\"Unlink your account from #{scheme.description}. You can link again at any time.\"" +msgstr "\"Unlink your account from #{scheme.description}. You can link again at any time.\"" + +msgid "\"Your account has been linked to #{scheme.description}.\"" +msgstr "\"Your account has been linked to #{scheme.description}.\"" + msgid "%d days" -msgstr "%{d} days" +msgstr "%d days" -#, fuzzy msgid "%d minutes" -msgstr "%{d} minutes" +msgstr "%d minutes" -#, fuzzy msgid "%d months" -msgstr "%{d} months" +msgstr "%d months" -#, fuzzy msgid "%d years" -msgstr "%{d} years" +msgstr "%d years" msgid "%{application_name}" msgstr "%{application_name}" -#, fuzzy +msgid "%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
    * If you do not have an account with %{application_name}, please complete the form below.
    * If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
    Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly." +msgstr "%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
    * If you do not have an account with %{application_name}, please complete the form below.
    * If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
    Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly." + msgid "%{format} is not a valid exporting format. Available formats to export are %{available_formats}." -msgstr "format" +msgstr "%{format} is not a valid exporting format. Available formats to export are %{available_formats}." msgid "%{value} is not a valid format" msgstr "%{value} is not a valid format" -msgid "'name' must be included in column list." -msgstr "'name' must be included in column list." - msgid "(Using custom PDF formatting values)" msgstr "(Using custom PDF formatting values)" @@ -157,9 +169,9 @@ msgid "

    Please note that your email address is used as your username. If you change this, remember to use your new email address on sign in.

    " msgstr "

    Please note that your email address is used as your username. If you change this, remember to use your new email address on sign in.

    " -#, fuzzy + msgid "

    Please select from the following drop-down so we can determine what questions and guidance should be displayed in your plan.

    " -msgstr "guidance" +msgstr "

    Please select from the following drop-down so we can determine what questions and guidance should be displayed in your plan.

    " msgid "

    Please select from the following drop-downs so we can determine what questions and guidance should be displayed in your plan.

    If you aren't responding to specific requirements from a funder or an institution, select here to write a generic DMP based on the most common themes.

    " msgstr "

    Please select from the following drop-downs so we can determine what questions and guidance should be displayed in your plan.

    If you aren't responding to specific requirements from a funder or an institution, select here to write a generic DMP based on the most common themes.

    " @@ -182,17 +194,14 @@ msgid "

    You are about to unlink %{application_name} of your institutional credentials, would you like to continue?

    " msgstr "

    You are about to unlink %{application_name} of your institutional credentials, would you like to continue?

    " -#, fuzzy msgid "

    You can give other people access to your plan here. There are three permission levels.

    • Users with \"read only\" access can only read the plan.
    • Editors can contribute to the plan.
    • Co-owners can also contribute to the plan, but additionally can edit the plan details and control access to the plan.

    Add each collaborator in turn by entering their email address below, choosing a permission level and clicking \"Add collaborator\".

    Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don't already have an account. A notification is also issued when a user's permission level is changed.

    " -msgstr "

    You can give other people access to your plan here. There are three permission levels.

    • Users with \"read only\" access can only read the plan.
    • Editors can contribute to the plan.
    • Co-owners can also contribute to the plan, but additionally can edit the plan details and control access to the plan.

    Add each collaborator in turn by entering their email address below, choosing a permission level and clicking \"Add collaborator\".

    Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don\\'t already have an account. A notification is also issued when a user\\'s permission level is changed.

    " +msgstr "

    You can give other people access to your plan here. There are three permission levels.

    • Users with \"read only\" access can only read the plan.
    • Editors can contribute to the plan.
    • Co-owners can also contribute to the plan, but additionally can edit the plan details and control access to the plan.

    Add each collaborator in turn by entering their email address below, choosing a permission level and clicking \"Add collaborator\".

    Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don't already have an account. A notification is also issued when a user's permission level is changed.

    " -#, fuzzy msgid "

    You can write pieces of guidance to be displayed by theme (e.g. generic guidance on storage and backup that should present across the board). Writing generic guidance by theme saves you time and effort as your advice will be automatically displayed across all templates rather than having to write guidance to accompany each.

    If you do have a need to provide guidance for specific funders that would not be useful to a wider audience (e.g. if you have specific instructions for applicants to BBSRC for example), you can do so by adding guidance to a specific question when you edit your template.

    " -msgstr "guidance on" +msgstr "

    You can write pieces of guidance to be displayed by theme (e.g. generic guidance on storage and backup that should present across the board). Writing generic guidance by theme saves you time and effort as your advice will be automatically displayed across all templates rather than having to write guidance to accompany each.

    If you do have a need to provide guidance for specific funders that would not be useful to a wider audience (e.g. if you have specific instructions for applicants to BBSRC for example), you can do so by adding guidance to a specific question when you edit your template.

    " -#, fuzzy msgid "A colleague has invited you to contribute to their Data Management Plan at " -msgstr "A colleague has invited you to contribute to their Data Management Plan at" +msgstr "A colleague has invited you to contribute to their Data Management Plan at " msgid "A pertinent ID as determined by the funder and/or institution." msgstr "A pertinent ID as determined by the funder and/or institution." @@ -203,9 +212,6 @@ msgid "API Information" msgstr "API Information" -msgid "API Permission Granted" -msgstr "API Permission Granted" - msgid "API token" msgstr "API token" @@ -263,12 +269,14 @@ msgid "Admin area" msgstr "Admin area" +msgid "All the best," +msgstr "" + msgid "An error has occurred while saving/resetting your export settings." msgstr "" -#, fuzzy msgid "Answer" -msgstr "Answers" +msgstr "Answer" msgid "Answer format" msgstr "Answer format" @@ -276,17 +284,14 @@ msgid "Answer questions" msgstr "Answer questions" -#, fuzzy msgid "Answered" -msgstr "Answered " +msgstr "Answered" -#, fuzzy msgid "Answered at" -msgstr "Answered " +msgstr "Answered at" -#, fuzzy msgid "Answered by" -msgstr "Answered " +msgstr "Answered by" msgid "Answers" msgstr "Answers" @@ -294,9 +299,8 @@ msgid "Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here." msgstr "Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here." -#, fuzzy msgid "Are you sure you want to remove this note?" -msgstr "Are you sure you would like to remove this note?" +msgstr "Are you sure you want to remove this note?" msgid "Are you sure you wish to delete this plan? If the plan is being shared with other users, by deleting it from your list, the plan will be deleted from their plan list as well" msgstr "Are you sure you wish to delete this plan? If the plan is being shared with other users, by deleting it from your list, the plan will be deleted from their plan list as well" @@ -334,9 +338,8 @@ msgid "Change language" msgstr "Change language" -#, fuzzy msgid "Change my password" -msgstr "Change your password" +msgstr "Change my password" msgid "Check box" msgstr "Check box" @@ -347,15 +350,17 @@ msgid "Choose a template" msgstr "Choose a template" +msgid "Click here" +msgstr "" + msgid "Click here to accept the invitation" msgstr "Click here to accept the invitation" msgid "Click here to confirm your account" msgstr "Click here to confirm your account" -#, fuzzy msgid "Click the link below to unlock your account" -msgstr "Click the link below to unlock your account:" +msgstr "Click the link below to unlock your account" msgid "Co-owner" msgstr "Co-owner" @@ -369,19 +374,14 @@ msgid "Comment" msgstr "Comment" -#, fuzzy msgid "Comment removed." -msgstr "Comment" +msgstr "Comment removed." msgid "Comment was successfully created." msgstr "Comment was successfully created." -#, fuzzy msgid "Comment was successfully saved." -msgstr "Comment was successfully created." - -msgid "Configure" -msgstr "Configure" +msgstr "Comment was successfully saved." msgid "Contact Email" msgstr "Contact Email" @@ -410,15 +410,6 @@ msgid "Customise" msgstr "Customise" -msgid "Customised" -msgstr "Customised" - -msgid "DMP access removed" -msgstr "DMP access removed" - -msgid "DMP permissions changed" -msgstr "DMP permissions changed" - msgid "Default" msgstr "Default" @@ -458,9 +449,6 @@ msgid "Dropdown" msgstr "Dropdown" -msgid "Duplicate column name. Please only include each column once." -msgstr "Duplicate column name. Please only include each column once." - msgid "E.g ORCID http://orcid.org/." msgstr "E.g ORCID http://orcid.org/." @@ -494,9 +482,8 @@ msgid "Edit template details" msgstr "Edit template details" -#, fuzzy msgid "Editor" -msgstr "Edit" +msgstr "Editor" msgid "Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access." msgstr "Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access." @@ -537,13 +524,11 @@ msgid "Export" msgstr "Export" -#, fuzzy msgid "Export settings updated successfully." -msgstr "Settings updated successfully" +msgstr "Export settings updated successfully." -#, fuzzy msgid "Exporting public plan is under development. Apologies for any inconvience." -msgstr "Export" +msgstr "Exporting public plan is under development. Apologies for any inconvience." msgid "Face" msgstr "Face" @@ -551,9 +536,6 @@ msgid "File Name" msgstr "File Name" -msgid "Filter" -msgstr "Filter" - msgid "Filter plans" msgstr "Filter plans" @@ -611,9 +593,8 @@ msgid "Guidance was successfully created." msgstr "Guidance was successfully created." -#, fuzzy msgid "Guidance was successfully deleted." -msgstr "Guidance was successfully created." +msgstr "Guidance was successfully deleted." msgid "Guidance was successfully updated." msgstr "Guidance was successfully updated." @@ -621,9 +602,8 @@ msgid "Hello" msgstr "Hello" -#, fuzzy msgid "Hello " -msgstr "Hello" +msgstr "Hello " msgid "Help" msgstr "Help" @@ -727,6 +707,9 @@ msgid "Main organisation" msgstr "Main organisation" +msgid "Many thanks," +msgstr "" + msgid "Margin" msgstr "Margin" @@ -853,6 +836,9 @@ msgid "Organization" msgstr "Organisation" +msgid "Original funder template has changed!" +msgstr "Original funder template has changed!" + msgid "Otherwise leave blank." msgstr "Otherwise leave blank." @@ -868,9 +854,8 @@ msgid "Password" msgstr "Password" -#, fuzzy msgid "Password and comfirmation must match" -msgstr "Password" +msgstr "Password and confirmation must match" msgid "Password confirmation" msgstr "Password confirmation" @@ -905,9 +890,8 @@ msgid "Plan was successfully created." msgstr "Plan was successfully created." -#, fuzzy msgid "Plan was successfully deleted." -msgstr "Plan was successfully created." +msgstr "Plan was successfully deleted." msgid "Plan was successfully updated." msgstr "Plan was successfully updated." @@ -945,9 +929,6 @@ msgid "Please fill in the basic project details below and click 'Update' to save" msgstr "Please fill in the basic project details below and click 'Update' to save" -msgid "Please follow the link above to login to " -msgstr "" - msgid "Please only enter up to 165 characters, you have used" msgstr "Please only enter up to 165 characters, you have used" @@ -990,12 +971,12 @@ msgid "Publish" msgstr "Publish" +msgid "Publish changes" +msgstr "Publish changes" + msgid "Published" msgstr "Published" -msgid "Published templates cannot be edited." -msgstr "Published templates cannot be edited." - msgid "Question" msgstr "Question" @@ -1060,10 +1041,10 @@ msgstr "Sections" msgid "Select Funder" -msgstr "Funder" +msgstr "Select Funder" msgid "Select Organisation" -msgstr "Organisation" +msgstr "Select Organisation" msgid "Select an action" msgstr "Select an action" @@ -1080,9 +1061,6 @@ msgid "Selected option(s)" msgstr "" -msgid "Settings - My plans" -msgstr "Settings - My plans" - msgid "Share" msgstr "Share" @@ -1113,10 +1091,13 @@ msgid "Size" msgstr "Size" -msgid "Someone has requested a link to change your" -msgstr "Someone has requested a link to change your" +msgid "Someone has requested a link to change your " +msgstr "Someone has requested a link to change your " -msgid "Successfully unlinked your account from %{is}" +msgid "Status" +msgstr "" + +msgid "Successfully unlinked your account from %{is}." msgstr "" msgid "Suggested answer" @@ -1158,25 +1139,27 @@ msgid "Text field" msgstr "Text field" -#, fuzzy msgid "Thank you for registering. Please confirm your email address" -msgstr "Thank you for registering at %{application_name}. Please confirm your email address:" - -msgid "Thanks" -msgstr "" +msgstr "Thank you for registering. Please confirm your email address" msgid "That email address is already registered." msgstr "That email address is already registered." +msgid "That template is not currently published." +msgstr "That template is not currently published." + +msgid "The " +msgstr "The " + +msgid "The edits in the box below will overwrite the existing answer from " +msgstr "The edits in the box below will overwrite the existing answer from " + msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." msgstr "The email address of an administrator at your organisation. Your users will use this address if they have questions." msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." msgstr "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." -msgid "The table below lists the available columns that can be shown on the 'My plans' list. Choose which you would like to appear." -msgstr "The table below lists the available columns that can be shown on the 'My plans' list. Choose which you would like to appear." - msgid "Themes" msgstr "Themes" @@ -1192,9 +1175,6 @@ msgid "These are the basic details for your organisation." msgstr "These are the basic details for your organisation." -msgid "This account does not have access to that plan." -msgstr "This account does not have access to that plan." - msgid "This allows you to order questions within a section." msgstr "This allows you to order questions within a section." @@ -1237,7 +1217,13 @@ msgid "Top banner text" msgstr "Top banner text" -msgid "Unable to unlinked your account from %{is}" +msgid "Un-published" +msgstr "Un-published" + +msgid "Unable to link your account to %{scheme}." +msgstr "" + +msgid "Unable to unlink your account from %{is}." msgstr "" msgid "Unknown column name." @@ -1261,15 +1247,21 @@ msgid "Unlock my account" msgstr "Unlock my account" +msgid "Unpublish" +msgstr "Unpublish" + +msgid "Unpublished" +msgstr "Unpublished" + +msgid "Unpublished changes" +msgstr "Unpublished changes" + msgid "Unsaved answers" msgstr "Unsaved answers" msgid "Unsaved changes" msgstr "Unsaved changes" -msgid "Update Customisation" -msgstr "Update Customisation" - msgid "Upload a new logo file" msgstr "Upload a new logo file" @@ -1303,6 +1295,9 @@ msgid "Website" msgstr "Website" +msgid "Welcome to " +msgstr "Welcome to " + msgid "Welcome to %{application_name}" msgstr "Welcome to %{application_name}" @@ -1312,15 +1307,15 @@ msgid "When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions." msgstr "When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions." +msgid "While you were editing " +msgstr "" + msgid "Would you like to save them now?" msgstr "Would you like to save them now?" msgid "Yes" msgstr "Yes" -msgid "Yes [Original Template Has Changed]" -msgstr "Yes [Original Template Has Changed]" - msgid "You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?" msgstr "You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?" @@ -1342,6 +1337,9 @@ msgid "You are not authorized to perform this action." msgstr "" +msgid "You are viewing a historical version of this template. You will not be able to make changes." +msgstr "You are viewing a historical version of this template. You will not be able to make changes." + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." @@ -1351,22 +1349,29 @@ msgid "You can edit any of the details below." msgstr "You can edit any of the details below." +msgid "You can not edit a historical version of this template." +msgstr "" + +msgid "You can not publish a historical version of this template." +msgstr "" + +msgid "You cannot delete historical versions of this template." +msgstr "" + msgid "You have altered answers but have not saved them:" msgstr "You have altered answers but have not saved them:" msgid "You have been given " msgstr "You have been given " -msgid "You have been given access to a Data Management Plan" -msgstr "You have been given access to a Data Management Plan" +msgid "You have been granted permission by your organisation to use our API. Your API token and instructions for using the API endpoints can be found " +msgstr "" -msgid "You have been granted permission by your organisation to use our API." -msgstr "You have been granted permission by your organisation to use our API." +msgid "You have un-published changes" +msgstr "" -#, fuzzy msgid "You have unsaved answers in the following sections:" msgstr "" -"You have unsaved answers in the following sections:\n" msgid "You may leave blank or select a different organisation to your own." msgstr "You may leave blank or select a different organisation to your own." @@ -1380,26 +1385,23 @@ msgid "You need to sign in or sign up before continuing." msgstr "You need to sign in or sign up before continuing." -#, fuzzy msgid "Your" -msgstr "Your " - -msgid "Your API token and instructions for using the API endpoints can be found here." -msgstr "Your API token and instructions for using the API endpoints can be found here." +msgstr "Your" msgid "Your ORCID" msgstr "Your ORCID" -#, fuzzy -msgid "Your access to" +msgid "Your access to " msgstr "Your access to " +msgid "Your account has been successfully linked to %{scheme}." +msgstr "Your account has been successfully linked to %{scheme}." + msgid "Your account is linked to your institutional credentials." msgstr "Your account is linked to your institutional credentials." -#, fuzzy msgid "Your account won't be created until you access the link above and set your password." -msgstr "Your " +msgstr "Your account won't be created until you access the link above and set your password." msgid "Your browser does not support the video tag." msgstr "Your browser does not support the video tag." @@ -1407,24 +1409,20 @@ msgid "Your password must contain at least 8 characters." msgstr "Your password must contain at least 8 characters." -#, fuzzy -msgid "Your password won't change until you access the link above and create a new one." -msgstr "Your " - -#, fuzzy -msgid "Your permissions relating to" +msgid "Your permissions relating to " msgstr "Your permissions relating to " -#, fuzzy -msgid "[Unpublished Changes]" -msgstr "Yes [Unpublished Changes]" +msgid "Your template has been published and is now available to users." +msgstr "Your template has been published and is now available to users." + +msgid "Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it" +msgstr "Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it" msgid "a day" msgstr "a day" -#, fuzzy msgid "about %d hours" -msgstr "about %{d} hours" +msgstr "about %d hours" msgid "about a minute" msgstr "about a minute" @@ -1438,12 +1436,20 @@ msgid "about an hour" msgstr "about an hour" -msgid "access." -msgstr "access." - -#, fuzzy msgid "account has been locked due to an excessive number of unsuccessful sign in attempts." -msgstr " account has been locked due to an excessive number of unsuccessful sign in attempts." +msgstr "account has been locked due to an excessive number of unsuccessful sign in attempts." + +msgid "activerecord.errors.messages.record_invalid" +msgstr "unable to save your changes" + +msgid "activerecord.errors.models.user.attributes.current_password.invalid" +msgstr "invalid email and/or password" + +msgid "activerecord.errors.models.user.attributes.email.blank" +msgstr "can't be blank" + +msgid "activerecord.errors.models.user.attributes.password.blank" +msgstr "can't be blank" msgid "add guidance text" msgstr "add guidance text" @@ -1454,13 +1460,11 @@ msgid "ago" msgstr "ago" -#, fuzzy msgid "answered" -msgstr "Answered " +msgstr "answered" -#, fuzzy -msgid "approx. %{space_used} of available space used (max %{num_pages} pages)" -msgstr "approx. %{space_used}% of available space used (max %{num_pages} pages)" +msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" +msgstr "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgid "by" msgstr "" @@ -1486,21 +1490,12 @@ msgid "guidance" msgstr "guidance" -#, fuzzy msgid "guidance group" -msgstr "Guidance group" +msgstr "guidance group" msgid "guidance on" msgstr "guidance on" -#, fuzzy -msgid "has been removed." -msgstr " has been removed." - -#, fuzzy -msgid "have changed. You now have" -msgstr " have changed. You now have " - msgid "height must be less than 100px" msgstr "" @@ -1516,76 +1511,59 @@ msgid "helpers.project.is_test_help_text" msgstr "" -#, fuzzy msgid "into your browser" -msgstr "into your browser)." +msgstr "into your browser" msgid "less than a minute" msgstr "less than a minute" -#, fuzzy msgid "must be logged in" -msgstr "Last logged in" +msgstr "must be logged in" -#, fuzzy msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" -msgstr "format" +msgstr "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgid "must be unique" msgstr "" -#, fuzzy msgid "must have access to guidances api" -msgstr " access to " +msgstr "must have access to guidances api" -#, fuzzy msgid "note" -msgstr "Note" +msgstr "note" -#, fuzzy msgid "or copy" -msgstr "(or copy" +msgstr "or copy" -#, fuzzy msgid "org_admin.templates.edit_phase_label" -msgstr "org_admin" +msgstr "" -#, fuzzy msgid "organisation" -msgstr "Organisation" +msgstr "organisation" -msgid "password. You can do this through the link below." -msgstr "password. You can do this through the link below." - -#, fuzzy msgid "phase" -msgstr "Phase" +msgstr "phase" -#, fuzzy msgid "plan" -msgstr "plans" +msgstr "plan" msgid "profile" msgstr "" -#, fuzzy msgid "question" -msgstr "Question" +msgstr "question" -#, fuzzy msgid "questions" -msgstr "Questions" +msgstr "questions" msgid "questions answered" msgstr "questions answered" -#, fuzzy msgid "role" -msgstr "Role" +msgstr "role" -#, fuzzy msgid "section" -msgstr "Section" +msgstr "section" msgid "select a guidance group" msgstr "select a guidance group" @@ -1593,13 +1571,11 @@ msgid "select at least one theme" msgstr "select at least one theme" -#, fuzzy msgid "suggested answer" -msgstr "Suggested answer" +msgstr "suggested answer" -#, fuzzy msgid "template" -msgstr "templates" +msgstr "template" msgid "user" msgstr "user" @@ -1615,13 +1591,3 @@ msgid "{\"Error\":\"You do not have authorisation to view this endpoint\"}" msgstr "{\"Error\":\"You do not have authorisation to view this endpoint\"}" - -# ActiveRecord model errors that we could not override in the model's validation definition -msgid "activerecord.errors.models.user.attributes.email.blank" -msgstr "can't be blank" -msgid "activerecord.errors.models.user.attributes.password.blank" -msgstr "can't be blank" -msgid "activerecord.errors.models.user.attributes.current_password.invalid" -msgstr "invalid email and/or password" -msgid "activerecord.errors.messages.record_invalid" -msgstr "unable to save your changes" diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po index 50f9e3e..99f6bcc 100644 --- a/config/locale/en_US/app.po +++ b/config/locale/en_US/app.po @@ -3,7 +3,6 @@ # This file is distributed under the same license as the app package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: app 1.0.0\n" @@ -23,80 +22,93 @@ msgid " - " msgstr " - " -#, fuzzy msgid " - choosing default template for your institution" -msgstr " - " +msgstr " - choosing default template for your institution" -#, fuzzy msgid " - no funder or institution template, choosing default template" -msgstr " - " +msgstr " - no funder or institution template, choosing default template" -#, fuzzy msgid " - there are more than one to choose from" -msgstr " - " +msgstr " - there are more than one to choose from" -#, fuzzy msgid " - using template customised by your institution" -msgstr " by " +msgstr " - using template customized by your institution" -#, fuzzy msgid " I accept the terms and conditions *" -msgstr " I accept the terms and conditions *" +msgstr " I accept the terms and conditions *" -#, fuzzy msgid " access to" -msgstr " access to " +msgstr " access to" -#, fuzzy msgid " by" -msgstr " by " +msgstr " by" msgid " by " msgstr " by " +msgid " has been removed by " +msgstr " has been removed by " + +msgid " have changed. " +msgstr " have changed. " + +msgid " into your browser)" +msgstr " into your browser)." + msgid " on " msgstr " on " -#, fuzzy +msgid " once you click save!" +msgstr " once you click save!" + +msgid " password. You can do this through the link below." +msgstr " password. You can do this through the link below." + +msgid " saved the following answer:" +msgstr " saved the following answer:" + msgid " team" -msgstr "am" +msgstr " team" -msgid " to view/edit the plan" -msgstr "" +msgid " to accept the invitation, (or copy " +msgstr " to accept the invitation, (or copy " -#, fuzzy -msgid "\"While you were editing #{answer.user.name} saved the following answer:\"" -msgstr "user" +msgid " will help you to develop your Data Management Plan. If you have any queries or feedback as you use the tool, please contact us on " +msgstr " will help you to develop your Data Management Plan. If you have any queries or feedback as you use the tool, please contact us on " -#, fuzzy +msgid "\"Are you sure you want to unlink your #{scheme.description} ID?\"" +msgstr "\"Are you sure you want to unlink your #{scheme.description} ID?\"" + +msgid "\"Unlink your account from #{scheme.description}. You can link again at any time.\"" +msgstr "\"Unlink your account from #{scheme.description}. You can link again at any time.\"" + +msgid "\"Your account has been linked to #{scheme.description}.\"" +msgstr "\"Your account has been linked to #{scheme.description}.\"" + msgid "%d days" -msgstr "%{d} days" +msgstr "%d days" -#, fuzzy msgid "%d minutes" -msgstr "%{d} minutes" +msgstr "%d minutes" -#, fuzzy msgid "%d months" -msgstr "%{d} months" +msgstr "%d months" -#, fuzzy msgid "%d years" -msgstr "%{d} years" +msgstr "%d years" msgid "%{application_name}" msgstr "%{application_name}" -#, fuzzy +msgid "%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
    * If you do not have an account with %{application_name}, please complete the form below.
    * If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
    Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly." +msgstr "%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
    * If you do not have an account with %{application_name}, please complete the form below.
    * If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
    Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly." + msgid "%{format} is not a valid exporting format. Available formats to export are %{available_formats}." -msgstr "format" +msgstr "%{format} is not a valid exporting format. Available formats to export are %{available_formats}." msgid "%{value} is not a valid format" msgstr "%{value} is not a valid format" -msgid "'name' must be included in column list." -msgstr "'name' must be included in column list." - msgid "(Using custom PDF formatting values)" msgstr "(Using custom PDF formatting values)" @@ -122,13 +134,13 @@ msgstr "

    The %{organisation_name} ('%{organisation_abbreviation}') are consortia supported by %{legal_entity}. Our primary constituency is the research community, particularly the higher and further education sector.

    %{application_name}

    %{application_name} ('the tool', 'the system') is a tool developed by the %{organisation_abbreviation} as a shared resource for the research community. It is hosted by %{legal_entity}.

    Your personal details

    In order to help identify and administer your account with %{application_name}, we need to store your email address. We may also use it to contact you to obtain feedback on your use of the tool, or to inform you of the latest developments or releases. The information may be transferred between the %{organisation_abbreviation} partner institutions but only for legitimate %{organisation_abbreviation} purposes. We will not sell, rent or trade any personal information you provide to us.

    Privacy policy

    The information you enter into this system can be seen by you, people you have chosen to share access with, and - solely for the purposes of maintaining the service - system administrators at %{legal_entity}. We compile anonymised, automated and aggregated information from plans, but we will not directly access, make use of, or share your content with anyone else without your permission. Authorised officers of your home institution may access your plans for specific purposes - for example, to track compliance with funder/institutional requirements or to calculate storage requirements.

    Freedom of Information

    %{legal_entity} holds your plans on your behalf, but they are your property and responsibility. Any FOI applicants will be referred back to your home institution.

    Passwords

    Your password is stored in encrypted form and cannot be retrieved. If forgotten it has to be reset.

    Cookies

    Please note that %{application_name} uses Cookies. Further information about Cookies and how we use them is available on the main DCC website.


    Use of the tool indicates that you understand and agree to these terms and conditions.

    " msgid "

    Useful resources on Data Management Planning

    Example Data Management Plans

    • Technical plan submitted to the AHRC [PDF, 7 pages]
      A DMP submitted by a researcher from the University of Bristol, also including comments from the reviewers
    • Two social science DMPs [PDF, 7 pages]
      Example plans from researchers at the University of Leeds, shared as part of the Leeds RoaDMaP training materials
    • Health sciences DMP [PDF, 11 pages]
      Example DMP produced by the DATUM for Health RDM training project
    • Psychology DMP [PDF, 11 pages]
      A very detailed, fictional psychology DMP produced by the DMTpsych RDM training project, based on a seminal psychology experiment
    • UCSD Example Data Management Plans [webpage]
      Over 20 example plans submitted to the National Science Foundation (NSF) in the United States by academics at UC San Diego
    • Colorado School of Mines examples [webpage]
      A variety of US example DMPs from Mines and elsewhere
    • NSF data management plans [webpage]
      5 DMPs submitted to the NSF, shared by the DataOne initiative
    • Biology and chemistry DMPs [webpage]
      Three example DMPs from the USA shared by NECDMC, an instructional tool for teaching RDM to undergraduates, graduate students, and researchers in the health sciences, sciences and engineering.

    Useful guides on Research Data Management in general

    • Managing and Sharing Data: best practice for researchers [PDF, 36 pages]
      A guide by the UK Data Service covering a range of topics including data formats, documentaion, ethics, copyright and data sharing.
    • How to Cite Datasets and Link to Publications [PDF, 12 pages]
      A guide by the Digital Curation Centre giving practical guidelines on how to cite data and the different tools and infrastructure that can be used to support data citation.
    • How to License Research Data [PDF, 16 pages]
      A guide by the Digital Curation Centre that outlines different types of licenses, the pros and cons of each and how they can be applied.
    • How to Appraise and Select Research Data for Curation [PDF, 8 pages]
      A guide by ANDS and the Digital Curation Centre on how to select which data to keep for long-term preservation, sharing and reuse. The guide puts forward several criteria to aid selection decisions.
    • Research Data MANTRA [online resource]
      An online training course designed for researchers or others planning to manage digital data as part of the research process. The course includes a number of software practicals on using SPSS, R, ArcGIS and NVivo.
    " -msgstr "

    Useful resources on Data Management Planning

    Example Data Management Plans

    • Technical plan submitted to the AHRC [PDF, 7 pages]
      A DMP submitted by a researcher from the University of Bristol, also including comments from the reviewers
    • Two social science DMPs [PDF, 7 pages]
      Example plans from researchers at the University of Leeds, shared as part of the Leeds RoaDMaP training materials
    • Health sciences DMP [PDF, 11 pages]
      Example DMP produced by the DATUM for Health RDM training project
    • Psychology DMP [PDF, 11 pages]
      A very detailed, fictional psychology DMP produced by the DMTpsych RDM training project, based on a seminal psychology experiment
    • UCSD Example Data Management Plans [webpage]
      Over 20 example plans submitted to the National Science Foundation (NSF) in the United States by academics at UC San Diego
    • Colorado School of Mines examples [webpage]
      A variety of US example DMPs from Mines and elsewhere
    • NSF data management plans [webpage]
      5 DMPs submitted to the NSF, shared by the DataOne initiative
    • Biology and chemistry DMPs [webpage]
      Three example DMPs from the USA shared by NECDMC, an instructional tool for teaching RDM to undergraduates, graduate students, and researchers in the health sciences, sciences and engineering.

    Useful guides on Research Data Management in general

    • Managing and Sharing Data: best practice for researchers [PDF, 36 pages]
      A guide by the UK Data Service covering a range of topics including data formats, documentaion, ethics, copyright and data sharing.
    • How to Cite Datasets and Link to Publications [PDF, 12 pages]
      A guide by the Digital Curation Centre giving practical guidelines on how to cite data and the different tools and infrastructure that can be used to support data citation.
    • How to License Research Data [PDF, 16 pages]
      A guide by the Digital Curation Centre that outlines different types of licenses, the pros and cons of each and how they can be applied.
    • How to Appraise and Select Research Data for Curation [PDF, 8 pages]
      A guide by ANDS and the %{organisation_abbreviation} on how to select which data to keep for long-term preservation, sharing and reuse. The guide puts forward several criteria to aid selection decisions.
    • Research Data MANTRA [online resource]
      An online training course designed for researchers or others planning to manage digital data as part of the research process. The course includes a number of software practicals on using SPSS, R, ArcGIS and NVivo.
    " +msgstr "

    Useful resources on Data Management Planning

    Example Data Management Plans

    • Technical plan submitted to the AHRC [PDF, 7 pages]
      A DMP submitted by a researcher from the University of Bristol, also including comments from the reviewers
    • Two social science DMPs [PDF, 7 pages]
      Example plans from researchers at the University of Leeds, shared as part of the Leeds RoaDMaP training materials
    • Health sciences DMP [PDF, 11 pages]
      Example DMP produced by the DATUM for Health RDM training project
    • Psychology DMP [PDF, 11 pages]
      A very detailed, fictional psychology DMP produced by the DMTpsych RDM training project, based on a seminal psychology experiment
    • UCSD Example Data Management Plans [webpage]
      Over 20 example plans submitted to the National Science Foundation (NSF) in the United States by academics at UC San Diego
    • Colorado School of Mines examples [webpage]
      A variety of US example DMPs from Mines and elsewhere
    • NSF data management plans [webpage]
      5 DMPs submitted to the NSF, shared by the DataOne initiative
    • Biology and chemistry DMPs [webpage]
      Three example DMPs from the USA shared by NECDMC, an instructional tool for teaching RDM to undergraduates, graduate students, and researchers in the health sciences, sciences and engineering.

    Useful guides on Research Data Management in general

    • Managing and Sharing Data: best practice for researchers [PDF, 36 pages]
      A guide by the UK Data Service covering a range of topics including data formats, documentaion, ethics, copyright and data sharing.
    • How to Cite Datasets and Link to Publications [PDF, 12 pages]
      A guide by the Digital Curation Centre giving practical guidelines on how to cite data and the different tools and infrastructure that can be used to support data citation.
    • How to License Research Data [PDF, 16 pages]
      A guide by the Digital Curation Centre that outlines different types of licenses, the pros and cons of each and how they can be applied.
    • How to Appraise and Select Research Data for Curation [PDF, 8 pages]
      A guide by ANDS and the Digital Curation Centre on how to select which data to keep for long-term preservation, sharing and reuse. The guide puts forward several criteria to aid selection decisions.
    • Research Data MANTRA [online resource]
      An online training course designed for researchers or others planning to manage digital data as part of the research process. The course includes a number of software practicals on using SPSS, R, ArcGIS and NVivo.
    " msgid "

    %{application_name} has been jointly developed by the %{organisation_name} to help you write data management plans.

    " msgstr "

    %{application_name} has been jointly developed by the %{organisation_name} to help you write data management plans.

    " msgid "

    %{application_name} is developed and maintained by the UK %{organisation_name}. We’re a small team, and are happy to collaborate with others. There are various ways you can get involved:

    Join the user group

    We run a listserv for the %{application_name} user group that you can request to join. We also host periodic meetings to consult on our plans. Being part of the user group gives you the opportunity to be informed about future developments and to provide feedback to help shape our plans.

    Our user group sessions are usually focused around a certain topic (e.g. fleshing out use cases for an API) so invites are sent based on your areas of expertise. It is helpful for us to know your role and interests to invite relevant people to each session. Please introduce yourself on the list and share your ideas.

    Notes from previous user group sessions are provided below:

    Please let us know your interests and share your ideas for future developments via the mailing list so the community as a whole can feedback on them.


    Customise %{application_name}

    %{application_name} can be customised by institutions and disciplines. You can add templates for users in your organisation and tailored guidance that explains local support and services. Example answers can also be offered to help users understand what to write in a Data Management Plan. To do this you’ll need to request admin access, so please email us on dmponline@dcc.ac.uk.

    Futher guidance on customising %{application_name} is available on the %{application_name} website.


    Contribute to the code

    %{application_name} is a Ruby on Rails application. The source code is made available under an MIT License. This permits others to reuse the code freely, but obligates you to share the source code for any extensions in the same way. Please inform us if you install an instance of %{application_name} and offer your contributions back to the community.

    If you install an instance of %{application_name} we require that you credit the %{organisation_abbreviation} as originators of the tool. We recommend that the acknowledgement takes the form of the %{application_name} logo with a link back to the %{organisation_abbreviation}-hosted version of the tool.

    We are willing to work with external developers to add new features to the tool. We are also open to delivering new features on a chargeable basis. If there are extensions you would like to see prioritised and have resource to support additional developer effort, please contact us on dmponline@dcc.ac.uk to negotiate terms.

    The code is available on GitHub

    Support our work

    We are impressed by the uptake of %{application_name} both in the UK and internationally and are really keen to hear how you are using the tool and promoting it in your context. We are aware that others have run training courses, developed guidance materials and advocated use of the tool. Please notify us of this as it helps to show impact.

    We are currently investigating options for revenue generation. This will help us serve the increased demand more effectively and safeguard the long-term sustainability of %{application_name}. Plans will be released for consultation soon but we also welcome your suggestions on how best to support our work.

    " -msgstr "

    %{application_name} is developed and maintained by the UK %{organisation_name}. We’re a small team, and are happy to collaborate with others. There are various ways you can get involved:

    Join the user group

    We run a listserv for the %{application_name} user group that you can request to join. We also host periodic meetings to consult on our plans. Being part of the user group gives you the opportunity to be informed about future developments and to provide feedback to help shape our plans.

    Our user group sessions are usually focused around a certain topic (e.g. fleshing out use cases for an API) so invites are sent based on your areas of expertise. It is helpful for us to know your role and interests to invite relevant people to each session. Please introduce yourself on the list and share your ideas.

    Notes from previous user group sessions are provided below:

    Please let us know your interests and share your ideas for future developments via the mailing list so the community as a whole can feedback on them.


    Customise %{application_name}

    %{application_name} can be customised by institutions and disciplines. You can add templates for users in your organisation and tailored guidance that explains local support and services. Example answers can also be offered to help users understand what to write in a Data Management Plan. To do this you’ll need to request admin access, so please email us on dmponline@dcc.ac.uk.

    Futher guidance on customising %{application_name} is available on the %{application_name} website.


    Contribute to the code

    %{application_name} is a Ruby on Rails application. The source code is made available under an MIT License. This permits others to reuse the code freely, but obligates you to share the source code for any extensions in the same way. Please inform us if you install an instance of %{application_name} and offer your contributions back to the community.

    If you install an instance of %{application_name} we require that you credit the %{organisation_abbreviation} as originators of the tool. We recommend that the acknowledgement takes the form of the %{application_name} logo with a link back to the %{organisation_abbreviation}-hosted version of the tool.

    We are willing to work with external developers to add new features to the tool. We are also open to delivering new features on a chargeable basis. If there are extensions you would like to see prioritised and have resource to support additional developer effort, please contact us on dmponline@dcc.ac.uk to negotiate terms.

    The code is available on GitHub

    Support our work

    We are impressed by the uptake of %{application_name} both in the UK and internationally and are really keen to hear how you are using the tool and promoting it in your context. We are aware that others have run training courses, developed guidance materials and advocated use of the tool. Please notify us of this as it helps to show impact.

    We are currently investigating options for revenue generation. This will help us serve the increased demand more effectively and safeguard the long-term sustainability of %{application_name}. Plans will be released for consultation soon but we also welcome your suggestions on how best to support our work.

    " +msgstr "

    %{application_name} is developed and maintained by the UK %{organisation_name}. We’re a small team, and are happy to collaborate with others. There are various ways you can get involved:

    Join the user group

    We run a listserv for the %{application_name} user group that you can request to join. We also host periodic meetings to consult on our plans. Being part of the user group gives you the opportunity to be informed about future developments and to provide feedback to help shape our plans.

    Our user group sessions are usually focused around a certain topic (e.g. fleshing out use cases for an API) so invites are sent based on your areas of expertise. It is helpful for us to know your role and interests to invite relevant people to each session. Please introduce yourself on the list and share your ideas.

    Notes from previous user group sessions are provided below:

    Please let us know your interests and share your ideas for future developments via the mailing list so the community as a whole can feedback on them.


    Customise %{application_name}

    %{application_name} can be customised by institutions and disciplines. You can add templates for users in your organization and tailored guidance that explains local support and services. Example answers can also be offered to help users understand what to write in a Data Management Plan. To do this you’ll need to request admin access, so please email us on dmponline@dcc.ac.uk.

    Futher guidance on customising %{application_name} is available on the %{application_name} website.


    Contribute to the code

    %{application_name} is a Ruby on Rails application. The source code is made available under an MIT License. This permits others to reuse the code freely, but obligates you to share the source code for any extensions in the same way. Please inform us if you install an instance of %{application_name} and offer your contributions back to the community.

    If you install an instance of %{application_name} we require that you credit the %{organisation_abbreviation} as originators of the tool. We recommend that the acknowledgement takes the form of the %{application_name} logo with a link back to the %{organisation_abbreviation}-hosted version of the tool.

    We are willing to work with external developers to add new features to the tool. We are also open to delivering new features on a chargeable basis. If there are extensions you would like to see prioritised and have resource to support additional developer effort, please contact us on dmponline@dcc.ac.uk to negotiate terms.

    The code is available on GitHub

    Support our work

    We are impressed by the uptake of %{application_name} both in the UK and internationally and are really keen to hear how you are using the tool and promoting it in your context. We are aware that others have run training courses, developed guidance materials and advocated use of the tool. Please notify us of this as it helps to show impact.

    We are currently investigating options for revenue generation. This will help us serve the increased demand more effectively and safeguard the long-term sustainability of %{application_name}. Plans will be released for consultation soon but we also welcome your suggestions on how best to support our work.

    " msgid "

    %{application_name} stories from the %{organisation_abbreviation} website


    " msgstr "

    %{application_name} stories from the %{organisation_abbreviation} website


    " @@ -146,7 +158,7 @@ msgstr "

    Funding bodies increasingly require their grant-holders to produce Data Management Plans(DMP), both during the bid-preparation stage and after funding has been secured. %{application_name} has been produced by the %{organisation_name} to help research teams respond to this requirement, and any expectations that their institution or others may apply.

    The %{organisation_abbreviation} worked closely with research funders and universities to produce a tool that assists researchers to produce an effective data management plan (DMP) to cater for the whole lifecycle of a project, from bid-preparation stage through to completion.


    How the tool works

    There are a number of templates within the tool that represent the requirements of different funders and institutions. Users are asked three questions at the outset so we can determine the appropriate template to display (e.g. the ESRC template when applying for an ESRC grant). Guidance is provided to help you interpret and answer the questions. This guidance is provided by researcher funders, universities and disciplines.


    Getting Started

    If you have an account please sign in and start creating or editing your DMP.

    If you do not have a %{application_name} account, click on 'Sign up' on the homepage.

    Please visit the 'Help' page for guidance.


    Additional Information

    We are constantly improving the user interface and functionality of %{application_name}. If you would like to contribute with feedback and suggestions, please contact us by emailing dmponline@dcc.ac.uk. You can also report bugs and request new features directly on GitHub

    " msgid "

    Here you can view previously published versions of your template. These can no longer be modified.

    " -msgstr "" +msgstr "

    Here you can view previously published versions of your template. These can no longer be modified.

    " msgid "

    Here you set the title that users will see. If you intend to have multiple phases for you DMP, this should be clear in the title and description.

    " msgstr "

    Here you set the title that users will see. If you intend to have multiple phases for you DMP, this should be clear in the title and description.

    " @@ -157,9 +169,8 @@ msgid "

    Please note that your email address is used as your username. If you change this, remember to use your new email address on sign in.

    " msgstr "

    Please note that your email address is used as your username. If you change this, remember to use your new email address on sign in.

    " -#, fuzzy msgid "

    Please select from the following drop-down so we can determine what questions and guidance should be displayed in your plan.

    " -msgstr "guidance" +msgstr "

    Please select from the following drop-down so we can determine what questions and guidance should be displayed in your plan.

    " msgid "

    Please select from the following drop-downs so we can determine what questions and guidance should be displayed in your plan.

    If you aren't responding to specific requirements from a funder or an institution, select here to write a generic DMP based on the most common themes.

    " msgstr "

    Please select from the following drop-downs so we can determine what questions and guidance should be displayed in your plan.

    If you aren't responding to specific requirements from a funder or an institution, select here to write a generic DMP based on the most common themes.

    " @@ -168,7 +179,7 @@ msgstr "

    Select themes that are relevant to this question.

    This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for.

    You can select multiple themes by using the CTRL button.

    " msgid "

    The %{organisation_abbreviation} are now collaborating to develop a joint codebase for Data Management Planning called DMP Roadmap. Both of our tools will be delivered using this in the future. We've agreed what features need to be included and are planning a few sprints to deliver these. The initial release will include all of the main priorities we already had flagged, including:

    • - APIs to create plans, extract guidance and generate statistics from %{application_name}
    • - Multi-lingual support so foreign language versions can be presented
    • - Locales to provide a refined set of content for particular countries or other contexts
    • - A lifecycle to indicate the status of DMPs and allow institutional access to plans
    • - Support for reviewing Data Management Plans

    %{application_name} has an active and growing user base, and we are grateful to the members who suggest ideas for new and improved features. If you would like to help shape our future plans, please join the user group. More information on how you can engage with us is available under the 'Get involved' tab.


    Current release

    The current version of %{application_name} is %{application_version}.

    The code is available on GitHub


    " -msgstr "

    The %{organisation_abbreviation} are now collaborating to develop a joint codebase for Data Management Planning called DMP Roadmap. Both of our tools will be delivered using this in the future. We've agreed what features need to be included and are planning a few sprints to deliver these. The initial release will include all of the main priorities we already had flagged, including:

    • - APIs to create plans, extract guidance and generate statistics from %{application_name}
    • - Multi-lingual support so foreign language versions can be presented
    • - Locales to provide a refined set of content for particular countries or other contexts
    • - A lifecycle to indicate the status of DMPs and allow institutional access to plans
    • - Support for reviewing Data Management Plans

    %{application_name} has an active and growing user base, and we are grateful to the members who suggest ideas for new and improved features. If you would like to help shape our future plans, please join the user group. More information on how you can engage with us is available under the 'Get involved' tab.


    Current release

    The current version of %{application_name} is %{application_version}.

    The code is available on GitHub


    " +msgstr "

    The %{organisation_abbreviation} are now collaborating to develop a joint codebase for Data Management Planning called DMP Roadmap. Both of our tools will be delivered using this in the future. We've agreed what features need to be included and are planning a few sprints to deliver these. The initial release will include all of the main priorities we already had flagged, including:

    • - APIs to create plans, extract guidance and generate statistics from %{application_name}
    • - Multi-lingual support so foreign language versions can be presented
    • - Locales to provide a refined set of content for particular countries or other contexts
    • - A lifecycle to indicate the status of DMPs and allow institutional access to plans
    • - Support for reviewing Data Management Plans

    %{application_name} has an active and growing user base, and we are grateful to the members who suggest ideas for new and improved features. If you would like to help shape our future plans, please join the user group. More information on how you can engage with us is available under the 'Get involved' tab.


    Current release

    The current version of %{application_name} is %{application_version}.

    The code is available on GitHub


    " msgid "

    The table below lists the plans that you have created, and any that have been shared with you by others.
    These can be edited, shared, exported or deleted at anytime.

    " msgstr "

    The table below lists the plans that you have created, and any that have been shared with you by others.
    These can be edited, shared, exported or deleted at anytime.

    " @@ -182,17 +193,14 @@ msgid "

    You are about to unlink %{application_name} of your institutional credentials, would you like to continue?

    " msgstr "

    You are about to unlink %{application_name} of your institutional credentials, would you like to continue?

    " -#, fuzzy msgid "

    You can give other people access to your plan here. There are three permission levels.

    • Users with \"read only\" access can only read the plan.
    • Editors can contribute to the plan.
    • Co-owners can also contribute to the plan, but additionally can edit the plan details and control access to the plan.

    Add each collaborator in turn by entering their email address below, choosing a permission level and clicking \"Add collaborator\".

    Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don't already have an account. A notification is also issued when a user's permission level is changed.

    " -msgstr "

    You can give other people access to your plan here. There are three permission levels.

    • Users with \"read only\" access can only read the plan.
    • Editors can contribute to the plan.
    • Co-owners can also contribute to the plan, but additionally can edit the plan details and control access to the plan.

    Add each collaborator in turn by entering their email address below, choosing a permission level and clicking \"Add collaborator\".

    Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don\\'t already have an account. A notification is also issued when a user\\'s permission level is changed.

    " +msgstr "

    You can give other people access to your plan here. There are three permission levels.

    • Users with \"read only\" access can only read the plan.
    • Editors can contribute to the plan.
    • Co-owners can also contribute to the plan, but additionally can edit the plan details and control access to the plan.

    Add each collaborator in turn by entering their email address below, choosing a permission level and clicking \"Add collaborator\".

    Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don't already have an account. A notification is also issued when a user's permission level is changed.

    " -#, fuzzy msgid "

    You can write pieces of guidance to be displayed by theme (e.g. generic guidance on storage and backup that should present across the board). Writing generic guidance by theme saves you time and effort as your advice will be automatically displayed across all templates rather than having to write guidance to accompany each.

    If you do have a need to provide guidance for specific funders that would not be useful to a wider audience (e.g. if you have specific instructions for applicants to BBSRC for example), you can do so by adding guidance to a specific question when you edit your template.

    " -msgstr "guidance on" +msgstr "

    You can write pieces of guidance to be displayed by theme (e.g. generic guidance on storage and backup that should present across the board). Writing generic guidance by theme saves you time and effort as your advice will be automatically displayed across all templates rather than having to write guidance to accompany each.

    If you do have a need to provide guidance for specific funders that would not be useful to a wider audience (e.g. if you have specific instructions for applicants to BBSRC for example), you can do so by adding guidance to a specific question when you edit your template.

    " -#, fuzzy msgid "A colleague has invited you to contribute to their Data Management Plan at " -msgstr "A colleague has invited you to contribute to their Data Management Plan at" +msgstr "A colleague has invited you to contribute to their Data Management Plan at " msgid "A pertinent ID as determined by the funder and/or institution." msgstr "A pertinent ID as determined by the funder and/or institution." @@ -203,9 +211,6 @@ msgid "API Information" msgstr "API Information" -msgid "API Permission Granted" -msgstr "API Permission Granted" - msgid "API token" msgstr "API token" @@ -263,12 +268,14 @@ msgid "Admin area" msgstr "Admin area" +msgid "All the best," +msgstr "" + msgid "An error has occurred while saving/resetting your export settings." msgstr "" -#, fuzzy msgid "Answer" -msgstr "Answers" +msgstr "Answer" msgid "Answer format" msgstr "Answer format" @@ -276,17 +283,14 @@ msgid "Answer questions" msgstr "Answer questions" -#, fuzzy msgid "Answered" -msgstr "Answered " +msgstr "Answered" -#, fuzzy msgid "Answered at" -msgstr "Answered " +msgstr "Answered at" -#, fuzzy msgid "Answered by" -msgstr "Answered " +msgstr "Answered by" msgid "Answers" msgstr "Answers" @@ -294,9 +298,8 @@ msgid "Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here." msgstr "Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here." -#, fuzzy msgid "Are you sure you want to remove this note?" -msgstr "Are you sure you would like to remove this note?" +msgstr "Are you sure you want to remove this note?" msgid "Are you sure you wish to delete this plan? If the plan is being shared with other users, by deleting it from your list, the plan will be deleted from their plan list as well" msgstr "Are you sure you wish to delete this plan? If the plan is being shared with other users, by deleting it from your list, the plan will be deleted from their plan list as well" @@ -332,11 +335,10 @@ msgstr "Cancel" msgid "Change language" -msgstr "" +msgstr "Change language" -#, fuzzy msgid "Change my password" -msgstr "Change your password" +msgstr "Change my password" msgid "Check box" msgstr "Check box" @@ -347,15 +349,17 @@ msgid "Choose a template" msgstr "Choose a template" +msgid "Click here" +msgstr "" + msgid "Click here to accept the invitation" msgstr "Click here to accept the invitation" msgid "Click here to confirm your account" msgstr "Click here to confirm your account" -#, fuzzy msgid "Click the link below to unlock your account" -msgstr "Click the link below to unlock your account:" +msgstr "Click the link below to unlock your account" msgid "Co-owner" msgstr "Co-owner" @@ -369,19 +373,14 @@ msgid "Comment" msgstr "Comment" -#, fuzzy msgid "Comment removed." -msgstr "Comment" +msgstr "Comment removed." msgid "Comment was successfully created." -msgstr "" +msgstr "Comment was successfully created." -#, fuzzy msgid "Comment was successfully saved." -msgstr "Project was successfully created." - -msgid "Configure" -msgstr "Configure" +msgstr "Comment was successfully saved." msgid "Contact Email" msgstr "Contact Email" @@ -410,15 +409,6 @@ msgid "Customise" msgstr "Customise" -msgid "Customised" -msgstr "" - -msgid "DMP access removed" -msgstr "DMP access removed" - -msgid "DMP permissions changed" -msgstr "DMP permissions changed" - msgid "Default" msgstr "Default" @@ -458,9 +448,6 @@ msgid "Dropdown" msgstr "Dropdown" -msgid "Duplicate column name. Please only include each column once." -msgstr "Duplicate column name. Please only include each column once." - msgid "E.g ORCID http://orcid.org/." msgstr "E.g ORCID http://orcid.org/." @@ -494,9 +481,8 @@ msgid "Edit template details" msgstr "Edit template details" -#, fuzzy msgid "Editor" -msgstr "Edit" +msgstr "Editor" msgid "Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access." msgstr "Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access." @@ -537,13 +523,11 @@ msgid "Export" msgstr "Export" -#, fuzzy msgid "Export settings updated successfully." -msgstr "Settings updated successfully" +msgstr "Export settings updated successfully." -#, fuzzy msgid "Exporting public plan is under development. Apologies for any inconvience." -msgstr "Export" +msgstr "Exporting public plan is under development. Apologies for any inconvience." msgid "Face" msgstr "Face" @@ -551,9 +535,6 @@ msgid "File Name" msgstr "File Name" -msgid "Filter" -msgstr "Filter" - msgid "Filter plans" msgstr "Filter plans" @@ -611,9 +592,8 @@ msgid "Guidance was successfully created." msgstr "Guidance was successfully created." -#, fuzzy msgid "Guidance was successfully deleted." -msgstr "Guidance was successfully created." +msgstr "Guidance was successfully deleted." msgid "Guidance was successfully updated." msgstr "Guidance was successfully updated." @@ -621,15 +601,14 @@ msgid "Hello" msgstr "Hello" -#, fuzzy msgid "Hello " -msgstr "Hello" +msgstr "Hello " msgid "Help" msgstr "Help" msgid "History" -msgstr "" +msgstr "History" msgid "Home" msgstr "Home" @@ -698,7 +677,7 @@ msgstr "Invitation issued successfully." msgid "Language" -msgstr "" +msgstr "Language" msgid "Last logged in" msgstr "Last logged in" @@ -727,6 +706,9 @@ msgid "Main organisation" msgstr "Main organization" +msgid "Many thanks," +msgstr "" + msgid "Margin" msgstr "Margin" @@ -830,7 +812,7 @@ msgstr "Order of display" msgid "Organisation" -msgstr "Organisation" +msgstr "Organization" msgid "Organisation details" msgstr "Organization details" @@ -853,6 +835,9 @@ msgid "Organization" msgstr "Organization" +msgid "Original funder template has changed!" +msgstr "Original funder template has changed!" + msgid "Otherwise leave blank." msgstr "Otherwise leave blank." @@ -868,9 +853,8 @@ msgid "Password" msgstr "Password" -#, fuzzy msgid "Password and comfirmation must match" -msgstr "Password" +msgstr "Password and confirmation must match" msgid "Password confirmation" msgstr "Password confirmation" @@ -885,7 +869,7 @@ msgstr "Plan Data Contact" msgid "Plan Description" -msgstr "Description" +msgstr "Plan Description" msgid "Plan ID" msgstr "Plan ID" @@ -905,9 +889,8 @@ msgid "Plan was successfully created." msgstr "Plan was successfully created." -#, fuzzy msgid "Plan was successfully deleted." -msgstr "Plan was successfully created." +msgstr "Plan was successfully deleted." msgid "Plan was successfully updated." msgstr "Plan was successfully updated." @@ -945,9 +928,6 @@ msgid "Please fill in the basic project details below and click 'Update' to save" msgstr "Please fill in the basic project details below and click 'Update' to save" -msgid "Please follow the link above to login to " -msgstr "" - msgid "Please only enter up to 165 characters, you have used" msgstr "Please only enter up to 165 characters, you have used" @@ -990,12 +970,12 @@ msgid "Publish" msgstr "Publish" +msgid "Publish changes" +msgstr "Publish changes" + msgid "Published" msgstr "Published" -msgid "Published templates cannot be edited." -msgstr "" - msgid "Question" msgstr "Question" @@ -1060,10 +1040,10 @@ msgstr "Sections" msgid "Select Funder" -msgstr "Funder" +msgstr "Select Funder" msgid "Select Organisation" -msgstr "Organisation" +msgstr "Select Organization" msgid "Select an action" msgstr "Select an action" @@ -1080,9 +1060,6 @@ msgid "Selected option(s)" msgstr "" -msgid "Settings - My plans" -msgstr "Settings - My plans" - msgid "Share" msgstr "Share" @@ -1113,10 +1090,13 @@ msgid "Size" msgstr "Size" -msgid "Someone has requested a link to change your" -msgstr "Someone has requested a link to change your" +msgid "Someone has requested a link to change your " +msgstr "Someone has requested a link to change your " -msgid "Successfully unlinked your account from %{is}" +msgid "Status" +msgstr "" + +msgid "Successfully unlinked your account from %{is}." msgstr "" msgid "Suggested answer" @@ -1132,7 +1112,7 @@ msgstr "Template" msgid "Template History" -msgstr "" +msgstr "Template History" msgid "Template details" msgstr "Template details" @@ -1158,25 +1138,27 @@ msgid "Text field" msgstr "Text field" -#, fuzzy msgid "Thank you for registering. Please confirm your email address" -msgstr "Thank you for registering at %{application_name}. Please confirm your email address:" - -msgid "Thanks" -msgstr "" +msgstr "Thank you for registering. Please confirm your email address" msgid "That email address is already registered." msgstr "That email address is already registered." +msgid "That template is not currently published." +msgstr "That template is not currently published." + +msgid "The " +msgstr "The " + +msgid "The edits in the box below will overwrite the existing answer from " +msgstr "The edits in the box below will overwrite the existing answer from " + msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." msgstr "The email address of an administrator at your organization. Your users will use this address if they have questions." msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." msgstr "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." -msgid "The table below lists the available columns that can be shown on the 'My plans' list. Choose which you would like to appear." -msgstr "The table below lists the available columns that can be shown on the 'My plans' list. Choose which you would like to appear." - msgid "Themes" msgstr "Themes" @@ -1192,9 +1174,6 @@ msgid "These are the basic details for your organisation." msgstr "These are the basic details for your organization." -msgid "This account does not have access to that plan." -msgstr "This account does not have access to that plan." - msgid "This allows you to order questions within a section." msgstr "This allows you to order questions within a section." @@ -1237,7 +1216,13 @@ msgid "Top banner text" msgstr "Top banner text" -msgid "Unable to unlinked your account from %{is}" +msgid "Un-published" +msgstr "Un-published" + +msgid "Unable to link your account to %{scheme}." +msgstr "" + +msgid "Unable to unlink your account from %{is}." msgstr "" msgid "Unknown column name." @@ -1261,15 +1246,21 @@ msgid "Unlock my account" msgstr "Unlock my account" +msgid "Unpublish" +msgstr "Unpublish" + +msgid "Unpublished" +msgstr "Unpublished" + +msgid "Unpublished changes" +msgstr "Unpublished changes" + msgid "Unsaved answers" msgstr "Unsaved answers" msgid "Unsaved changes" msgstr "Unsaved changes" -msgid "Update Customisation" -msgstr "" - msgid "Upload a new logo file" msgstr "Upload a new logo file" @@ -1303,6 +1294,9 @@ msgid "Website" msgstr "Website" +msgid "Welcome to " +msgstr "Welcome to " + msgid "Welcome to %{application_name}" msgstr "Welcome to %{application_name}" @@ -1312,15 +1306,15 @@ msgid "When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions." msgstr "When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions." +msgid "While you were editing " +msgstr "" + msgid "Would you like to save them now?" msgstr "Would you like to save them now?" msgid "Yes" msgstr "Yes" -msgid "Yes [Original Template Has Changed]" -msgstr "" - msgid "You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?" msgstr "You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?" @@ -1342,6 +1336,9 @@ msgid "You are not authorized to perform this action." msgstr "" +msgid "You are viewing a historical version of this template. You will not be able to make changes." +msgstr "You are viewing a historical version of this template. You will not be able to make changes." + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." @@ -1351,22 +1348,29 @@ msgid "You can edit any of the details below." msgstr "You can edit any of the details below." +msgid "You can not edit a historical version of this template." +msgstr "" + +msgid "You can not publish a historical version of this template." +msgstr "" + +msgid "You cannot delete historical versions of this template." +msgstr "" + msgid "You have altered answers but have not saved them:" msgstr "You have altered answers but have not saved them:" msgid "You have been given " msgstr "You have been given " -msgid "You have been given access to a Data Management Plan" -msgstr "You have been given access to a Data Management Plan" +msgid "You have been granted permission by your organisation to use our API. Your API token and instructions for using the API endpoints can be found " +msgstr "You have been granted permission by your organization to use our API. Your API token and instructions for using the API endpoints can be found " -msgid "You have been granted permission by your organisation to use our API." -msgstr "You have been granted permission by your organization to use our API." +msgid "You have un-published changes" +msgstr "" -#, fuzzy msgid "You have unsaved answers in the following sections:" msgstr "" -"You have unsaved answers in the following sections:\n" msgid "You may leave blank or select a different organisation to your own." msgstr "You may leave blank or select a different organization to your own." @@ -1380,26 +1384,23 @@ msgid "You need to sign in or sign up before continuing." msgstr "You need to sign in or sign up before continuing." -#, fuzzy msgid "Your" -msgstr "Your " - -msgid "Your API token and instructions for using the API endpoints can be found here." -msgstr "Your API token and instructions for using the API endpoints can be found here." +msgstr "Your" msgid "Your ORCID" msgstr "Your ORCID" -#, fuzzy -msgid "Your access to" +msgid "Your access to " msgstr "Your access to " +msgid "Your account has been successfully linked to %{scheme}." +msgstr "Your account has been successfully linked to %{scheme}." + msgid "Your account is linked to your institutional credentials." msgstr "Your account is linked to your institutional credentials." -#, fuzzy msgid "Your account won't be created until you access the link above and set your password." -msgstr "Your " +msgstr "Your account won't be created until you access the link above and set your password." msgid "Your browser does not support the video tag." msgstr "Your browser does not support the video tag." @@ -1407,23 +1408,20 @@ msgid "Your password must contain at least 8 characters." msgstr "Your password must contain at least 8 characters." -#, fuzzy -msgid "Your password won't change until you access the link above and create a new one." -msgstr "Your " - -#, fuzzy -msgid "Your permissions relating to" +msgid "Your permissions relating to " msgstr "Your permissions relating to " -msgid "[Unpublished Changes]" -msgstr "" +msgid "Your template has been published and is now available to users." +msgstr "Your template has been published and is now available to users." + +msgid "Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it" +msgstr "Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it" msgid "a day" msgstr "a day" -#, fuzzy msgid "about %d hours" -msgstr "about %{d} hours" +msgstr "about %d hours" msgid "about a minute" msgstr "about a minute" @@ -1437,12 +1435,20 @@ msgid "about an hour" msgstr "about an hour" -msgid "access." -msgstr "access." - -#, fuzzy msgid "account has been locked due to an excessive number of unsuccessful sign in attempts." -msgstr " account has been locked due to an excessive number of unsuccessful sign in attempts." +msgstr "account has been locked due to an excessive number of unsuccessful sign in attempts." + +msgid "activerecord.errors.messages.record_invalid" +msgstr "unable to save your changes" + +msgid "activerecord.errors.models.user.attributes.current_password.invalid" +msgstr "invalid email and/or password" + +msgid "activerecord.errors.models.user.attributes.email.blank" +msgstr "can't be blank" + +msgid "activerecord.errors.models.user.attributes.password.blank" +msgstr "can't be blank" msgid "add guidance text" msgstr "add guidance text" @@ -1453,13 +1459,11 @@ msgid "ago" msgstr "ago" -#, fuzzy msgid "answered" -msgstr "Answered " +msgstr "answered" -#, fuzzy -msgid "approx. %{space_used} of available space used (max %{num_pages} pages)" -msgstr "approx. %{space_used}% of available space used (max %{num_pages} pages)" +msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" +msgstr "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgid "by" msgstr "" @@ -1485,21 +1489,12 @@ msgid "guidance" msgstr "guidance" -#, fuzzy msgid "guidance group" -msgstr "Guidance group" +msgstr "guidance group" msgid "guidance on" msgstr "guidance on" -#, fuzzy -msgid "has been removed." -msgstr " has been removed." - -#, fuzzy -msgid "have changed. You now have" -msgstr " have changed. You now have " - msgid "height must be less than 100px" msgstr "" @@ -1515,76 +1510,59 @@ msgid "helpers.project.is_test_help_text" msgstr "" -#, fuzzy msgid "into your browser" -msgstr "into your browser)." +msgstr "into your browser" msgid "less than a minute" msgstr "less than a minute" -#, fuzzy msgid "must be logged in" -msgstr "Last logged in" +msgstr "must be logged in" -#, fuzzy msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" -msgstr "format" +msgstr "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgid "must be unique" msgstr "" -#, fuzzy msgid "must have access to guidances api" -msgstr " access to " +msgstr "must have access to guidances api" -#, fuzzy msgid "note" -msgstr "Note" +msgstr "note" -#, fuzzy msgid "or copy" -msgstr "(or copy" +msgstr "or copy" -#, fuzzy msgid "org_admin.templates.edit_phase_label" -msgstr "org_admin" +msgstr "" -#, fuzzy msgid "organisation" -msgstr "Organisation" +msgstr "organization" -msgid "password. You can do this through the link below." -msgstr "password. You can do this through the link below." - -#, fuzzy msgid "phase" -msgstr "Phase" +msgstr "phase" -#, fuzzy msgid "plan" -msgstr "plans" +msgstr "plan" msgid "profile" msgstr "" -#, fuzzy msgid "question" -msgstr "Question" +msgstr "question" -#, fuzzy msgid "questions" -msgstr "Questions" +msgstr "questions" msgid "questions answered" msgstr "questions answered" -#, fuzzy msgid "role" -msgstr "Role" +msgstr "role" -#, fuzzy msgid "section" -msgstr "Section" +msgstr "section" msgid "select a guidance group" msgstr "select a guidance group" @@ -1592,13 +1570,11 @@ msgid "select at least one theme" msgstr "select at least one theme" -#, fuzzy msgid "suggested answer" -msgstr "Suggested answer" +msgstr "suggested answer" -#, fuzzy msgid "template" -msgstr "templates" +msgstr "template" msgid "user" msgstr "user" @@ -1614,13 +1590,3 @@ msgid "{\"Error\":\"You do not have authorisation to view this endpoint\"}" msgstr "{\"Error\":\"You do not have authorisation to view this endpoint\"}" - -# ActiveRecord model errors that we could not override in the model's validation definition -msgid "activerecord.errors.models.user.attributes.email.blank" -msgstr "can't be blank" -msgid "activerecord.errors.models.user.attributes.password.blank" -msgstr "can't be blank" -msgid "activerecord.errors.models.user.attributes.current_password.invalid" -msgstr "invalid email and/or password" -msgid "activerecord.errors.messages.record_invalid" -msgstr "unable to save your changes" diff --git a/config/locale/es/app.po b/config/locale/es/app.po index ecd8fbf..514f582 100644 --- a/config/locale/es/app.po +++ b/config/locale/es/app.po @@ -3,7 +3,6 @@ # This file is distributed under the same license as the app package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: app 1.0.0\n" @@ -50,19 +49,47 @@ msgid " by " msgstr " por " +#, fuzzy +msgid " has been removed by " +msgstr " por " + +msgid " have changed. " +msgstr "" + +msgid " into your browser)" +msgstr "" + msgid " on " msgstr "" +msgid " once you click save!" +msgstr "" + +msgid " password. You can do this through the link below." +msgstr "" + +msgid " saved the following answer:" +msgstr "" + #, fuzzy msgid " team" msgstr "am" -msgid " to view/edit the plan" +msgid " to accept the invitation, (or copy " +msgstr "" + +msgid " will help you to develop your Data Management Plan. If you have any queries or feedback as you use the tool, please contact us on " msgstr "" #, fuzzy -msgid "\"While you were editing #{answer.user.name} saved the following answer:\"" -msgstr "user" +msgid "\"Are you sure you want to unlink your #{scheme.description} ID?\"" +msgstr "ID" + +msgid "\"Unlink your account from #{scheme.description}. You can link again at any time.\"" +msgstr "" + +msgid "\"Your account has been linked to #{scheme.description}.\"" +msgstr "" msgid "%d days" msgstr "" @@ -79,15 +106,16 @@ msgid "%{application_name}" msgstr "DMPonline" +#, fuzzy +msgid "%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
    * If you do not have an account with %{application_name}, please complete the form below.
    * If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
    Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly." +msgstr "DMPonline" + msgid "%{format} is not a valid exporting format. Available formats to export are %{available_formats}." msgstr "" msgid "%{value} is not a valid format" msgstr "" -msgid "'name' must be included in column list." -msgstr "'nombre' tiene que estar en la lista de columnas." - msgid "(Using custom PDF formatting values)" msgstr "(Usando valores personalizados para el formato del PDF)" @@ -193,9 +221,6 @@ msgid "API Information" msgstr "" -msgid "API Permission Granted" -msgstr "" - msgid "API token" msgstr "" @@ -253,6 +278,9 @@ msgid "Admin area" msgstr "Área de administración" +msgid "All the best," +msgstr "" + msgid "An error has occurred while saving/resetting your export settings." msgstr "" @@ -337,6 +365,9 @@ msgid "Choose a template" msgstr "" +msgid "Click here" +msgstr "" + msgid "Click here to accept the invitation" msgstr "" @@ -369,9 +400,6 @@ msgid "Comment was successfully saved." msgstr "Plan creado con éxito" -msgid "Configure" -msgstr "Configuración" - msgid "Contact Email" msgstr "" @@ -399,15 +427,6 @@ msgid "Customise" msgstr "Personalizar" -msgid "Customised" -msgstr "" - -msgid "DMP access removed" -msgstr "" - -msgid "DMP permissions changed" -msgstr "" - msgid "Default" msgstr "Por defecto" @@ -447,9 +466,6 @@ msgid "Dropdown" msgstr "Dropdown" -msgid "Duplicate column name. Please only include each column once." -msgstr "Nombre de columna duplicado. Por favor, indique cada columna sólo una vez." - msgid "E.g ORCID http://orcid.org/." msgstr "P.e. ORCID http://orcid.org/." @@ -540,9 +556,6 @@ msgid "File Name" msgstr "Título del plan" -msgid "Filter" -msgstr "Filtrar" - msgid "Filter plans" msgstr "Filtro de planes" @@ -715,6 +728,9 @@ msgid "Main organisation" msgstr "Entidad principal" +msgid "Many thanks," +msgstr "" + msgid "Margin" msgstr "Margen" @@ -841,6 +857,10 @@ msgid "Organization" msgstr "Organización" +#, fuzzy +msgid "Original funder template has changed!" +msgstr "templates" + msgid "Otherwise leave blank." msgstr "Si no, déjelo en blanco." @@ -933,9 +953,6 @@ msgid "Please fill in the basic project details below and click 'Update' to save" msgstr "Por favor, rellene los detalles básicos del proyecto y haga clic en 'Actualizar' para guardarlos" -msgid "Please follow the link above to login to " -msgstr "" - msgid "Please only enter up to 165 characters, you have used" msgstr "" @@ -978,12 +995,12 @@ msgid "Publish" msgstr "" +msgid "Publish changes" +msgstr "" + msgid "Published" msgstr "Publicado" -msgid "Published templates cannot be edited." -msgstr "" - msgid "Question" msgstr "Pregunta" @@ -1068,9 +1085,6 @@ msgid "Selected option(s)" msgstr "" -msgid "Settings - My plans" -msgstr "Preferencias - Mis planes" - msgid "Share" msgstr "Compartir" @@ -1101,10 +1115,13 @@ msgid "Size" msgstr "Tamaño" -msgid "Someone has requested a link to change your" +msgid "Someone has requested a link to change your " msgstr "" -msgid "Successfully unlinked your account from %{is}" +msgid "Status" +msgstr "" + +msgid "Successfully unlinked your account from %{is}." msgstr "" msgid "Suggested answer" @@ -1149,10 +1166,17 @@ msgid "Thank you for registering. Please confirm your email address" msgstr "" -msgid "Thanks" +msgid "That email address is already registered." msgstr "" -msgid "That email address is already registered." +#, fuzzy +msgid "That template is not currently published." +msgstr "templates" + +msgid "The " +msgstr "" + +msgid "The edits in the box below will overwrite the existing answer from " msgstr "" msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." @@ -1161,9 +1185,6 @@ msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." msgstr "Los items que seleccione se mostarán en la siguiente tabla. Puede ordenar los datos según sus encabezados o filtrar tecleando textos en la caja de búsqueda." -msgid "The table below lists the available columns that can be shown on the 'My plans' list. Choose which you would like to appear." -msgstr "La siguiente tabla muestra las columnas que pueden mostrarse en la lista 'Mis planes'. Elija cuales quiere que se muestren." - msgid "Themes" msgstr "Temas" @@ -1179,9 +1200,6 @@ msgid "These are the basic details for your organisation." msgstr "Estos son los detalles básicos de su entidad." -msgid "This account does not have access to that plan." -msgstr "" - msgid "This allows you to order questions within a section." msgstr "Le permite ordenar las preguntas de una sección." @@ -1224,7 +1242,14 @@ msgid "Top banner text" msgstr "Texto del banner superior" -msgid "Unable to unlinked your account from %{is}" +#, fuzzy +msgid "Un-published" +msgstr "Publicado" + +msgid "Unable to link your account to %{scheme}." +msgstr "" + +msgid "Unable to unlink your account from %{is}." msgstr "" msgid "Unknown column name." @@ -1248,15 +1273,22 @@ msgid "Unlock my account" msgstr "" +msgid "Unpublish" +msgstr "" + +#, fuzzy +msgid "Unpublished" +msgstr "Publicado" + +msgid "Unpublished changes" +msgstr "" + msgid "Unsaved answers" msgstr "Preguntas sin contestar" msgid "Unsaved changes" msgstr "Deshaciendo cambios" -msgid "Update Customisation" -msgstr "" - msgid "Upload a new logo file" msgstr "" @@ -1290,6 +1322,10 @@ msgid "Website" msgstr "Sitio web" +#, fuzzy +msgid "Welcome to " +msgstr "Bienvenido/a." + msgid "Welcome to %{application_name}" msgstr "" @@ -1299,15 +1335,15 @@ msgid "When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions." msgstr "Cuando crea una fase nueva para su plantilla, se creará automáticamente una versión. Una vez complete el siguiente formulario se le darán las opciones para crear secciones y preguntas." +msgid "While you were editing " +msgstr "" + msgid "Would you like to save them now?" msgstr "¿Quere grabar los cambios ahora?" msgid "Yes" msgstr "" -msgid "Yes [Original Template Has Changed]" -msgstr "" - msgid "You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?" msgstr "Está a punto de borrar el grupo '%{guidance_group_name}'. Esto afectará a la orientación. ¿Está seguro?" @@ -1329,6 +1365,10 @@ msgid "You are not authorized to perform this action." msgstr "" +#, fuzzy +msgid "You are viewing a historical version of this template. You will not be able to make changes." +msgstr "templates" + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "Puede añadir un ejemplo o respuesta sugerida para ayudar a responder a sus usuarios. Se presentará bajo la caja de respuestas y pueden ser copiada y pegada." @@ -1338,16 +1378,29 @@ msgid "You can edit any of the details below." msgstr "Puede editar cualquiera de los siguientes datos." +#, fuzzy +msgid "You can not edit a historical version of this template." +msgstr "templates" + +#, fuzzy +msgid "You can not publish a historical version of this template." +msgstr "templates" + +#, fuzzy +msgid "You cannot delete historical versions of this template." +msgstr "templates" + msgid "You have altered answers but have not saved them:" msgstr "Ha modificado las respuestas, pero todavía no las ha grabado:" msgid "You have been given " msgstr "" -msgid "You have been given access to a Data Management Plan" -msgstr "" +#, fuzzy +msgid "You have been granted permission by your organisation to use our API. Your API token and instructions for using the API endpoints can be found " +msgstr "Organización" -msgid "You have been granted permission by your organisation to use our API." +msgid "You have un-published changes" msgstr "" msgid "You have unsaved answers in the following sections:" @@ -1368,13 +1421,13 @@ msgid "Your" msgstr "" -msgid "Your API token and instructions for using the API endpoints can be found here." -msgstr "" - msgid "Your ORCID" msgstr "" -msgid "Your access to" +msgid "Your access to " +msgstr "" + +msgid "Your account has been successfully linked to %{scheme}." msgstr "" msgid "Your account is linked to your institutional credentials." @@ -1389,14 +1442,16 @@ msgid "Your password must contain at least 8 characters." msgstr "Su clave ha de tener al menos 8 caracteres." -msgid "Your password won't change until you access the link above and create a new one." +msgid "Your permissions relating to " msgstr "" -msgid "Your permissions relating to" -msgstr "" +#, fuzzy +msgid "Your template has been published and is now available to users." +msgstr "templates" -msgid "[Unpublished Changes]" -msgstr "" +#, fuzzy +msgid "Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it" +msgstr "templates" msgid "a day" msgstr "" @@ -1416,12 +1471,24 @@ msgid "about an hour" msgstr "" -msgid "access." -msgstr "" - msgid "account has been locked due to an excessive number of unsuccessful sign in attempts." msgstr "" +msgid "activerecord.errors.messages.record_invalid" +msgstr "" + +#, fuzzy +msgid "activerecord.errors.models.user.attributes.current_password.invalid" +msgstr "user" + +#, fuzzy +msgid "activerecord.errors.models.user.attributes.email.blank" +msgstr "user" + +#, fuzzy +msgid "activerecord.errors.models.user.attributes.password.blank" +msgstr "user" + msgid "add guidance text" msgstr "" @@ -1436,7 +1503,7 @@ msgstr "Contestado " #, fuzzy -msgid "approx. %{space_used} of available space used (max %{num_pages} pages)" +msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "aprox. %{space_used}% de disponibilidad del espacio usado (máx. %{num_pages} páginas)" msgid "by" @@ -1470,12 +1537,6 @@ msgid "guidance on" msgstr "" -msgid "has been removed." -msgstr "" - -msgid "have changed. You now have" -msgstr "" - msgid "height must be less than 100px" msgstr "" @@ -1526,9 +1587,6 @@ msgid "organisation" msgstr "Organización" -msgid "password. You can do this through the link below." -msgstr "" - #, fuzzy msgid "phase" msgstr "Fase" @@ -1587,13 +1645,3 @@ msgid "{\"Error\":\"You do not have authorisation to view this endpoint\"}" msgstr "{\"Error\":\"You do not have authorisation to view this endpoint\"}" - -# ActiveRecord model errors that we could not override in the model's validation definition -msgid "activerecord.errors.models.user.attributes.email.blank" -msgstr "" -msgid "activerecord.errors.models.user.attributes.password.blank" -msgstr "" -msgid "activerecord.errors.models.user.attributes.current_password.invalid" -msgstr "" -msgid "activerecord.errors.messages.record_invalid" -msgstr "" diff --git a/config/locale/fr/app.po b/config/locale/fr/app.po index 516ab44..24df940 100644 --- a/config/locale/fr/app.po +++ b/config/locale/fr/app.po @@ -3,7 +3,6 @@ # This file is distributed under the same license as the app package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: app 1.0.0\n" @@ -50,19 +49,47 @@ msgid " by " msgstr " par " +#, fuzzy +msgid " has been removed by " +msgstr " par " + +msgid " have changed. " +msgstr "" + +msgid " into your browser)" +msgstr "" + msgid " on " msgstr "" +msgid " once you click save!" +msgstr "" + +msgid " password. You can do this through the link below." +msgstr "" + +msgid " saved the following answer:" +msgstr "" + #, fuzzy msgid " team" msgstr "am" -msgid " to view/edit the plan" +msgid " to accept the invitation, (or copy " +msgstr "" + +msgid " will help you to develop your Data Management Plan. If you have any queries or feedback as you use the tool, please contact us on " msgstr "" #, fuzzy -msgid "\"While you were editing #{answer.user.name} saved the following answer:\"" -msgstr "user" +msgid "\"Are you sure you want to unlink your #{scheme.description} ID?\"" +msgstr "Identifiant" + +msgid "\"Unlink your account from #{scheme.description}. You can link again at any time.\"" +msgstr "" + +msgid "\"Your account has been linked to #{scheme.description}.\"" +msgstr "" msgid "%d days" msgstr "" @@ -79,15 +106,16 @@ msgid "%{application_name}" msgstr "DMPonline" +#, fuzzy +msgid "%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
    * If you do not have an account with %{application_name}, please complete the form below.
    * If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
    Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly." +msgstr "DMPonline" + msgid "%{format} is not a valid exporting format. Available formats to export are %{available_formats}." msgstr "" msgid "%{value} is not a valid format" msgstr "" -msgid "'name' must be included in column list." -msgstr "name doit figurer dans la liste des colonnes." - msgid "(Using custom PDF formatting values)" msgstr "(Utilisation de valeurs de mise en forme PDF personnalisées)" @@ -192,9 +220,6 @@ msgid "API Information" msgstr "" -msgid "API Permission Granted" -msgstr "" - msgid "API token" msgstr "" @@ -252,6 +277,9 @@ msgid "Admin area" msgstr "Administration" +msgid "All the best," +msgstr "" + msgid "An error has occurred while saving/resetting your export settings." msgstr "" @@ -335,6 +363,9 @@ msgid "Choose a template" msgstr "" +msgid "Click here" +msgstr "" + msgid "Click here to accept the invitation" msgstr "" @@ -367,9 +398,6 @@ msgid "Comment was successfully saved." msgstr "Création du plan effectuée." -msgid "Configure" -msgstr "Configuration" - msgid "Contact Email" msgstr "" @@ -397,15 +425,6 @@ msgid "Customise" msgstr "Personnaliser" -msgid "Customised" -msgstr "" - -msgid "DMP access removed" -msgstr "" - -msgid "DMP permissions changed" -msgstr "" - msgid "Default" msgstr "Par défaut" @@ -445,9 +464,6 @@ msgid "Dropdown" msgstr "Liste déroulante" -msgid "Duplicate column name. Please only include each column once." -msgstr "Nom de colonne en doublon. Merci de najouter quune seule colonne." - msgid "E.g ORCID http://orcid.org/." msgstr "par ex. : ORCID http://orcid.org/." @@ -538,9 +554,6 @@ msgid "File Name" msgstr "Titre du plan" -msgid "Filter" -msgstr "Filtrer" - msgid "Filter plans" msgstr "Filtrer les plans" @@ -713,6 +726,9 @@ msgid "Main organisation" msgstr "Organisme principal" +msgid "Many thanks," +msgstr "" + msgid "Margin" msgstr "Marge" @@ -839,6 +855,10 @@ msgid "Organization" msgstr "Organisation" +#, fuzzy +msgid "Original funder template has changed!" +msgstr "templates" + msgid "Otherwise leave blank." msgstr "Sinon laissez ce champ vide." @@ -930,9 +950,6 @@ msgid "Please fill in the basic project details below and click 'Update' to save" msgstr "Veuillez renseigner les premiers détails ci-après et cliquez sur 'Mettre à jour' pour enregistrer" -msgid "Please follow the link above to login to " -msgstr "" - msgid "Please only enter up to 165 characters, you have used" msgstr "" @@ -975,12 +992,12 @@ msgid "Publish" msgstr "" +msgid "Publish changes" +msgstr "" + msgid "Published" msgstr "Publiée" -msgid "Published templates cannot be edited." -msgstr "" - msgid "Question" msgstr "Question" @@ -1065,9 +1082,6 @@ msgid "Selected option(s)" msgstr "" -msgid "Settings - My plans" -msgstr "Réglages - Mes plans" - msgid "Share" msgstr "Partager" @@ -1098,10 +1112,13 @@ msgid "Size" msgstr "Taille" -msgid "Someone has requested a link to change your" +msgid "Someone has requested a link to change your " msgstr "" -msgid "Successfully unlinked your account from %{is}" +msgid "Status" +msgstr "" + +msgid "Successfully unlinked your account from %{is}." msgstr "" msgid "Suggested answer" @@ -1146,10 +1163,17 @@ msgid "Thank you for registering. Please confirm your email address" msgstr "" -msgid "Thanks" +msgid "That email address is already registered." msgstr "" -msgid "That email address is already registered." +#, fuzzy +msgid "That template is not currently published." +msgstr "templates" + +msgid "The " +msgstr "" + +msgid "The edits in the box below will overwrite the existing answer from " msgstr "" msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." @@ -1158,9 +1182,6 @@ msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." msgstr "Les éléments que vous sélectionnez ici s'afficherontt dans le tableaiu ci-après. Vous pouvez trier les données à partir de chacune de ces en-tête ou les filtrer en tapant une chaîne de caractères dans la zone de recherche." -msgid "The table below lists the available columns that can be shown on the 'My plans' list. Choose which you would like to appear." -msgstr "Le tableau suivant donne la liste des colonnes que lon peut faire apparaître dans la liste Mes Plans. Choisissez celles que vous voulez voir." - msgid "Themes" msgstr "Thèmes" @@ -1176,9 +1197,6 @@ msgid "These are the basic details for your organisation." msgstr "Voici/il sagit des informations de base sur votre organisme." -msgid "This account does not have access to that plan." -msgstr "" - msgid "This allows you to order questions within a section." msgstr "Cette fonction vous permet de classer les questions dans une section." @@ -1221,7 +1239,14 @@ msgid "Top banner text" msgstr "Texte de la bannière en haut décran" -msgid "Unable to unlinked your account from %{is}" +#, fuzzy +msgid "Un-published" +msgstr "Publiée" + +msgid "Unable to link your account to %{scheme}." +msgstr "" + +msgid "Unable to unlink your account from %{is}." msgstr "" msgid "Unknown column name." @@ -1245,15 +1270,22 @@ msgid "Unlock my account" msgstr "" +msgid "Unpublish" +msgstr "" + +#, fuzzy +msgid "Unpublished" +msgstr "Publiée" + +msgid "Unpublished changes" +msgstr "" + msgid "Unsaved answers" msgstr "réponses non sauvegardées" msgid "Unsaved changes" msgstr "Modification non enregistrée" -msgid "Update Customisation" -msgstr "" - msgid "Upload a new logo file" msgstr "" @@ -1287,6 +1319,10 @@ msgid "Website" msgstr "Site web" +#, fuzzy +msgid "Welcome to " +msgstr "Bienvenue !" + msgid "Welcome to %{application_name}" msgstr "" @@ -1296,15 +1332,15 @@ msgid "When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions." msgstr "Quand vous créez une nouvelle phase dans votre modèle, une version sera créée automatiquement. Quand vous remplirez la grille ci-dessous, le système affichera des options pour créer des sections et des questions." +msgid "While you were editing " +msgstr "" + msgid "Would you like to save them now?" msgstr "Voulez-vous faire la sauvegarde maintenant?" msgid "Yes" msgstr "" -msgid "Yes [Original Template Has Changed]" -msgstr "" - msgid "You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?" msgstr "You are about to delete %{guidance_group_name}. This will affect guidance. Are you sure?" @@ -1326,6 +1362,10 @@ msgid "You are not authorized to perform this action." msgstr "" +#, fuzzy +msgid "You are viewing a historical version of this template. You will not be able to make changes." +msgstr "templates" + msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted." msgstr "Vous pouvez ajouter un exemple ou une suggestion de réponse pour aider les utilisateurs. Ils safficheront au-dessus de la grille de réponse et on peut les copier/coller." @@ -1335,16 +1375,29 @@ msgid "You can edit any of the details below." msgstr "Vous pouvez modifiez les informations ci-dessous." +#, fuzzy +msgid "You can not edit a historical version of this template." +msgstr "templates" + +#, fuzzy +msgid "You can not publish a historical version of this template." +msgstr "templates" + +#, fuzzy +msgid "You cannot delete historical versions of this template." +msgstr "templates" + msgid "You have altered answers but have not saved them:" msgstr "Vous avez changé des réponses sans les sauvegarder:" msgid "You have been given " msgstr "" -msgid "You have been given access to a Data Management Plan" -msgstr "" +#, fuzzy +msgid "You have been granted permission by your organisation to use our API. Your API token and instructions for using the API endpoints can be found " +msgstr "Organisation" -msgid "You have been granted permission by your organisation to use our API." +msgid "You have un-published changes" msgstr "" msgid "You have unsaved answers in the following sections:" @@ -1365,13 +1418,13 @@ msgid "Your" msgstr "" -msgid "Your API token and instructions for using the API endpoints can be found here." -msgstr "" - msgid "Your ORCID" msgstr "Votre ORCID" -msgid "Your access to" +msgid "Your access to " +msgstr "" + +msgid "Your account has been successfully linked to %{scheme}." msgstr "" msgid "Your account is linked to your institutional credentials." @@ -1386,14 +1439,16 @@ msgid "Your password must contain at least 8 characters." msgstr "" -msgid "Your password won't change until you access the link above and create a new one." +msgid "Your permissions relating to " msgstr "" -msgid "Your permissions relating to" -msgstr "" +#, fuzzy +msgid "Your template has been published and is now available to users." +msgstr "templates" -msgid "[Unpublished Changes]" -msgstr "" +#, fuzzy +msgid "Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it" +msgstr "templates" msgid "a day" msgstr "" @@ -1413,12 +1468,24 @@ msgid "about an hour" msgstr "" -msgid "access." -msgstr "" - msgid "account has been locked due to an excessive number of unsuccessful sign in attempts." msgstr "" +msgid "activerecord.errors.messages.record_invalid" +msgstr "" + +#, fuzzy +msgid "activerecord.errors.models.user.attributes.current_password.invalid" +msgstr "user" + +#, fuzzy +msgid "activerecord.errors.models.user.attributes.email.blank" +msgstr "user" + +#, fuzzy +msgid "activerecord.errors.models.user.attributes.password.blank" +msgstr "user" + msgid "add guidance text" msgstr "" @@ -1433,7 +1500,7 @@ msgstr "Réponse " #, fuzzy -msgid "approx. %{space_used} of available space used (max %{num_pages} pages)" +msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "env. %{space_used}% despace disponible utilisé (%{num_pages} pages maxi)" msgid "by" @@ -1467,12 +1534,6 @@ msgid "guidance on" msgstr "" -msgid "has been removed." -msgstr "" - -msgid "have changed. You now have" -msgstr "" - msgid "height must be less than 100px" msgstr "" @@ -1523,9 +1584,6 @@ msgid "organisation" msgstr "Organisation" -msgid "password. You can do this through the link below." -msgstr "" - #, fuzzy msgid "phase" msgstr "Phase" @@ -1584,10 +1642,3 @@ msgid "{\"Error\":\"You do not have authorisation to view this endpoint\"}" msgstr "" - -msgid "activerecord.errors.models.user.attributes.password.blank" -msgstr "" -msgid "activerecord.errors.models.user.attributes.current_password.invalid" -msgstr "" -msgid "activerecord.errors.messages.record_invalid" -msgstr "" \ No newline at end of file diff --git a/config/locale/i18n_placeholders.rb b/config/locale/i18n_placeholders.rb new file mode 100644 index 0000000..532b25f --- /dev/null +++ b/config/locale/i18n_placeholders.rb @@ -0,0 +1,10 @@ +# ActiveRecord model errors that we could not override in the model's validation definition +_("activerecord.errors.messages.record_invalid") +#msgstr "unable to save your changes" +_("activerecord.errors.models.user.attributes.current_password.invalid") +#msgstr "invalid email and/or password" +_("activerecord.errors.models.user.attributes.email.blank") +#msgstr "can't be blank" +_("activerecord.errors.models.user.attributes.password.blank") +#msgstr "can't be blank" + diff --git a/config/routes.rb b/config/routes.rb index 2c00de5..1f4d9a1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,7 +19,7 @@ resources :themes resources :notes resources :plans - resources :plan_guidance_groups + resources :plans_guidance_groups resources :identifier_schemes resources :exported_plans resources :regions @@ -40,9 +40,8 @@ end # WAYFless access point - use query param idp - get 'auth/shibboleth' => 'users/omniauth_shibboleth_request#redirect', :as => 'user_omniauth_shibboleth' - get 'auth/shibboleth/assoc' => 'users/omniauth_shibboleth_request#associate', :as => 'user_shibboleth_assoc' - + #get 'auth/shibboleth' => 'users/omniauth_shibboleth_request#redirect', :as => 'user_omniauth_shibboleth' + #get 'auth/shibboleth/assoc' => 'users/omniauth_shibboleth_request#associate', :as => 'user_shibboleth_assoc' #post '/auth/:provider/callback' => 'sessions#oauth_create' # fix for activeadmin signout bug diff --git a/db/migrate/20170427110141_add_logo_url_to_identifier_schemes.rb b/db/migrate/20170427110141_add_logo_url_to_identifier_schemes.rb new file mode 100644 index 0000000..0f3fa50 --- /dev/null +++ b/db/migrate/20170427110141_add_logo_url_to_identifier_schemes.rb @@ -0,0 +1,5 @@ +class AddLogoUrlToIdentifierSchemes < ActiveRecord::Migration + def change + add_column :identifier_schemes, :logo_url, :string + end +end diff --git a/db/migrate/20170428083711_add_user_landing_url_to_identifier_schemes.rb b/db/migrate/20170428083711_add_user_landing_url_to_identifier_schemes.rb new file mode 100644 index 0000000..ac1c680 --- /dev/null +++ b/db/migrate/20170428083711_add_user_landing_url_to_identifier_schemes.rb @@ -0,0 +1,5 @@ +class AddUserLandingUrlToIdentifierSchemes < ActiveRecord::Migration + def change + add_column :identifier_schemes, :user_landing_url, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 6147894..fe00e7b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,10 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170421170849) do +ActiveRecord::Schema.define(version: 20170428083711) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" create_table "answers", force: :cascade do |t| t.text "text" @@ -20,27 +23,23 @@ t.integer "question_id" t.datetime "created_at" t.datetime "updated_at" - t.integer "lock_version", default: 0 + t.integer "lock_version", default: 0 end - add_index "answers", ["plan_id"], name: "fk_rails_84a6005a3e" - add_index "answers", ["question_id"], name: "fk_rails_3d5ed4418f" - add_index "answers", ["user_id"], name: "fk_rails_584be190c2" - create_table "answers_question_options", id: false, force: :cascade do |t| t.integer "answer_id", null: false t.integer "question_option_id", null: false end - add_index "answers_question_options", ["answer_id", "question_option_id"], name: "answer_question_option_index" - add_index "answers_question_options", ["question_option_id", "answer_id"], name: "question_option_answer_index" + add_index "answers_question_options", ["answer_id", "question_option_id"], name: "answer_question_option_index", using: :btree + add_index "answers_question_options", ["question_option_id", "answer_id"], name: "question_option_answer_index", using: :btree create_table "exported_plans", force: :cascade do |t| t.integer "plan_id" t.integer "user_id" t.string "format" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "phase_id" end @@ -49,8 +48,8 @@ t.string "icon_name" t.integer "icon_size" t.string "icon_location" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "file_uploads", force: :cascade do |t| @@ -61,50 +60,47 @@ t.boolean "published" t.string "location" t.integer "file_type_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "friendly_id_slugs", force: :cascade do |t| - t.string "slug", null: false - t.integer "sluggable_id", null: false - t.string "sluggable_type" + t.string "slug", null: false + t.integer "sluggable_id", null: false + t.string "sluggable_type", limit: 40 t.datetime "created_at" end - add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true - add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id" - add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type" + add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true, using: :btree + add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id", using: :btree + add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree create_table "guidance_groups", force: :cascade do |t| t.string "name" t.integer "org_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.boolean "optional_subset" t.boolean "published" end - add_index "guidance_groups", ["org_id"], name: "fk_rails_819c1dbbc7" - create_table "guidances", force: :cascade do |t| t.text "text" t.integer "guidance_group_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "question_id" t.boolean "published" end - add_index "guidances", ["guidance_group_id"], name: "fk_rails_20d29da787" - create_table "identifier_schemes", force: :cascade do |t| t.string "name" t.string "description" t.boolean "active" t.datetime "created_at" t.datetime "updated_at" - t.boolean "use_for_login", default: false + t.string "logo_url" + t.string "user_landing_url" end create_table "languages", force: :cascade do |t| @@ -124,9 +120,6 @@ t.datetime "updated_at" end - add_index "notes", ["answer_id"], name: "fk_rails_907f8d48bf" - add_index "notes", ["user_id"], name: "fk_rails_7f2323ad43" - create_table "org_token_permissions", force: :cascade do |t| t.integer "org_id" t.integer "token_permission_type_id" @@ -134,16 +127,13 @@ t.datetime "updated_at" end - add_index "org_token_permissions", ["org_id"], name: "fk_rails_e1db1b22c5" - add_index "org_token_permissions", ["token_permission_type_id"], name: "fk_rails_2aa265f538" - create_table "orgs", force: :cascade do |t| t.string "name" t.string "abbreviation" t.string "target_url" t.string "wayfless_entity" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "parent_id" t.boolean "is_other" t.string "sort_name" @@ -157,17 +147,14 @@ t.integer "org_type", default: 0, null: false end - add_index "orgs", ["language_id"], name: "fk_rails_5640112cab" - add_index "orgs", ["region_id"], name: "fk_rails_5a6adf6bab" - create_table "perms", force: :cascade do |t| t.string "name" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end - add_index "perms", ["name"], name: "index_perms_on_name" - add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id" + add_index "perms", ["name"], name: "index_perms_on_name", using: :btree + add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id", using: :btree create_table "phases", force: :cascade do |t| t.string "title" @@ -180,19 +167,6 @@ t.boolean "modifiable" end - add_index "phases", ["template_id"], name: "fk_rails_0f8036cb2e" - - create_table "plan_guidance_groups", force: :cascade do |t| - t.integer "plan_id" - t.integer "guidance_group_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "selected" - end - - add_index "plan_guidance_groups", ["guidance_group_id"], name: "index_plan_guidance_groups_on_guidance_group_id" - add_index "plan_guidance_groups", ["plan_id"], name: "index_plan_guidance_groups_on_plan_id" - create_table "plans", force: :cascade do |t| t.integer "project_id" t.string "title" @@ -210,8 +184,6 @@ t.integer "visibility", default: 0, null: false end - add_index "plans", ["template_id"], name: "fk_rails_3424ca281f" - create_table "plans_guidance_groups", force: :cascade do |t| t.integer "guidance_group_id" t.integer "plan_id" @@ -220,9 +192,9 @@ create_table "question_formats", force: :cascade do |t| t.string "title" t.text "description" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "option_based", default: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "option_based", default: false t.integer "formattype", default: 0 end @@ -235,8 +207,6 @@ t.datetime "updated_at" end - add_index "question_options", ["question_id"], name: "fk_rails_b9c5f61cf9" - create_table "questions", force: :cascade do |t| t.text "text" t.text "default_value" @@ -246,20 +216,17 @@ t.datetime "created_at" t.datetime "updated_at" t.integer "question_format_id" - t.boolean "option_comment_display", default: true + t.boolean "option_comment_display", default: true t.boolean "modifiable" end - add_index "questions", ["question_format_id"], name: "fk_rails_4fbc38c8c7" - add_index "questions", ["section_id"], name: "fk_rails_c50eadc3e3" - create_table "questions_themes", id: false, force: :cascade do |t| t.integer "question_id", null: false t.integer "theme_id", null: false end - add_index "questions_themes", ["question_id", "theme_id"], name: "question_theme_index" - add_index "questions_themes", ["theme_id", "question_id"], name: "theme_question_index" + add_index "questions_themes", ["question_id", "theme_id"], name: "question_theme_index", using: :btree + add_index "questions_themes", ["theme_id", "question_id"], name: "theme_question_index", using: :btree create_table "regions", force: :cascade do |t| t.string "abbreviation" @@ -276,9 +243,6 @@ t.integer "access", default: 0, null: false end - add_index "roles", ["plan_id"], name: "fk_rails_a1ce6c2772" - add_index "roles", ["user_id"], name: "fk_rails_ab35d699f0" - create_table "sections", force: :cascade do |t| t.string "title" t.text "description" @@ -290,8 +254,6 @@ t.boolean "modifiable" end - add_index "sections", ["phase_id"], name: "fk_rails_1853581585" - create_table "settings", force: :cascade do |t| t.string "var", null: false t.text "value" @@ -301,12 +263,12 @@ t.datetime "updated_at", null: false end - add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true + add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true, using: :btree create_table "splash_logs", force: :cascade do |t| t.string "destination" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "suggested_answers", force: :cascade do |t| @@ -318,9 +280,6 @@ t.datetime "updated_at" end - add_index "suggested_answers", ["org_id"], name: "fk_rails_473de65779" - add_index "suggested_answers", ["question_id"], name: "fk_rails_daa60b5b70" - create_table "templates", force: :cascade do |t| t.string "title" t.text "description" @@ -334,16 +293,14 @@ t.integer "visibility" t.integer "customization_of" t.integer "dmptemplate_id" - t.boolean "dirty", default: false + t.boolean "dirty", default: false end - add_index "templates", ["org_id"], name: "fk_rails_481431e1bd" - create_table "themes", force: :cascade do |t| t.string "title" t.text "description" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "locale" end @@ -352,9 +309,6 @@ t.integer "guidance_id" end - add_index "themes_in_guidance", ["guidance_id"], name: "fk_rails_a5ab9402df" - add_index "themes_in_guidance", ["theme_id"], name: "fk_rails_7d708f6f1e" - create_table "token_permission_types", force: :cascade do |t| t.string "token_type" t.text "text_description" @@ -370,17 +324,14 @@ t.integer "identifier_scheme_id" end - add_index "user_identifiers", ["identifier_scheme_id"], name: "fk_rails_fe95df7db0" - add_index "user_identifiers", ["user_id"], name: "fk_rails_65c9a98cdb" - create_table "users", force: :cascade do |t| t.string "firstname" t.string "surname" t.string "email", default: "", null: false t.string "orcid_id" t.string "shibboleth_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "encrypted_password", default: "" t.string "reset_password_token" t.datetime "reset_password_sent_at" @@ -398,6 +349,7 @@ t.datetime "invitation_sent_at" t.datetime "invitation_accepted_at" t.string "other_organisation" + t.boolean "dmponline3" t.boolean "accept_terms" t.integer "org_id" t.string "api_token" @@ -406,12 +358,10 @@ t.integer "language_id" end - add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true - add_index "users", ["email"], name: "index_users_on_email", unique: true - add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true - add_index "users", ["language_id"], name: "fk_rails_45f4f12508" - add_index "users", ["org_id"], name: "fk_rails_e73753bccb" - add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree + add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree + add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true, using: :btree + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree create_table "users_perms", id: false, force: :cascade do |t| t.integer "user_id" @@ -434,8 +384,6 @@ add_foreign_key "orgs", "languages" add_foreign_key "orgs", "regions" add_foreign_key "phases", "templates" - add_foreign_key "plan_guidance_groups", "guidance_groups" - add_foreign_key "plan_guidance_groups", "plans" add_foreign_key "plans", "templates" add_foreign_key "plans_guidance_groups", "guidance_groups" add_foreign_key "plans_guidance_groups", "plans" diff --git a/db/seeds.rb b/db/seeds.rb index edd0dbe..9277a5a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,8 +5,10 @@ # Identifier Schemes # ------------------------------------------------------- identifier_schemes = [ - {name: 'orcid', description: 'ORCID researcher identifiers', active: true}, - {name: 'shibboleth', description: 'Shibboleth', active: false} + {name: 'orcid', description: 'ORCID', active: true, + logo_url:'http://orcid.org/sites/default/files/images/orcid_16x16.png', + user_landing_url:'https://orcid.org' }, + {name: 'shibboleth', description: 'Shibboleth', active: true} ] identifier_schemes.map{ |is| IdentifierScheme.create!(is) if IdentifierScheme.find_by(name: is[:name]).nil? } diff --git a/lib/assets/bg.gif b/lib/assets/bg.gif new file mode 120000 index 0000000..12456d2 --- /dev/null +++ b/lib/assets/bg.gif @@ -0,0 +1 @@ +images/bg.gif \ No newline at end of file diff --git a/lib/assets/images/remove.png b/lib/assets/images/remove.png index b2ef137..81ced7f 100644 --- a/lib/assets/images/remove.png +++ b/lib/assets/images/remove.png Binary files differ diff --git a/public/html/ProjectsController.html b/public/html/ProjectsController.html deleted file mode 100644 index 3d7254b..0000000 --- a/public/html/ProjectsController.html +++ /dev/null @@ -1,908 +0,0 @@ - - - - - - -class ProjectsController - DMPonline4 Documentation - - - - - - - - - - - - - - - - -
    -

    class ProjectsController

    - -
    - -
    - - - - -
    - - - - - - - - - - -
    -

    Public Instance Methods

    - - -
    - -
    - create() - click to toggle source -
    - - -
    - -

    POST /projects POST /projects.json

    - - - -
    - 
    # File app/controllers/projects_controller.rb, line 113
-def create
-if user_signed_in? then
-                @project = Project.new(params[:project])
-                if @project.dmptemplate.nil? && params[:project][:funder_id] != "" then # this shouldn't be necessary - see setter for funder_id in project.rb
-
-                        funder = Organisation.find(params[:project][:funder_id])
-                        if funder.dmptemplates.count == 1 then
-                                @project.dmptemplate = funder.published_templates.first
-                        end
-                elsif @project.dmptemplate.nil? || params[:default_tag] == 'true' then
-                        if @project.organisation.nil?  || params[:default_tag] == 'true'  || @project.organisation.published_templates.first.nil? then
-                                @project.dmptemplate = Dmptemplate.find_by_is_default(true)
-                        else
-                                @project.dmptemplate = @project.organisation.published_templates.first
-                        end
-                end
-                @project.principal_investigator = current_user.name(false)
-                @project.title = I18n.t('helpers.project.my_project_name')+' ('+@project.dmptemplate.title+')'
-                @project.assign_creator(current_user.id)
-                respond_to do |format|
-                        if @project.save
-                                format.html { redirect_to({:action => "show", :id => @project.slug, :show_form => "yes"}, {:notice => I18n.t('helpers.project.success')}) }
-                                format.json { render json: @project, status: :created, location: @project }
-                        else
-                                format.html { render action: "new" }
-                                format.json { render json: @project.errors, status: :unprocessable_entity }
-                        end
-                end
-        else
-                render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false)
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - destroy() - click to toggle source -
    - - -
    - -

    DELETE /projects/1 DELETE /projects/1.json

    - - - -
    - 
    # File app/controllers/projects_controller.rb, line 166
-def destroy
-        @project = Project.find(params[:id])
-        if user_signed_in? && @project.editable_by(current_user.id) then
-                @project.destroy
-
-                respond_to do |format|
-                        format.html { redirect_to projects_url }
-                        format.json { head :no_content }
-                end
-        else
-                render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false)
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - edit() - click to toggle source -
    - - -
    - -

    GET /projects/1/edit Should this be removed?

    - - - -
    - 
    # File app/controllers/projects_controller.rb, line 71
-def edit
-        @project = Project.find(params[:id])
-        if !user_signed_in? then
-       respond_to do |format|
-                        format.html { redirect_to edit_user_registration_path }
-                end
-        elsif !@project.editable_by(current_user.id) then
-                respond_to do |format|
-                        format.html { redirect_to projects_url, notice: "This account does not have access to that plan." }
-                end
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - export() - click to toggle source -
    - - -
    - - - - - -
    - 
    # File app/controllers/projects_controller.rb, line 97
-def export
-        @project = Project.find(params[:id])
-        if !user_signed_in? then
-       respond_to do |format|
-                        format.html { redirect_to edit_user_registration_path }
-                end
-        else 
-                respond_to do |format|
-                        format.html { render action: "export" }
-        
-                end
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - index() - click to toggle source -
    - - -
    - -

    GET /projects GET /projects.json

    - - - -
    - 
    # File app/controllers/projects_controller.rb, line 6
-def index
-        if user_signed_in? then
-                if (current_user.shibboleth_id.nil? || current_user.shibboleth_id.length == 0) && !cookies[:show_shib_link].nil? && cookies[:show_shib_link] == "show_shib_link" then
-                        flash.notice = "Would you like to #{view_context.link_to 'link your DMPonline account to your institutional credentials?', user_omniauth_shibboleth_path}".html_safe
-                end
-
-                @projects = current_user.projects.filter(params[:filter])
-                @has_projects = current_user.projects.any? # unfiltered count
-
-
-                respond_to do |format|
-                        format.html # index.html.erb
-
-                        format.json { render json: @projects }
-                end
-        else
-                respond_to do |format|
-                        format.html { redirect_to edit_user_registration_path }
-                end
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - new() - click to toggle source -
    - - -
    - -

    GET /projects/new GET /projects/new.json

    - - - -
    - 
    # File app/controllers/projects_controller.rb, line 52
-def new
-        if user_signed_in? then
-                @project = Project.new
-                @project.organisation = current_user.organisation
-                @funders = orgs_of_type(t('helpers.org_type.funder'), true)
-                @institutions = orgs_of_type(t('helpers.org_type.institution'))
-                respond_to do |format|
-                  format.html # new.html.erb
-
-                  format.json { render json: @project }
-                end
-        else
-                respond_to do |format|
-                        format.html { redirect_to edit_user_registration_path }
-                end
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - possible_guidance() - click to toggle source -
    - - -
    - - - - - -
    - 
    # File app/controllers/projects_controller.rb, line 213
-def possible_guidance
-        if !params[:template].nil? && params[:template] != "" && params[:template] != "undefined" then
-                template = Dmptemplate.find(params[:template])
-        else
-                template = nil
-        end
-        if !params[:institution].nil? && params[:institution] != "" && params[:institution] != "undefined" then
-                institution = Organisation.find(params[:institution])
-        else
-                institution = nil
-        end
-        excluded_orgs = orgs_of_type(t('helpers.org_type.funder')) + orgs_of_type(t('helpers.org_type.institution')) + Organisation.orgs_with_parent_of_type(t('helpers.org_type.institution'))
-        guidance_groups = {}
-        ggs = GuidanceGroup.guidance_groups_excluding(excluded_orgs) 
-
-        ggs.each do |gg|
-                guidance_groups[gg.id] = gg.name
-        end
-
-#subset guidance that belong to the institution
-
-        unless institution.nil? then
-                optional_gg = GuidanceGroup.where("optional_subset =  ? && organisation_id = ?", true, institution.id)
-                optional_gg.each do|optional|
-                        guidance_groups[optional.id] = optional.name
-                end
-                
-                institution.children.each do |o|
-                        o.guidance_groups.each do |gg|
-                                include = false
-                                gg.guidances.each do |g|
-                                        if g.dmptemplate.nil? || g.dmptemplate_id == template.id then
-                                                include = true
-                                                break
-                                        end
-                                end
-                                if include then
-                                        guidance_groups[gg.id] = gg.name
-                                end
-                        end
-                end
-        end
-
-#If template belongs to a funder and that funder has subset guidance display then.
-
-if !template.nil? && template.organisation.organisation_type.name == t('helpers.org_type.funder') then
-    optional_gg = GuidanceGroup.where("optional_subset =  ? && organisation_id = ?", true, template.organisation_id)
-                optional_gg.each do|optional|
-                        guidance_groups[optional.id] = optional.name
-                end
-end
-
-
-        respond_to do |format|
-                format.json { render json: guidance_groups.to_json }
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - possible_templates() - click to toggle source -
    - - -
    - -

    GET /projects/possible_templates.json

    - - - -
    - 
    # File app/controllers/projects_controller.rb, line 181
-def possible_templates
-        if !params[:funder].nil? && params[:funder] != "" && params[:funder] != "undefined" then
-                funder = Organisation.find(params[:funder])
-        else
-                funder = nil
-        end
-        if !params[:institution].nil? && params[:institution] != "" && params[:institution] != "undefined" then
-                institution = Organisation.find(params[:institution])
-        else
-                institution = nil
-        end
-        templates = {}
-        unless funder.nil? then
-                funder.published_templates.each do |t|
-                        templates[t.id] = t.title
-                end
-        end
-        if templates.count == 0 && !institution.nil? then
-                institution.published_templates.each do |t|
-                        templates[t.id] = t.title
-                end
-                institution.children.each do |o|
-                        o.published_templates.each do |t|
-                                templates[t.id] = t.title
-                        end
-                end
-        end
-        respond_to do |format|
-                format.json { render json: templates.to_json }
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - share() - click to toggle source -
    - - -
    - - - - - -
    - 
    # File app/controllers/projects_controller.rb, line 84
-def share
-        @project = Project.find(params[:id])
-        if !user_signed_in? then
-       respond_to do |format|
-                        format.html { redirect_to edit_user_registration_path }
-                end
-        elsif !@project.editable_by(current_user.id) then
-                respond_to do |format|
-                        format.html { redirect_to projects_url, notice: "This account does not have access to that plan." }
-                end
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - show() - click to toggle source -
    - - -
    - -

    GET /projects/1 GET /projects/1.json

    - - - -
    - 
    # File app/controllers/projects_controller.rb, line 28
-def show
-        @project = Project.find(params[:id])
-        @show_form = false
-        if params[:show_form] == "yes" then
-                @show_form = true
-        end
-        if user_signed_in? && @project.readable_by(current_user.id) then
-                respond_to do |format|
-                        format.html # show.html.erb
-
-                        format.json { render json: @project }
-                end
-        elsif user_signed_in? then
-                respond_to do |format|
-                        format.html { redirect_to projects_url, notice: "This account does not have access to that plan." }
-                end
-        else
-                respond_to do |format|
-                        format.html { redirect_to edit_user_registration_path }
-                end
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - update() - click to toggle source -
    - - -
    - -

    PUT /projects/1 PUT /projects/1.json

    - - - -
    - 
    # File app/controllers/projects_controller.rb, line 147
-def update
-        @project = Project.find(params[:id])
-        if user_signed_in? && @project.editable_by(current_user.id) then
-                respond_to do |format|
-                        if @project.update_attributes(params[:project])
-                                format.html { redirect_to @project, notice: 'Project was successfully updated.' }
-                                format.json { head :no_content }
-                        else
-                                format.html { render action: "edit" }
-                                format.json { render json: @project.errors, status: :unprocessable_entity }
-                        end
-                end
-        else
-                render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false)
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    -

    Private Instance Methods

    - - -
    - -
    - orgs_of_type(org_type_name, published_templates = false) - click to toggle source -
    - - -
    - - - - - -
    - 
    # File app/controllers/projects_controller.rb, line 271
-def orgs_of_type(org_type_name, published_templates = false)
-        org_type = OrganisationType.find_by_name(org_type_name)
-        all_such_orgs = org_type.organisations
-        if published_templates then
-                with_published = Array.new
-                all_such_orgs.each do |o|
-                        if o.published_templates.count > 0 then
-                                with_published << o
-                        end
-                end
-                return with_published.sort_by {|o| [o.sort_name, o.name] }
-        else
-                return all_such_orgs.sort_by {|o| [o.sort_name, o.name] }
-        end
-end
    -
    - -
    - - - - -
    - - -
    - -
    - -
    - - - - diff --git a/public/html/Users/OmniauthShibbolethRequestController.html b/public/html/Users/OmniauthShibbolethRequestController.html deleted file mode 100644 index bd89987..0000000 --- a/public/html/Users/OmniauthShibbolethRequestController.html +++ /dev/null @@ -1,370 +0,0 @@ - - - - - - -class Users::OmniauthShibbolethRequestController - DMPonline4 Documentation - - - - - - - - - - - - - - - - -
    -

    class Users::OmniauthShibbolethRequestController

    - -
    - -
    - - - - -
    - - - - - - - - - - -
    -

    Public Instance Methods

    - - -
    - -
    - associate() - click to toggle source -
    - - -
    - - - - - -
    - 
    # File app/controllers/users/omniauth_shibboleth_request_controller.rb, line 17
-def associate
-  # This action is protected - can only be reached if user is already logged in.
-
-  # See before_filter
-
-  redirect_to user_omniauth_callback_path(:shibboleth)
-end
    -
    - -
    - - - - -
    - - -
    - -
    - redirect() - click to toggle source -
    - - -
    - - - - - -
    - 
    # File app/controllers/users/omniauth_shibboleth_request_controller.rb, line 4
-def redirect
-      if !current_user.nil? && !current_user.organisation.nil?
-      idp = params[:idp] || current_user.organisation.wayfless_entity
-  else
-      idp = params[:idp]
-  end
-  query_params = {target: user_omniauth_callback_path(:shibboleth)}
-  unless idp.blank?
-    query_params[:entityID] = idp
-  end
-  redirect_to "#{Rails.application.config.shibboleth_login}?#{query_params.to_query}", status: 302
-end
    -
    - -
    - - - - -
    - - -
    - -
    - -
    - - - - diff --git a/public/shib_logo.png b/public/shib_logo.png new file mode 100644 index 0000000..191b508 --- /dev/null +++ b/public/shib_logo.png Binary files differ diff --git a/test/functional/api_projects_controller_test.rb b/test/functional/api_projects_controller_test.rb deleted file mode 100644 index 66160b5..0000000 --- a/test/functional/api_projects_controller_test.rb +++ /dev/null @@ -1,57 +0,0 @@ -require 'test_helper' -#require "rack/test" - -class ApiProjectsControllerTest < ActionDispatch::IntegrationTest - #include Rack::Test::Methods - - @controller = Api::V0::ProjectsController.new - - test "create validates that a user has plans auth" do -=begin - # has auth for projects - @user = users.first - post '/create', params: {template:{ - organisation: "Arts and Humanities Research Council"}, - project:{title:"my project", email:"org_admin@example.com"}} - assert_response :success - - # has no auth for projects - # @user = users(:user_three) - # post :create, params: {template:{organisation: "Arts and Humanities Research Council"},project:{title:"my project", email:"org_admin@example.com"}} - # assert_response 400 -=end - end - - test "create validates that the passed organisation exists" do - - end - - test "create validates that the passed organisation is a funder" do - - end - - test "create validates that the passed organisation has only 1 template" do - - end - - test "create validates that a passed organisation with more than one template specifies template" do - - end - - test "create checks for a guidance and adds it if it exists" do - - end - - test "create checks for guidances and adds them if they exist" do - - end - - test "create invites is user email not already in system" do - - end - - test "create creates a new project when params correct" do - - end - -end \ No newline at end of file diff --git a/test/functional/phases_controller_test.rb b/test/functional/phases_controller_test.rb index 275d197..4b0de7c 100644 --- a/test/functional/phases_controller_test.rb +++ b/test/functional/phases_controller_test.rb @@ -125,12 +125,12 @@ # ---------------------------------------------------------- test "show the new phase page" do # Should redirect user to the root path if they are not logged in! - get admin_add_phase_path(@template.phases.first) + get admin_add_phase_path(@template.id) assert_unauthorized_redirect_to_root_path sign_in @user - get admin_add_phase_path(@template.phases.first) + get admin_add_phase_path(@template.id) assert_response :success assert assigns(:template) @@ -222,7 +222,7 @@ delete admin_destroy_phase_path(id: @template.phases.first.id, phase_id: id) assert_response :redirect - assert_redirected_to admin_template_template_url + assert_redirected_to admin_template_template_path(@template) assert_equal _('Information was successfully deleted.'), flash[:notice] assert_raise ActiveRecord::RecordNotFound do Phase.find(id).nil? @@ -232,4 +232,4 @@ assert @template.reload.dirty?, "expected the templates dirty flag to be true" end -end \ No newline at end of file +end diff --git a/test/functional/plans_controller_test.rb b/test/functional/plans_controller_test.rb index 38e0a04..7386a2f 100644 --- a/test/functional/plans_controller_test.rb +++ b/test/functional/plans_controller_test.rb @@ -214,7 +214,7 @@ assert_redirected_to plan_path(@plan) @plan.reload - ggs = @plan.plan_guidance_groups.collect{|pgg| pgg.guidance_group_id} + ggs = @plan.guidance_groups.ids assert ggs.include?(GuidanceGroup.first.id), "expected the plan to have the first GuidanceGroup selected" assert ggs.include?(GuidanceGroup.last.id), "expected the plan to have the last GuidanceGroup selected" end diff --git a/test/functional/users/omniauth_callbacks_controller_test.rb b/test/functional/users/omniauth_callbacks_controller_test.rb index 82bbfbd..9086351 100644 --- a/test/functional/users/omniauth_callbacks_controller_test.rb +++ b/test/functional/users/omniauth_callbacks_controller_test.rb @@ -48,9 +48,16 @@ post @callback_uris[scheme.name] - assert [I18n.t('devise.omniauth_callbacks.user.success').gsub('%{kind}', scheme.name).downcase, - I18n.t('devise.omniauth_callbacks.success').gsub('%{kind}', scheme.name).downcase].include?(flash[:notice].downcase), "Expected a success message when simulating a valid callback from #{scheme.name}" - assert @response.redirect_url.include?(root_url), "Expected a redirect to the root page, #{root_url}, when omniauth returns with a valid identifier!" + ### Until ORCID login becomes supported. + if scheme.name == 'shibboleth' + assert [I18n.t('devise.omniauth_callbacks.user.success').gsub('%{kind}', scheme.name).downcase, + I18n.t('devise.omniauth_callbacks.success').gsub('%{kind}', scheme.name).downcase].include?(flash[:notice].downcase), "Expected a success message when simulating a valid callback from #{scheme.name}" + assert @response.redirect_url.include?(root_url), "Expected a redirect to the root page, #{root_url}, when omniauth returns with a valid identifier!" + else + assert_equal I18n.t('identifier_schemes.new_login_success'), flash[:notice], "Expected a success message when simulating a valid callback from #{scheme.name}" + assert @response.redirect_url.include?(new_user_registration_url), "Expected a redirect to the registration page when the user is not logged in and we received a valid callback from #{scheme.name}" + assert_not "#user_identifiers[#{scheme.name}]".nil? + end end end @@ -62,21 +69,13 @@ post @callback_uris[scheme.name] - # This is in place until we tie Shibboleth into the same generic Omniauth handler we are using for ORCID - if scheme.name == 'shibboleth' - assert [I18n.t('devise.omniauth_callbacks.user.success').gsub('%{kind}', scheme.name).downcase, - I18n.t('devise.omniauth_callbacks.success').gsub('%{kind}', scheme.name).downcase].include?(flash[:notice].downcase), "Expected a success message when simulating a valid callback from #{scheme.name}" + assert_equal _("Your account has been successfully linked to %{scheme}.") % { scheme: scheme.description }, flash[:notice], "Expected a success message when simulating a valid callback from #{scheme.name}" - else - assert [I18n.t('identifier_schemes.user.connect_success').gsub('%{scheme}', scheme.name), - I18n.t('identifier_schemes.connect_success').gsub('%{scheme}', scheme.name)].include?(flash[:notice]), "Expected a success message when simulating a valid callback from #{scheme.name}" - - assert_redirected_to "#{edit_user_registration_path}", "Expected a redirect to the edit profile page, #{edit_user_registration_path}, when omniauth returns with a valid identifier for a user that is already signed in!" + assert_redirected_to "#{edit_user_registration_path}", "Expected a redirect to the edit profile page, #{edit_user_registration_path}, when omniauth returns with a valid identifier for a user that is already signed in!" - # reload the user record and make sure the omniauth value was attached to their record - usr = User.find(@user.id) - assert_equal usr.user_identifiers.find_by(identifier_scheme: scheme).identifier, 'foo:bar' - end + # reload the user record and make sure the omniauth value was attached to their record + usr = User.find(@user.id) + assert_equal usr.user_identifiers.find_by(identifier_scheme: scheme).identifier, 'foo:bar' end end diff --git a/test/functional/users/omniauth_shibboleth_request_controller_test.rb b/test/functional/users/omniauth_shibboleth_request_controller_test.rb deleted file mode 100644 index 391c2f1..0000000 --- a/test/functional/users/omniauth_shibboleth_request_controller_test.rb +++ /dev/null @@ -1,34 +0,0 @@ -class OmniauthShibbolethRequestControllerTest < ActionDispatch::IntegrationTest - include Devise::Test::IntegrationHelpers - - - # user_omniauth_shibboleth GET /auth/shibboleth users/omniauth_shibboleth_request#redirect - # user_shibboleth_assoc GET /auth/shibboleth/assoc users/omniauth_shibboleth_request#associate - - setup do - @schemes = IdentifierScheme.all - @user = User.first - - @callback_uris = {} - - # Stub out shibboleth IDP responses - OmniAuth.config.mock_auth[:shibboleth] = OmniAuth::AuthHash.new({ - :provider => "shibboleth", - :idp => "blah", - :uid => 'foo:bar' - }) - end - - # ------------------------------------------------------------- - test "gets the IDP from the incoming params" do - get user_omniauth_shibboleth_path - assert_response :redirect - assert_redirected_to "#{Rails.application.config.shibboleth_login}?target=%2Fusers%2Fauth%2Fshibboleth%2Fcallback" - - # Try it passing in an idp - get "#{user_omniauth_shibboleth_path}?idp=foo" - assert_response :redirect - assert_redirected_to "#{Rails.application.config.shibboleth_login}?entityID=foo&target=%2Fusers%2Fauth%2Fshibboleth%2Fcallback" - end - -end \ No newline at end of file