Merge pull request #610 from danskernesdigitalebibliotek/release/2024…

…-1-0 Release/2024 1 0
danskernesdigitalebibliotek · Jan 8, 2024 · 92d9bc3 · 92d9bc3
2 parents ca4d69a + 48d3248
commit 92d9bc3
Show file tree

Hide file tree

Showing 10 changed files with 304 additions and 282 deletions.
diff --git a/composer.json b/composer.json
@@ -36,10 +36,10 @@
             "type": "package",
             "package": {
                 "name": "danskernesdigitalebibliotek/dpl-react",
-                "version": "2023.51.0",
+                "version": "2024.1.1",
                 "type": "drupal-library",
                 "dist": {
-                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2023.51.0/dist-2023-51-0-3f307dca1ba8323d5be6efa174ed428c3a8af4c9.zip",
+                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.1.0/dist-2024-1-0-2781c91a4734260244efe90d031c1db02984f81d.zip",
                     "type": "zip"
                 },
                 "require": {
@@ -52,9 +52,9 @@
             "package": {
                 "name": "danskernesdigitalebibliotek/dpl-design-system",
                 "type": "drupal-library",
-                "version": "2023.51.0",
+                "version": "2024.1.0",
                 "dist": {
-                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2023.51.0/dist-2023-51-0-cd7e0937a067366392e60d85a9831b7d1cdf363e.zip",
+                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.1.0/dist-2024-1-0-7adbfa5f0ec9c36c92e2b0b813049daed9022698.zip",
                     "type": "zip"
                 }
             }
@@ -74,8 +74,8 @@
         "brick/math": "^0.12.1",
         "composer/installers": "1.12.0",
         "cweagans/composer-patches": "1.7.3",
-        "danskernesdigitalebibliotek/dpl-design-system": "2023.51.0",
-        "danskernesdigitalebibliotek/dpl-react": "2023.51.0",
+        "danskernesdigitalebibliotek/dpl-design-system": "^2024.1",
+        "danskernesdigitalebibliotek/dpl-react": "^2024.1",
         "danskernesdigitalebibliotek/fbs-client": "*",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "deoliveiralucas/array-keys-case-transform": "^1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/web/modules/custom/dpl_dashboard/src/Plugin/Block/DashboardBlock.php b/web/modules/custom/dpl_dashboard/src/Plugin/Block/DashboardBlock.php
@@ -110,12 +110,10 @@ public function build(): array {
       'group-modal-aria-description-text' => $this->t('This modal makes it possible to renew materials', [], ['context' => 'Dashboard (Aria)']),
       'intermediate-text' => $this->t('Intermediates', [], ['context' => 'Dashboard']),
       'list-details-nothing-selected-label-text' => $this->t('Pick', [], ['context' => 'Dashboard']),
-      'loans-not-overdue-text' => $this->t('Longer return time', [], ['context' => 'Dashboard']),
       'no-physical-loans-text' => $this->t('At the moment, you have 0 physical loans', [], ['context' => 'Dashboard']),
       'no-reservations-text' => $this->t('At the moment, you have 0 reservations', [], ['context' => 'Dashboard']),
       'physical-loans-text' => $this->t('Loans', [], ['context' => 'Dashboard']),
       'queued-reservations-text' => $this->t('Queued reservations', [], ['context' => 'Dashboard']),
-      'reservations-still-in-queue-for-text' => $this->t('Still in queue', [], ['context' => 'Dashboard']),
       'reservations-text' => $this->t('Reservations', [], ['context' => 'Dashboard']),
       'total-amount-fee-text' => $this->t('@total,-', [], ['context' => 'Dashboard']),
       'total-owed-text' => $this->t('You owe in total', [], ['context' => 'Dashboard']),

diff --git a/web/modules/custom/dpl_fees/src/Plugin/Block/FeesListBlock.php b/web/modules/custom/dpl_fees/src/Plugin/Block/FeesListBlock.php
@@ -93,6 +93,7 @@ public function build() {
       'fee-payment-modal-notice-text' => $this->t("Paid fees can take up to 24 hours to registrer.", [], ['context' => 'Fees list']),
       'i-accept-text' => $this->t("I accept the", [], ['context' => 'Fees list']),
       'item-fee-amount-text' => $this->t("Fee @fee,-", [], ['context' => 'Fees list']),
+      'material-number-text' => $this->t("# @materialNumber", [], ['context' => 'Fees list']),
       'other-materials-text' => $this->t("Other materials", [], ['context' => 'Fees list']),
       'pay-text' => $this->t("Pay", [], ['context' => 'Fees list']),
       'plus-x-other-materials-text' => $this->t("+ @amount other materials", [], ['context' => 'Fees list']),

diff --git a/web/modules/custom/dpl_loans/src/Plugin/Block/LoanListBlock.php b/web/modules/custom/dpl_loans/src/Plugin/Block/LoanListBlock.php
@@ -95,15 +95,7 @@ public function build() {
       'material-overdue-url' => Url::fromRoute('dpl_loans.list', [], ['absolute' => TRUE])->toString(),
 
       // Texts.
-      'group-modal-go-to-material-aria-label-text' => $this->t("Go to @label material details", [], ['context' => 'Loan list (Aria)']),
       'group-modal-header-text' => $this->t("Renew several", [], ['context' => 'Loan list']),
-      'loan-list-additional-materials' => [
-        'type' => 'plural',
-        'text' => [
-          $this->t('+ 1 other material', [], ['context' => 'Loan list']),
-          $this->t('+ @count other materials', [], ['context' => 'Loan list']),
-        ],
-      ],
       'loan-list-aria-label-list-button-text' => $this->t("This button shows all loans in the list", [], ['context' => 'Loan list (Aria)']),
       'loan-list-aria-label-stack-button-text' => $this->t("This button filters the list, so only one the materials that have the same due date is shown", [], ['context' => 'Loan list (Aria)']),
       'loan-list-digital-loans-empty-list-text' => $this->t("You have no digital loans at the moment", [], ['context' => 'Loan list']),

diff --git a/web/modules/custom/dpl_patron_page/src/Plugin/Block/PatronPageBlock.php b/web/modules/custom/dpl_patron_page/src/Plugin/Block/PatronPageBlock.php
@@ -95,7 +95,6 @@ public function build() {
       'pause-reservation-info-url' => dpl_react_apps_format_app_url($patron_page_settings->get('pause_reservation_info_url'), GeneralSettings::PAUSE_RESERVATION_INFO_URL),
 
       // Texts.
-      'pause-reservation-modal-cancel-button-label-text' => $this->t('Cancel pause', [], ['context' => 'Patron page']),
       'patron-page-basic-details-address-label-text' => $this->t('Address', [], ['context' => 'Patron page']),
       'patron-page-basic-details-header-text' => $this->t('BASIC DETAILS', [], ['context' => 'Patron page']),
       'patron-page-basic-details-name-label-text' => $this->t('Name', [], ['context' => 'Patron page']),

diff --git a/web/modules/custom/dpl_react_apps/dpl_react_apps.module b/web/modules/custom/dpl_react_apps/dpl_react_apps.module
@@ -88,6 +88,10 @@ function dpl_react_apps_texts(): array {
     'change-interest-period' => t('Change interest period', [], ['context' => 'Global']),
     'change-pickup-location' => t('Change pickup location', [], ['context' => 'Global']),
     'choose-one' => t('Choose one', [], ['context' => 'Global']),
+    'close-modal-aria-label-email' => t('Close change email modal', [], ['context' => 'Global']),
+    'close-modal-aria-label-interest-period' => t('Close interest period modal', [], ['context' => 'Global']),
+    'close-modal-aria-label-pickup' => t('Close pickup location modal', [], ['context' => 'Global']),
+    'close-modal-aria-label-sms' => t('Close modal aria-label sms', [], ['context' => 'Global']),
     'dashboard-number-in-line' => t('Number @count in line', [], ['context' => 'Global']),
     'date-inputs-end-date-label' => t('To', [], ['context' => 'Global']),
     'date-inputs-start-date-label' => t('From', [], ['context' => 'Global']),
@@ -117,6 +121,8 @@ function dpl_react_apps_texts(): array {
     'delete-reservation-modal-not-regrettable' => t('You cannot regret this action', [], ['context' => 'Global']),
     'digital-reservations-header' => t('Digital reservations', [], ['context' => 'Global']),
     'et-al' => t('et al.', [], ['context' => 'Global']),
+    'find-on-shelf-expand-button-explanation' => t('Find on shelf expand button explanation', [], ['context' => 'Global']),
+    'find-on-shelf-table-description' => t('Find @work on shelf in the @branch branch', [], ['context' => 'Global']),
     'group-modal-button' => t('Renewable (@count)', [], ['context' => 'Global']),
     'group-modal-checkbox' => t('Choose all', [], ['context' => 'Global']),
     'group-modal-due-date-aria-description' => t('This modal groups loans after due date and makes it possible to renew said loans', [], ['context' => 'Global']),
@@ -133,13 +139,22 @@ function dpl_react_apps_texts(): array {
     'group-modal-renew-loan-denied-max-renewals-reached' => t("The item cannot be renewed further", [], ['context' => 'Global']),
     'group-modal-renew-loan-denied-reserved' => t("The item is reserved by another patron", [], ['context' => 'Global']),
     'group-modal-return-library' => t("Can be returned to all branches of the municipalities libraries", [], ['context' => 'Global']),
+    'group-modal-go-to-material-aria-label' => t("Go to @label material details", [], ['context' => 'Global']),
     'group-modal-reservations-close-modal-aria-label' => t('Close modal with grouped reservations', [], ['context' => 'Global']),
     'group-modal-reservations-loans-aria-description' => t('This modal makes it possible to delete reservations', [], ['context' => 'Global']),
     'header-dropdown-item-advanced-search' => t('Advanced search', [], ['context' => 'Global']),
     'in-series' => t('in series', [], ['context' => 'Global']),
     'in' => t('in', [], ['context' => 'Global']),
     'input-placeholder' => t('Start typing in order to search', [], ['context' => 'Global']),
     'loading' => t('loading', [], ['context' => 'Global']),
+    'loan-list-additional-materials' => json_encode([
+      'type' => 'plural',
+      'text' => [
+        t('+ 1 other material', [], ['context' => 'Loan list']),
+        t('+ @count other materials', [], ['context' => 'Loan list']),
+      ],
+    ]),
+    'loans-not-overdue' => t('Longer return time', [], ['context' => 'Global']),
     'loans-overdue' => t('Returned too late', [], ['context' => 'Global']),
     'loans-soon-overdue' => t('To be returned soon', [], ['context' => 'Global']),
     'material-and-author' => t('and', [], ['context' => 'Global']),
@@ -157,9 +172,11 @@ function dpl_react_apps_texts(): array {
     'material-details-warning-loan-overdue' => t('The due date of return is exceeded, therefore you will be charged a fee, when the item is returned', [], ['context' => 'Global']),
     'modal-reservation-form-no-interest-after-header-description' => t('Set date for when your interest for the material will expire.', [], ['context' => 'Global']),
     'modal-reservation-form-no-interest-after-header-title' => t('Change interest deadline', [], ['context' => 'Global']),
+    'modal-reservation-form-no-interest-after-label' => t("Change the amount of time after which you're no longer interested in this material.", [], ['context' => 'Global']),
     'modal-reservation-form-pickup-header-title' => t('Choose pickup library', [], ['context' => 'Global']),
     'modal-reservation-form-pickup-header-description' => t('Decide at which library you want to pickup the material.', [], ['context' => 'Global']),
-    'multiselect-all-option' => t('All', [], ['context' => 'Global']),
+    'modal-reservation-form-pickup-label' => t("Change pickup location for your reservation.", [], ['context' => 'Global']),
+    'multiselect-all-option' => t("Multiselect - all option", [], ['context' => 'Global']),
     'no-search-result' => t('Your search has 0 results', [], ['context' => 'Global']),
     'number-description' => t('nr.', [], ['context' => 'Global']),
     'one-month' => t('1 month', [], ['context' => 'Global']),
@@ -177,6 +194,7 @@ function dpl_react_apps_texts(): array {
     'pause-reservation-modal-aria-description' => t('This modal makes it possible to pause your physical reservations', [], ['context' => 'Global']),
     'pause-reservation-modal-below-inputs' => t('Pause reservation below inputs text', [], ['context' => 'Global']),
     'pause-reservation-modal-body' => t('Pause your reservations early, since reservations that are already being processed, will not be paused.', [], ['context' => 'Global']),
+    'pause-reservation-modal-cancel-button-label' => t('Cancel pause', [], ['context' => 'Global']),
     'pause-reservation-modal-close-modal' => t('Close pause reservations modal', [], ['context' => 'Global']),
     'pause-reservation-modal-header' => t('Pause reservations on physical items', [], ['context' => 'Global']),
     'pause-reservation-modal-link' => t('Read more', [], ['context' => 'Global']),
@@ -214,21 +232,72 @@ function dpl_react_apps_texts(): array {
     'renew-processing' => t('Processing...', [], ['context' => 'Renew loan']),
     'reservation-details-borrow-before' => t('Borrow before @date', [], ['context' => 'Global']),
     'reservation-details-button-remove' => t('Remove your reservation', [], ['context' => 'Global']),
+    'reservation-details-cancel' => t('Cancel', [], ['context' => 'Global']),
     'reservation-details-change' => t('Apply changes', [], ['context' => 'Global']),
     'reservation-details-date-of-reservation-title' => t('Date of reservation', [], ['context' => 'Global']),
+    'reservation-details-digital-material-expires-title' => t('Borrow before', [], ['context' => 'Global']),
     'reservation-details-digital-reservation-go-to-ereolen' => t('Go to eReolen', [], ['context' => 'Global']),
+    'reservation-details-expires' => t('Your reservation expires @date!', [], ['context' => 'Global']),
+    'reservation-details-expires-title' => t('Pickup deadline', [], ['context' => 'Global']),
     'reservation-details-no-interest-after-title' => t('Not interested after', [], ['context' => 'Global']),
     'reservation-details-number-in-queue-label' => t('@count queued', [], ['context' => 'Global']),
     'reservation-details-others-in-queue' => t('Others are queueing for this material', [], ['context' => 'Global']),
     'reservation-details-pick-up-at-title' => t('Pickup branch', [], ['context' => 'Global']),
     'reservation-details-pickup-deadline-title' => t('Pickup deadline', [], ['context' => 'Global']),
     'reservation-details-ready-for-loan' => t('Ready for pickup', [], ['context' => 'Global']),
     'reservation-details-remove-digital-reservation' => t('Remove your reservation', [], ['context' => 'Global']),
+    'reservation-details-save' => t('Save', [], ['context' => 'Global']),
     'reservation-details-status-title' => t('Status', [], ['context' => 'Global']),
+    'reservation-list-all-empty' => t('At the moment you have 0 reservations', [], ['context' => 'Global']),
+    'reservation-list-day' => t('day', [], ['context' => 'Global']),
+    'reservation-list-digital-pickup' => t('Online access', [], ['context' => 'Global']),
+    'reservation-list-digital-reservations-empty' => t('At the moment you have 0 reservations on digital items', [], ['context' => 'Global']),
+    'reservation-list-digital-reservations-header' => t('Digital reservations', [], ['context' => 'Global']),
+    'reservation-list-first-in-queue' => t('You are at the front of the queue', [], ['context' => 'Global']),
+    'reservation-list-header' => t('Your reservations', [], ['context' => 'Global']),
+    'reservation-list-loan-before' => t('Borrow before @date', [], ['context' => 'Global']),
+    'reservation-list-on-hold-aria' => t('Reservations have been paused in the following time span:', [], ['context' => 'Global']),
+    'reservation-list-pause-reservation-aria-modal' => t('This button opens a modal that covers the entire page and contains the possibility to pause physical reservations', [], ['context' => 'Global']),
+    'reservation-list-pause-reservation-button' => t('Settings', [], ['context' => 'Global']),
+    'reservation-list-pause-reservation-on-hold' => t('Your reservations are paused', [], ['context' => 'Global']),
+    'reservation-list-pause-reservation' => t('Pause reservations on physical items', [], ['context' => 'Global']),
+    'reservation-list-physical-reservations-empty' => t('At the moment you have 0 physical reservations', [], ['context' => 'Global']),
+    'reservation-list-physical-reservations-header' => t('Physical reservations', [], ['context' => 'Global']),
+    'reservation-list-ready-for-pickup-empty' => t('At the moment you have 0 reservations ready for pickup', [], ['context' => 'Global']),
+    'reservation-list-ready-for-pickup-title' => t('Ready for pickup', [], ['context' => 'Global']),
+    'reservation-list-ready' => t('Ready', [], ['context' => 'Global']),
+    'reservation-list-status-icon-ready-for-pickup-aria-label' => t('This material is ready for pickup', [], ['context' => 'Global']),
+    'reservation-list-status-icon-queued-aria-label' => json_encode([
+      'type' => 'plural',
+      'text' => [
+        t('You are the only person queued for this material', [], ['context' => 'Global']),
+        t('This material has @count people in queue before you', [], ['context' => 'Global']),
+      ],
+    ]),
+    'reservation-list-status-icon-ready-in-aria-label' => json_encode([
+      'type' => 'plural',
+      'text' => [
+        t('This material is ready in 1 day', [], ['context' => 'Global']),
+        t('This material is ready in @count days', [], ['context' => 'Global']),
+      ],
+    ]),
+    'reservation-status-button' => t('Close', [], ['context' => 'Global']),
+    'reservation-list-available-in' => t('Available in @count days', [], ['context' => 'Global']),
+    'reservation-list-days' => t('days', [], ['context' => 'Global']),
+    'reservation-list-in-queue' => t('queued', [], ['context' => 'Global']),
+    'reservation-list-number-in-queue' => t('There are @count people in the queue before you', [], ['context' => 'Global']),
+    'reservation-pick-up-latest' => t('Pick up before @date', [], ['context' => 'Global']),
+    'reservations-still-in-queue-for' => t('Still in queue', [], ['context' => 'Global']),
     'reservations-ready' => t('Ready for you', [], ['context' => 'Global']),
     'result-pager-status' => t('Showing @itemsShown out of @hitcount items', [], ['context' => 'Global']),
+    'reservation-success-sub-title' => t('Click the button below to close this window', [], ['context' => 'Global']),
+    'reservation-success-title' => t('Your reservation has been changed', [], ['context' => 'Global']),
     'search-header-dropdown' => t('Dropdown with additional search functions', [], ['context' => 'Global']),
     'save-button' => t('Save', [], ['context' => 'Global']),
+    'screen-reader-modal-description-email' => t('Screen reader modal description for email', [], ['context' => 'Global']),
+    'screen-reader-modal-description-interest-period' => t('Screen reader modal description for interest period', [], ['context' => 'Global']),
+    'screen-reader-modal-description-pickup' => t('Screen reader modal description for pickup', [], ['context' => 'Global']),
+    'screen-reader-modal-description-sms' => t('Screen reader modal description for sms', [], ['context' => 'Global']),
     'search-header-icon-alt' => t('Search button', [], ['context' => 'Global']),
     'search-header-input-label' => t('Search header input', [], ['context' => 'Global']),
     'search-no-valid-characters-error' => t('Input must contain at least one non-whitespace character.', [], ['context' => 'Global']),