Skip to content

Adjust CC License section to take i18n keys from csv instead of values from API #5735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ConfusionOrb221 wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −21
Open

Adjust CC License section to take i18n keys from csv instead of values from API #5735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@

@if (getSelectedCcLicense()) {
@for (field of getSelectedCcLicense().fields; track field) {
<div
class="mb-4">
<div class="mb-4">
<div class="d-flex flex-row">
<div class="fw-bold {{ field.id }}">
{{ field.label }}
{{ field.label | translate }}
</div>
<button
class="btn btn-outline-info btn-sm ms-2"
Expand All @@ -51,25 +50,24 @@
</div>
<ng-template #infoModal>
<div>
<div class="modal-header mb-4 ">
<div class="modal-header mb-4">
<div>
<h4>
{{ field.label }}
{{ field.label | translate }}
</h4>
<div [innerHTML]="field.description"></div>
<div [innerHTML]="field.description | translate"></div>
</div>
<button type="button" class="btn-close"
(click)="closeInfoModal()" aria-label="Close">
</button>
</div>
<div class="modal-body">
@for (value of field.enums; track value) {
<div
class="mb-4">
<div class="mb-4">
<h5>
{{ value.label }}
{{ value.label | translate }}
</h5>
<div [innerHTML]="value.description" class="fw-light"></div>
<div [innerHTML]="value.description | translate" class="fw-light"></div>
</div>
}
</div>
Expand All @@ -80,7 +78,7 @@ <h5>
<ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
@if (option) {
<span>
{{ option.label }}
{{ option.label | translate }}
</span>
}
@if (!option) {
Expand All @@ -95,7 +93,7 @@ <h5>
<button
class="dropdown-item"
(click)="selectOption(getSelectedCcLicense(), field, option)">
{{ option.label }}
{{ option.label | translate }}
</button>
}
</div>
Expand All @@ -104,14 +102,13 @@ <h5>
}
@if (field.enums?.length <= 5) {
@for (option of field.enums; track option) {
<div
class="d-flex flex-row m-1">
<div class="d-flex flex-row m-1">
<div (click)="selectOption(getSelectedCcLicense(), field, option)">
<input type="radio"
title="{{ option.label }}"
title="{{ option.label | translate }}"
class="me-1"
[checked]="isSelectedOption(getSelectedCcLicense(), field, option)">
<span>{{ option.label }}</span>
<span>{{ option.label | translate }}</span>
</div>
</div>
}
Expand All @@ -123,8 +120,7 @@ <h5>
@if (ccLicenseLink$) {
@let licenseLink = (ccLicenseLink$ | async);
@if (licenseLink) {
<div
class="mt-2 p-4 bg-light text-dark">
<div class="mt-2 p-4 bg-light text-dark">
<div>
{{ 'submission.sections.ccLicense.link' | translate }}
</div>
Expand All @@ -144,4 +140,4 @@ <h5>
} @else {
<ds-loading></ds-loading>
}
}
}
7 changes: 5 additions & 2 deletions src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
}

.ccLicense-select {
width: fit-content;
}
width: 400px;
ngb-dropdown, .input-group, input.form-control {
width: 100%;
}
}

.scrollable-menu {
height: auto;
Expand Down
24 changes: 24 additions & 0 deletions src/assets/i18n/en.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7889,4 +7889,28 @@
"bitstream.related.isReplacedBy": "Is replaced by",

"bitstream.related.deleted": "deleted",

"cc-license.commercial.label": "Allow modifications of your work?",

@toniprieto toniprieto Jun 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should it be: Allow commercial use of your work?

"cc-license.commercial.hint": "Choose whether others may use your work for commercial purposes.",

"cc-license.commercial.option.yes.label": "Yes",
"cc-license.commercial.option.yes.hint": "Visitors may copy, distribute, display and perform your Submission for any purpose, including commercial purposes.",

"cc-license.commercial.option.no.label": "No",
"cc-license.commercial.option.no.hint": "Visitors may copy, distribute, display and perform your Submission, but only for non-commercial purposes.",

"cc-license.derivatives.label": "Allow modifications of your work?",
"cc-license.derivatives.hint": "Choose whether others may create derivative works based on your Submission.",

"cc-license.derivatives.option.yes.label": "Yes",
"cc-license.derivatives.option.yes.hint": "Visitors may copy, distribute, display, perform and modify your Submission in any way.",

"cc-license.derivatives.option.sharealike.label": "ShareAlike",
"cc-license.derivatives.option.sharealike.hint": "Visitors are permitted to copy, display, perform and modify your Submission, as long as they distribute the modified version on similar use terms.",

"cc-license.derivatives.option.no.label": "No",
"cc-license.derivatives.option.no.hint": "Visitors are only permitted to copy and distribute unaltered versions of your Submission.",

"cc-license.jurisdiction.label": "Jurisdiction",
"cc-license.jurisdiction.hint": "Select the legal jurisdiction for your Creative Commons license, or leave as the default international license.",
}
Loading