diff --git a/app/models/concerns/mailable.rb b/app/models/concerns/mailable.rb index dd8e6fe25..77a61f32b 100644 --- a/app/models/concerns/mailable.rb +++ b/app/models/concerns/mailable.rb @@ -26,7 +26,7 @@ def send_welcome_email jwt = encode_token(payload.merge(iat: Time.now.to_i, exp: Time.now.to_i + 3600 * 24)) url = ENV['BRACCO_URL'] + "?jwt=" + jwt reset_url = ENV['BRACCO_URL'] + "/reset" - title = Rails.env.stage? ? "DataCite DOI Fabrica Test" : "DataCite DOI Fabrica" + title = Rails.env.stage? ? "DataCite Fabrica Test" : "DataCite Fabrica" subject = "#{title}: New Account" text = User.format_message_text(template: "users/welcome.text.erb", title: title, contact_name: name, name: symbol, url: url, reset_url: reset_url) html = User.format_message_html(template: "users/welcome.html.erb", title: title, contact_name: name, name: symbol, url: url, reset_url: reset_url) @@ -44,7 +44,7 @@ def send_welcome_email end def send_delete_email - title = Rails.env.stage? ? "DataCite DOI Fabrica Test" : "DataCite DOI Fabrica" + title = Rails.env.stage? ? "DataCite Fabrica Test" : "DataCite Fabrica" subject = "#{title}: Account Deleted" text = User.format_message_text(template: "users/delete.text.erb", title: title, contact_name: name, name: symbol) html = User.format_message_html(template: "users/delete.html.erb", title: title, contact_name: name, name: symbol) diff --git a/app/models/user.rb b/app/models/user.rb index da1ecc777..66f3717b8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -115,7 +115,7 @@ def self.reset(username) jwt = encode_token(payload.merge(iat: Time.now.to_i, exp: Time.now.to_i + 3600 * 24)) url = ENV['BRACCO_URL'] + "?jwt=" + jwt reset_url = ENV['BRACCO_URL'] + "/reset" - title = Rails.env.stage? ? "DataCite DOI Fabrica Test" : "DataCite DOI Fabrica" + title = Rails.env.stage? ? "DataCite Fabrica Test" : "DataCite Fabrica" subject = "#{title}: Password Reset Request" text = User.format_message_text(template: "users/reset.text.erb", title: title, contact_name: user.name, name: user.symbol, url: url, reset_url: reset_url) html = User.format_message_html(template: "users/reset.html.erb", title: title, contact_name: user.name, name: user.symbol, url: url, reset_url: reset_url) diff --git a/spec/concerns/mailable_spec.rb b/spec/concerns/mailable_spec.rb index b162035ed..f77617536 100644 --- a/spec/concerns/mailable_spec.rb +++ b/spec/concerns/mailable_spec.rb @@ -3,7 +3,7 @@ describe "Mailable", type: :model, vcr: true do let(:token) { User.generate_token } let(:client) { create(:client, name: "DATACITE.DATACITE", contact_email: "test@datacite.org") } - let(:title) { "DataCite DOI Fabrica" } + let(:title) { "DataCite Fabrica" } it "send_welcome_email" do response = client.send_welcome_email @@ -29,7 +29,7 @@ text = <<~BODY Dear #{client.name}, - Someone has requested a login link for the DataCite DOI Fabrica '#{client.name}' account. + Someone has requested a login link for the DataCite Fabrica '#{client.name}' account. You can change your password with the following link: diff --git a/vendor/middleman/source/index.html.md b/vendor/middleman/source/index.html.md index 96aad702e..5cb545a54 100644 --- a/vendor/middleman/source/index.html.md +++ b/vendor/middleman/source/index.html.md @@ -5,6 +5,6 @@ description: The API to interact with all DataCite resources. --- The DataCite REST API allows users to interact with DataCite resources such as dois, clients, providers and prefixes. Please use -[DataCite Search](https://search.datacite.org) or [DOI Fabrica](https://doi.datacite.org) (members and clients) if you are looking for a web interface. The API follows the [JSONAPI](http://jsonapi.org/) specification, and requires authentication for some actions. +[DataCite Search](https://search.datacite.org) or [Fabrica](https://doi.datacite.org) (members and repositories) if you are looking for a web interface. The API follows the [JSONAPI](http://jsonapi.org/) specification, and requires authentication for some actions. You will find more information about the REST API in our [documentation portal](https://support.datacite.org/docs/api).