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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/api/v1/swagger/definitions/hold.yaml b/api/v1/swagger/definitions/hold.yaml
index 2c5ac09..a7d0d39 100644 (file)
--- 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 010f74c..861dc75 100644 (file)
--- 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 96800b1..d57dd5a 100644 (file)
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ b/installer/data/mysql/mandatory/sysprefs.sql
@@ -218,7 +218,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 3465847..0b223bf 100644 (file)
--- 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 <strong>%s</strong> item").format( oObj.item_group_description );
+                                data += __("Next available item group <strong>%s</strong> item").format( oObj.item_group_description );
                             }
 
                             if ( oObj.barcode ) {