From a529a912bf867af075416d46a2b92754b7838592 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 29 Dec 2019 23:21:06 +0100 Subject: [PATCH] Bug 24316: Remove obsolete sample data for MANUAL_INV authorised value Bug 23049 replaced the MANUAL_INV authorised value by a dedicated table, but missed to remove the authorised value sample data from the non-English installers. This patch corrects this oversight. Note: The German (de-DE) file was changed a bit more, adding 2 missing translations for the new RETURN_CLAIM_RESOLUTION and to match the sequence of the en file. To test: - Verify the SQL file changes are valid by loading those files OR - Run the installers for each language on an empty database - Verify there is no error loading the optional authorised value data Signed-off-by: Bernardo Gonzalez Kriegel Tested with 24317 and a small followup for this bug for es-ES Tested doing clean install for de-DE es-ES fr-CA it-IT nb-NO pl-PL up to loading of all mandatory & optional data. All languages load without problems. --- .../data/mysql/de-DE/optional/auth_val.sql | 21 ++++++++----------- .../data/mysql/fr-CA/facultatif/auth_val.sql | 3 --- .../data/mysql/it-IT/necessari/auth_val.sql | 3 --- .../data/mysql/nb-NO/2-Valgfritt/auth_val.sql | 3 --- .../data/mysql/pl-PL/optional/auth_val.sql | 3 --- 5 files changed, 9 insertions(+), 24 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/auth_val.sql b/installer/data/mysql/de-DE/optional/auth_val.sql index f63ca91085..26cef2d7c4 100644 --- a/installer/data/mysql/de-DE/optional/auth_val.sql +++ b/installer/data/mysql/de-DE/optional/auth_val.sql @@ -4,6 +4,13 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','LCL','Bibliotheksexemplar vermisst'); INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','Über Fernleihe bestellbar'); +-- Desired formats for requesting new materials +INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'BOOK', 'Buch', 'Buch'); +INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'LP', 'Großdruck', 'Großdruck'); +INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'EBOOK', 'E-Book', 'E-Book'); +INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'AUDIOBOOK', 'Hörbuch', 'Hörbuch'); +INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'DVD', 'DVD', 'DVD'); + -- availability statuses INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','2','Lange überfällig (Verloren)'); INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Verloren'); @@ -41,9 +48,6 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_L -- restricted status of an item, linked to items.restricted INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Eingeschränkt zugänglich'); --- manual invoice types -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('MANUAL_INV','Kopiergebühren','.25'); - -- custom borrower notes INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('BOR_NOTES','ADDR','Adresse kontrollieren'); @@ -77,13 +81,6 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('ORDER_C INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('ORDER_CANCELLATION_REASON', 1, 'Nicht lieferbar'); INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('ORDER_CANCELLATION_REASON', 2, 'Nicht auf Lager'); --- Desired formats for requesting new materials -INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'BOOK', 'Buch', 'Buch'); -INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'LP', 'Großdruck', 'Großdruck'); -INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'EBOOK', 'E-Book', 'E-Book'); -INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'AUDIOBOOK', 'Hörbuch', 'Hörbuch'); -INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES ('SUGGEST_FORMAT', 'DVD', 'DVD', 'DVD'); - -- return claims -INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('RETURN_CLAIM_RESOLUTION', 'RET_BY_PATRON', 'Returned by patron'); -INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('RETURN_CLAIM_RESOLUTION', 'FOUND_IN_LIB', 'Found in library'); +INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('RETURN_CLAIM_RESOLUTION', 'RET_BY_PATRON', 'Von Benutzer/in zurückgegeben'); +INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('RETURN_CLAIM_RESOLUTION', 'FOUND_IN_LIB', 'In Bibliothek gefunden'); diff --git a/installer/data/mysql/fr-CA/facultatif/auth_val.sql b/installer/data/mysql/fr-CA/facultatif/auth_val.sql index 9e7282c19e..76ca84cf72 100644 --- a/installer/data/mysql/fr-CA/facultatif/auth_val.sql +++ b/installer/data/mysql/fr-CA/facultatif/auth_val.sql @@ -56,9 +56,6 @@ INSERT INTO `authorised_values` ( `category`, `authorised_value`, `lib`) VALUES -- Statut Limité INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('RESTRICTED','1','Exclu du prêt'); --- Facture manuelle -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('MANUAL_INV','Frais de copie','.25'); - -- Message personnalisable aux utilisateurs INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('BOR_NOTES','ADDR','Address Notes'); diff --git a/installer/data/mysql/it-IT/necessari/auth_val.sql b/installer/data/mysql/it-IT/necessari/auth_val.sql index b58ad6ca58..9fff795732 100644 --- a/installer/data/mysql/it-IT/necessari/auth_val.sql +++ b/installer/data/mysql/it-IT/necessari/auth_val.sql @@ -52,9 +52,6 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('NOT_LOA INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('RESTRICTED','0','Nessuna restrizione'); INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('RESTRICTED','1','Accesso limitato'); --- manual invoice types -INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MANUAL_INV','Costo fotocopie','.25'); - -- custom borrower notes INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('BOR_NOTES','ADDR','Indirizzo (Nota)'); diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql b/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql index af913fcadb..6c67a6dbe8 100644 --- a/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql +++ b/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql @@ -62,9 +62,6 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_L -- restricted status of an item, linked to items.restricted INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Begrenset tilgang'); --- manual invoice types -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('MANUAL_INV','Kopiavgift','0,25'); - -- custom borrower notes INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('BOR_NOTES','ADDR','Addresse-noter'); diff --git a/installer/data/mysql/pl-PL/optional/auth_val.sql b/installer/data/mysql/pl-PL/optional/auth_val.sql index 927c446ee3..bb32e3207a 100644 --- a/installer/data/mysql/pl-PL/optional/auth_val.sql +++ b/installer/data/mysql/pl-PL/optional/auth_val.sql @@ -41,9 +41,6 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_L -- restricted status of an item, linked to items.restricted INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Ograniczony dostęp'); --- manual invoice types -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('MANUAL_INV','Opłata za ksero','.25'); - -- custom borrower notes INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('BOR_NOTES','ADDR','Uwagi do adresu'); -- 2.17.1