diff --git a/lib/generators/hyrax/templates/config/authorities/licenses.yml b/lib/generators/hyrax/templates/config/authorities/licenses.yml
index 4c410c32f0..89dd602ade 100644
--- a/lib/generators/hyrax/templates/config/authorities/licenses.yml
+++ b/lib/generators/hyrax/templates/config/authorities/licenses.yml
@@ -1,28 +1,46 @@
terms:
- id: http://creativecommons.org/licenses/by/3.0/us/
term: Attribution 3.0 United States
- active: true
+ active: false
- id: http://creativecommons.org/licenses/by-sa/3.0/us/
term: Attribution-ShareAlike 3.0 United States
- active: true
+ active: false
- id: http://creativecommons.org/licenses/by-nc/3.0/us/
term: Attribution-NonCommercial 3.0 United States
- active: true
+ active: false
- id: http://creativecommons.org/licenses/by-nd/3.0/us/
term: Attribution-NoDerivs 3.0 United States
- active: true
+ active: false
- id: http://creativecommons.org/licenses/by-nc-nd/3.0/us/
term: Attribution-NonCommercial-NoDerivs 3.0 United States
- active: true
+ active: false
- id: http://creativecommons.org/licenses/by-nc-sa/3.0/us/
term: Attribution-NonCommercial-ShareAlike 3.0 United States
+ active: false
+ - id: http://www.europeana.eu/portal/rights/rr-r.html
+ term: All rights reserved
+ active: false
+ - id: https://creativecommons.org/licenses/by/4.0/
+ term: Creative Commons BY Attribution 4.0 International
active: true
- - id: http://creativecommons.org/publicdomain/mark/1.0/
- term: Public Domain Mark 1.0
+ - id: https://creativecommons.org/licenses/by-sa/4.0/
+ term: Creative Commons BY-SA Attribution-ShareAlike 4.0 International
+ active: true
+ - id: https://creativecommons.org/licenses/by-nd/4.0/
+ term: Creative Commons BY-ND Attribution-NoDerivatives 4.0 International
+ active: true
+ - id: https://creativecommons.org/licenses/by-nc/4.0/
+ term: Creative Commons BY-NC Attribution-NonCommercial 4.0 International
+ active: true
+ - id: https://creativecommons.org/licenses/by-nc-nd/4.0/
+ term: Creative Commons BY-NC-ND Attribution-NonCommercial-NoDerivs 4.0 International
+ active: true
+ - id: https://creativecommons.org/licenses/by-nc-sa/4.0/
+ term: Creative Commons BY-NC-SA Attribution-NonCommercial-ShareAlike 4.0 International
active: true
- id: http://creativecommons.org/publicdomain/zero/1.0/
- term: CC0 1.0 Universal
+ term: Creative Commons CC0 1.0 Universal
active: true
- - id: http://www.europeana.eu/portal/rights/rr-r.html
- term: All rights reserved
+ - id: http://creativecommons.org/publicdomain/mark/1.0/
+ term: Creative Commons Public Domain Mark 1.0
active: true
diff --git a/spec/helpers/blacklight_helper_spec.rb b/spec/helpers/blacklight_helper_spec.rb
index 1070b792a4..413d7b2181 100644
--- a/spec/helpers/blacklight_helper_spec.rb
+++ b/spec/helpers/blacklight_helper_spec.rb
@@ -1,3 +1,5 @@
+# coding: utf-8
+
RSpec.describe BlacklightHelper, type: :helper do
let(:blacklight_config) { CatalogController.blacklight_config }
let(:attributes) do
@@ -49,8 +51,8 @@ def search_action_path(stuff)
let(:field_name) { 'rights_tesim' }
it do
- is_expected.to eq "CC0 1.0 Universal, " \
- "Public Domain Mark 1.0, " \
+ is_expected.to eq "Creative Commons CC0 1.0 Universal, " \
+ "Creative Commons Public Domain Mark 1.0, " \
"and All rights reserved"
end
end
diff --git a/spec/helpers/hyrax_helper_spec.rb b/spec/helpers/hyrax_helper_spec.rb
index 4bec69b252..e2d5000ade 100644
--- a/spec/helpers/hyrax_helper_spec.rb
+++ b/spec/helpers/hyrax_helper_spec.rb
@@ -321,16 +321,16 @@ def new_state
it "maps the url to a link with a label" do
expect(helper.license_links(
value: ["http://creativecommons.org/publicdomain/zero/1.0/"]
- )).to eq("CC0 1.0 Universal")
+ )).to eq("Creative Commons CC0 1.0 Universal")
end
- it "converts multiple rights statements to a sentence" do
+ it "converts multiple licenses to a sentence" do
expect(helper.license_links(
value: ["http://creativecommons.org/publicdomain/zero/1.0/",
"http://creativecommons.org/publicdomain/mark/1.0/",
"http://www.europeana.eu/portal/rights/rr-r.html"]
- )).to eq("CC0 1.0 Universal, " \
- "Public Domain Mark 1.0, " \
+ )).to eq("Creative Commons CC0 1.0 Universal, " \
+ "Creative Commons Public Domain Mark 1.0, " \
"and All rights reserved")
end
end