Skip to content

Commit

Permalink
Merge branch 'release/24.02.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
adlius committed Jan 30, 2024
2 parents c1bb889 + be9d978 commit 435f7a9
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 17 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [24.02.0] - 2024-01-30
### Changed
- Update help links for licenses on draft registrations
- Fix submit button label on preprint landing page

## [24.01.0] - 2024-01-05
### Added
- Support for Disease and Data Type CollectionProvider metadata
Expand Down Expand Up @@ -1967,6 +1972,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Quick Files

[24.02.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.02.0
[24.01.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.01.0
[23.15.3]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.15.3
[23.15.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.15.2
[23.15.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.15.1
Expand Down
2 changes: 1 addition & 1 deletion app/preprints/index/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
local-class='btn btn-success btn-lg'
@href={{concat this.theme.pathPrefix 'submit'}}
>
{{t 'preprints.header.submit_label' documentType=this.theme.provider.content.documentType}}
{{t 'preprints.header.submit_label' documentType=this.theme.provider.documentType.singular}}
</OsfLink>
<div local-class='example-container'>
<OsfLink
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default class LicensePicker extends Component {

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

@alias('theme.provider') provider!: Provider;
@alias('form.changeset.license') selected!: License;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<a
target='_blank'
rel='noopener noreferrer'
href={{this.helpLink}}
href={{this.licenseHelpLink}}
>
{{t 'app_components.license_picker.faq'}}
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,5 @@ export default class RegistriesLicensePicker extends Component {

shouldShowButtons = false;
showText = false;
helpLink = 'https://help.osf.io/hc/en-us/articles/360019739014-Licensing';
registration!: BufferedChangeset | Registration;
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,6 @@
<LoadingIndicator @dark={{true}} />
{{/if}}

<div local-class='small help-link'>
<OsfLink
@target='_blank'
@rel='noopener noreferrer'
@href={{this.helpLink}}>
{{t 'app_components.license_picker.faq'}}
</OsfLink>
</div>

{{#if (and @manager.selectedLicense @manager.selectedLicense.requiredFields)}}
<form.custom
local-class='AdditionalFields'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-osf-web",
"version": "24.01.0",
"version": "24.02.0",
"private": true,
"description": "Ember front-end for the Open Science Framework",
"homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",
Expand Down
5 changes: 2 additions & 3 deletions translations/en-us.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1225,9 +1225,8 @@ preprints:
search_help: 'Search help'
powered_by: 'Powered by OSF Preprints'
or: 'or'
submit_label: 'Submit a preprint'
submit_label: 'Submit a {documentType}'
example: 'See an example'
authors_label:
subjects:
heading:
provider: 'Browse by provider'
Expand Down Expand Up @@ -1540,7 +1539,7 @@ registries:
save: 'Save'
clear_all: 'Clear all'
add_license: 'Add license'
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>.'
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>.'
affiliated_institutions: 'Affiliated institutions'
category: Category
choose_license: 'Choose a License'
Expand Down

0 comments on commit 435f7a9

Please sign in to comment.