From 81e72805ee78c5003d5a65ccf1a5bf2b6b146bca Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 2 Oct 2022 21:15:42 +0000 Subject: [PATCH] Bug 24860: (QA follow-up) Terminology and translation fixes * Fixes a single to a double underscore for translation in holds.js * Fixes item_group to item group in API description * Fixes volume hold to item group hold in syspref db descrpitions --- api/v1/swagger/definitions/hold.yaml | 2 +- installer/data/mysql/atomicupdate/bug_24860.perl | 2 +- installer/data/mysql/mandatory/sysprefs.sql | 2 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/v1/swagger/definitions/hold.yaml b/api/v1/swagger/definitions/hold.yaml index 2c5ac09f8d..a7d0d39330 100644 --- a/api/v1/swagger/definitions/hold.yaml +++ b/api/v1/swagger/definitions/hold.yaml @@ -20,7 +20,7 @@ properties: type: - string - "null" - description: Internal item_group identifier + description: Internal item group identifier pickup_library_id: type: - string diff --git a/installer/data/mysql/atomicupdate/bug_24860.perl b/installer/data/mysql/atomicupdate/bug_24860.perl index 010f74c157..861dc759d8 100644 --- a/installer/data/mysql/atomicupdate/bug_24860.perl +++ b/installer/data/mysql/atomicupdate/bug_24860.perl @@ -18,7 +18,7 @@ if ( CheckVersion( $DBversion ) ) { $dbh->do(q{ INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES - ('EnableItemGroupHolds','0','','Enable volume level holds feature','YesNo') + ('EnableItemGroupHolds','0','','Enable item group holds feature','YesNo') }); SetVersion( $DBversion ); diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 1c26d939bd..a8910ca12e 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -215,7 +215,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('EnablePointOfSale','0',NULL,'Enable the point of sale feature to allow anonymous transactions with the accounting system. (Requires UseCashRegisters)','YesNo'), ('EnableSearchHistory','0','','Enable or disable search history','YesNo'), ('EnableItemGroups','0','','Enable the item groups feature','YesNo'), -('EnableItemGroupHolds','0','','Enable volume level holds feature','YesNo'), +('EnableItemGroupHolds','0','','Enable item groups holds feature','YesNo'), ('EnhancedMessagingPreferences','1','','If ON, allows patrons to select to receive additional messages about items due or nearly due.','YesNo'), ('EnhancedMessagingPreferencesOPAC', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'), ('expandedSearchOption','0',NULL,'If ON, set advanced search to be expanded by default','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js index 72daed4d5b..02d53a4a97 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -279,7 +279,7 @@ $(document).ready(function() { } if ( oObj.item_group_id ) { - data += _("Next available item group %s item").format( oObj.item_group_description ); + data += __("Next available item group %s item").format( oObj.item_group_description ); } if ( oObj.barcode ) { -- 2.30.2