Merge branch 'dev' into dev-11.0

vufind-org · Sep 13, 2024 · 00f4a45 · 00f4a45
2 parents 23eb13e + 8410887
commit 00f4a45
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -111,7 +111,7 @@
         "phpstan/phpstan": "1.12.2",
         "phpunit/php-code-coverage": "10.1.16",
         "phpunit/phpcov": "^9.0",
-        "phpunit/phpunit": "10.5.32",
+        "phpunit/phpunit": "10.5.34",
         "pietercolpaert/hardf": "0.5.0",
         "squizlabs/php_codesniffer": "3.10.2"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/themes/bootstrap3/templates/_ui/components/confirm-button.phtml b/themes/bootstrap3/templates/_ui/components/confirm-button.phtml
@@ -48,7 +48,7 @@
     $confirmAttrs['id'] = $id;
   }
   if ($title = $this->confirmTitle) {
-    $confirmAttrs['title'] = $title;
+    $confirmAttrs['title'] = $this->translate($title);
   }
   if ($class = $this->confirmClass) {
     $confirmAttrs['class'] .= " $class";
@@ -68,7 +68,7 @@
     $cancelAttrs['id'] = $id;
   }
   if ($title = $this->cancelTitle) {
-    $cancelAttrs['title'] = $title;
+    $cancelAttrs['title'] = $this->translate($title);
   }
   if ($class = $this->cancelClass) {
     $cancelAttrs['class'] .= " $class";

diff --git a/themes/bootstrap3/templates/checkouts/history.phtml b/themes/bootstrap3/templates/checkouts/history.phtml
@@ -52,7 +52,7 @@
                       'buttonLabel' => 'loan_history_purge_selected',
                       'header' => 'loan_history_confirm_purge_selected',
                       'confirmId' => 'confirm_purge_selected_yes',
-                      'confirmTitle' => 'bookbag_confirm_empty',
+                      'confirmTitle' => 'loan_history_confirm_purge_selected',
                       'cancelClass' => 'confirm_purge_no',
                   ]
               )
@@ -69,7 +69,7 @@
                       'buttonLabel' => 'loan_history_purge_all',
                       'header' => 'loan_history_confirm_purge_all',
                       'confirmId' => 'confirm_purge_all_yes',
-                      'confirmTitle' => 'bookbag_confirm_empty',
+                      'confirmTitle' => 'loan_history_confirm_purge_all',
                       'cancelClass' => 'confirm_purge_no',
                   ]
               )

diff --git a/themes/bootstrap3/templates/holds/list.phtml b/themes/bootstrap3/templates/holds/list.phtml
@@ -57,7 +57,7 @@
                         'buttonLabel' => 'hold_cancel_all',
                         'header' => 'confirm_hold_cancel_all_text',
                         'confirmId' => 'confirm_cancel_all_yes',
-                        'confirmTitle' => 'bookbag_confirm_empty',
+                        'confirmTitle' => 'confirm_hold_cancel_all_text',
                         'cancelClass' => 'confirm_cancel_no',
                         'ignoreLightbox' => true,
                     ]

diff --git a/themes/bootstrap5/templates/_ui/components/confirm-button.phtml b/themes/bootstrap5/templates/_ui/components/confirm-button.phtml
@@ -48,7 +48,7 @@
     $confirmAttrs['id'] = $id;
   }
   if ($title = $this->confirmTitle) {
-    $confirmAttrs['title'] = $title;
+    $confirmAttrs['title'] = $this->translate($title);
   }
   if ($class = $this->confirmClass) {
     $confirmAttrs['class'] .= " $class";
@@ -68,7 +68,7 @@
     $cancelAttrs['id'] = $id;
   }
   if ($title = $this->cancelTitle) {
-    $cancelAttrs['title'] = $title;
+    $cancelAttrs['title'] = $this->translate($title);
   }
   if ($class = $this->cancelClass) {
     $cancelAttrs['class'] .= " $class";

diff --git a/themes/bootstrap5/templates/checkouts/history.phtml b/themes/bootstrap5/templates/checkouts/history.phtml
@@ -52,7 +52,7 @@
                       'buttonLabel' => 'loan_history_purge_selected',
                       'header' => 'loan_history_confirm_purge_selected',
                       'confirmId' => 'confirm_purge_selected_yes',
-                      'confirmTitle' => 'bookbag_confirm_empty',
+                      'confirmTitle' => 'loan_history_confirm_purge_selected',
                       'cancelClass' => 'confirm_purge_no',
                   ]
               )
@@ -69,7 +69,7 @@
                       'buttonLabel' => 'loan_history_purge_all',
                       'header' => 'loan_history_confirm_purge_all',
                       'confirmId' => 'confirm_purge_all_yes',
-                      'confirmTitle' => 'bookbag_confirm_empty',
+                      'confirmTitle' => 'loan_history_confirm_purge_all',
                       'cancelClass' => 'confirm_purge_no',
                   ]
               )

diff --git a/themes/bootstrap5/templates/holds/list.phtml b/themes/bootstrap5/templates/holds/list.phtml
@@ -57,7 +57,7 @@
                         'buttonLabel' => 'hold_cancel_all',
                         'header' => 'confirm_hold_cancel_all_text',
                         'confirmId' => 'confirm_cancel_all_yes',
-                        'confirmTitle' => 'bookbag_confirm_empty',
+                        'confirmTitle' => 'confirm_hold_cancel_all_text',
                         'cancelClass' => 'confirm_cancel_no',
                         'ignoreLightbox' => true,
                     ]