Skip to content

Commit 435f7a9

Browse files
committed
Merge branch 'release/24.02.0'
2 parents c1bb889 + be9d978 commit 435f7a9

File tree

8 files changed

+13
-17
lines changed

8 files changed

+13
-17
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [24.02.0] - 2024-01-30
8+
### Changed
9+
- Update help links for licenses on draft registrations
10+
- Fix submit button label on preprint landing page
11+
712
## [24.01.0] - 2024-01-05
813
### Added
914
- Support for Disease and Data Type CollectionProvider metadata
@@ -1967,6 +1972,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
19671972
### Added
19681973
- Quick Files
19691974

1975+
[24.02.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.02.0
1976+
[24.01.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.01.0
19701977
[23.15.3]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.15.3
19711978
[23.15.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.15.2
19721979
[23.15.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.15.1

app/preprints/index/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
local-class='btn btn-success btn-lg'
3636
@href={{concat this.theme.pathPrefix 'submit'}}
3737
>
38-
{{t 'preprints.header.submit_label' documentType=this.theme.provider.content.documentType}}
38+
{{t 'preprints.header.submit_label' documentType=this.theme.provider.documentType.singular}}
3939
</OsfLink>
4040
<div local-class='example-container'>
4141
<OsfLink

lib/osf-components/addon/components/license-picker/component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default class LicensePicker extends Component {
3333

3434
showText = false;
3535
licensesAcceptable!: QueryHasManyResult<License>;
36-
helpLink = 'https://help.osf.io/';
36+
licenseHelpLink = 'https://help.osf.io/article/148-licensing';
3737

3838
@alias('theme.provider') provider!: Provider;
3939
@alias('form.changeset.license') selected!: License;

lib/osf-components/addon/components/license-picker/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<a
2424
target='_blank'
2525
rel='noopener noreferrer'
26-
href={{this.helpLink}}
26+
href={{this.licenseHelpLink}}
2727
>
2828
{{t 'app_components.license_picker.faq'}}
2929
</a>

lib/registries/addon/components/registries-license-picker/component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,5 @@ export default class RegistriesLicensePicker extends Component {
3535

3636
shouldShowButtons = false;
3737
showText = false;
38-
helpLink = 'https://help.osf.io/hc/en-us/articles/360019739014-Licensing';
3938
registration!: BufferedChangeset | Registration;
4039
}

lib/registries/addon/components/registries-license-picker/template.hbs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@
2727
<LoadingIndicator @dark={{true}} />
2828
{{/if}}
2929

30-
<div local-class='small help-link'>
31-
<OsfLink
32-
@target='_blank'
33-
@rel='noopener noreferrer'
34-
@href={{this.helpLink}}>
35-
{{t 'app_components.license_picker.faq'}}
36-
</OsfLink>
37-
</div>
38-
3930
{{#if (and @manager.selectedLicense @manager.selectedLicense.requiredFields)}}
4031
<form.custom
4132
local-class='AdditionalFields'

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-osf-web",
3-
"version": "24.01.0",
3+
"version": "24.02.0",
44
"private": true,
55
"description": "Ember front-end for the Open Science Framework",
66
"homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",

translations/en-us.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,9 +1225,8 @@ preprints:
12251225
search_help: 'Search help'
12261226
powered_by: 'Powered by OSF Preprints'
12271227
or: 'or'
1228-
submit_label: 'Submit a preprint'
1228+
submit_label: 'Submit a {documentType}'
12291229
example: 'See an example'
1230-
authors_label:
12311230
subjects:
12321231
heading:
12331232
provider: 'Browse by provider'
@@ -1540,7 +1539,7 @@ registries:
15401539
save: 'Save'
15411540
clear_all: 'Clear all'
15421541
add_license: 'Add license'
1543-
license_help_text: 'A license tells others how they can use your work in the future and only applies to the information and files submitted with the registration. For more information, see this <a href="https://help.osf.io/hc/en-us/articles/360019739014-Licensing" target="_blank" rel="noopener noreferrer">article on licenses</a>.'
1542+
license_help_text: 'A license tells others how they can use your work in the future and only applies to the information and files submitted with the registration. For more information, see this <a href="https://help.osf.io/article/148-licensing" target="_blank" rel="noopener noreferrer">help guide</a>.'
15441543
affiliated_institutions: 'Affiliated institutions'
15451544
category: Category
15461545
choose_license: 'Choose a License'

0 commit comments

Comments
 (0)