From 126e8973597a719388381909b4a70a61dd6cf11c Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 29 Sep 2013 18:45:06 +0200 Subject: [PATCH] Bug 10969: Fix sample itemtypes for translated installers To test: - Install the specific language and run the web installer. Or: - Truncate or delete all from the itemtypes table in your database. - Try to run the complete SQL in the itemtypes sample files. Verify the table is filled correctly. Signed-off-by: Bernardo Gonzalez Kriegel Works for all languages. No koha-qa errors. Tested removing itemtypes, then loading new file, and checking on staff. For de, es, nb, and pl no problems. For ru I disable foreign keys constraint before TRUNCATE and reenable it afterwards. Signed-off-by: Paul Poulain --- .../data/mysql/de-DE/optional/sample_itemtypes.sql | 17 ++++++------ .../data/mysql/es-ES/optional/sample_itemtypes.sql | 17 ++++++------ .../mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql | 17 ++++++------ .../data/mysql/pl-PL/optional/sample_itemtypes.sql | 17 ++++++------ .../mysql/ru-RU/optional/library_item_types.sql | 27 ++++++++------------ 5 files changed, 47 insertions(+), 48 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/sample_itemtypes.sql b/installer/data/mysql/de-DE/optional/sample_itemtypes.sql index fb4e046..968e851 100644 --- a/installer/data/mysql/de-DE/optional/sample_itemtypes.sql +++ b/installer/data/mysql/de-DE/optional/sample_itemtypes.sql @@ -1,8 +1,9 @@ -INSERT INTO `itemtypes` VALUES ('BK', 'Bücher',0,0,'bridge/book.gif',''); -INSERT INTO `itemtypes` VALUES ('MX', 'Medienkombinationen',0,0,'bridge/kit.gif',''); -INSERT INTO `itemtypes` VALUES ('CF', 'Datenträger',0,0,'bridge/computer_file.gif',''); -INSERT INTO `itemtypes` VALUES ('MP', 'Karten',0,0,'bridge/map.gif',''); -INSERT INTO `itemtypes` VALUES ('VM', 'AV-Medien',0,1,'bridge/dvd.gif',''); -INSERT INTO `itemtypes` VALUES ('MU', 'Musik',0,0,'bridge/sound.gif',''); -INSERT INTO `itemtypes` VALUES ('CR', 'Zeitschriften',0,0,'bridge/periodical.gif',''); -INSERT INTO `itemtypes` VALUES ('REF', 'Nachschlagewerke',0,1,'bridge/reference.gif',''); +INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES +('BK', 'Bücher',0,0,'bridge/book.gif',''), +('MX', 'Medienkombinationen',0,0,'bridge/kit.gif',''), +('CF', 'Datenträger',0,0,'bridge/computer_file.gif',''), +('MP', 'Karten',0,0,'bridge/map.gif',''), +('VM', 'AV-Medien',0,1,'bridge/dvd.gif',''), +('MU', 'Musik',0,0,'bridge/sound.gif',''), +('CR', 'Zeitschriften',0,0,'bridge/periodical.gif',''), +('REF', 'Nachschlagewerke',0,1,'bridge/reference.gif',''); diff --git a/installer/data/mysql/es-ES/optional/sample_itemtypes.sql b/installer/data/mysql/es-ES/optional/sample_itemtypes.sql index 76510b4..9180dec 100644 --- a/installer/data/mysql/es-ES/optional/sample_itemtypes.sql +++ b/installer/data/mysql/es-ES/optional/sample_itemtypes.sql @@ -1,8 +1,9 @@ -INSERT INTO `itemtypes` VALUES ('BK', 'Books',5,0,'bridge/book.gif',''); -INSERT INTO `itemtypes` VALUES ('MX', 'Mixed Materials',5,0,'bridge/kit.gif',''); -INSERT INTO `itemtypes` VALUES ('CF', 'Computer Files',5,0,'bridge/computer_file.gif',''); -INSERT INTO `itemtypes` VALUES ('MP', 'Maps',5,0,'bridge/map.gif',''); -INSERT INTO `itemtypes` VALUES ('VM', 'Visual Materials',5,1,'bridge/dvd.gif',''); -INSERT INTO `itemtypes` VALUES ('MU', 'Music',5,0,'bridge/sound.gif',''); -INSERT INTO `itemtypes` VALUES ('CR', 'Continuing Resources',5,0,'bridge/periodical.gif',''); -INSERT INTO `itemtypes` VALUES ('REF', 'Reference',0,1,'',''); +INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES +('BK', 'Books',5,0,'bridge/book.gif',''), +('MX', 'Mixed Materials',5,0,'bridge/kit.gif',''), +('CF', 'Computer Files',5,0,'bridge/computer_file.gif',''), +('MP', 'Maps',5,0,'bridge/map.gif',''), +('VM', 'Visual Materials',5,1,'bridge/dvd.gif',''), +('MU', 'Music',5,0,'bridge/sound.gif',''), +('CR', 'Continuing Resources',5,0,'bridge/periodical.gif',''), +('REF', 'Reference',0,1,'',''); diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql b/installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql index 120d4d6..95e4e79 100644 --- a/installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql +++ b/installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql @@ -19,11 +19,12 @@ -- with Koha; if not, write to the Free Software Foundation, Inc., -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -INSERT INTO `itemtypes` VALUES ('BK', 'Bøker',0,0,'bridge/book.gif',''); -INSERT INTO `itemtypes` VALUES ('MX', 'Blandet innhold',0,0,'bridge/kit.gif',''); -INSERT INTO `itemtypes` VALUES ('CF', 'Datafiler',0,0,'bridge/computer_file.gif',''); -INSERT INTO `itemtypes` VALUES ('MP', 'Kart',0,0,'bridge/map.gif',''); -INSERT INTO `itemtypes` VALUES ('VM', 'Visuelt materiale',0,1,'bridge/dvd.gif',''); -INSERT INTO `itemtypes` VALUES ('MU', 'Musikk',5,0,'bridge/sound.gif',''); -INSERT INTO `itemtypes` VALUES ('CR', 'Periodika',0,0,'bridge/periodical.gif',''); -INSERT INTO `itemtypes` VALUES ('REF', 'Oppslagsverk',0,1,'',''); +INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES +('BK', 'Bøker',0,0,'bridge/book.gif',''), +('MX', 'Blandet innhold',0,0,'bridge/kit.gif',''), +('CF', 'Datafiler',0,0,'bridge/computer_file.gif',''), +('MP', 'Kart',0,0,'bridge/map.gif',''), +('VM', 'Visuelt materiale',0,1,'bridge/dvd.gif',''), +('MU', 'Musikk',5,0,'bridge/sound.gif',''), +('CR', 'Periodika',0,0,'bridge/periodical.gif',''), +('REF', 'Oppslagsverk',0,1,'',''); diff --git a/installer/data/mysql/pl-PL/optional/sample_itemtypes.sql b/installer/data/mysql/pl-PL/optional/sample_itemtypes.sql index 41074ae..6c5e57c 100644 --- a/installer/data/mysql/pl-PL/optional/sample_itemtypes.sql +++ b/installer/data/mysql/pl-PL/optional/sample_itemtypes.sql @@ -1,8 +1,9 @@ -INSERT INTO `itemtypes` VALUES ('BK', 'Książki',5,0,'bridge/book.gif',''); -INSERT INTO `itemtypes` VALUES ('MX', 'Materiały mieszane',5,0,'bridge/kit.gif',''); -INSERT INTO `itemtypes` VALUES ('CF', 'Pliki komputerowe',5,0,'bridge/computer_file.gif',''); -INSERT INTO `itemtypes` VALUES ('MP', 'Mapy',5,0,'bridge/map.gif',''); -INSERT INTO `itemtypes` VALUES ('VM', 'Materiały wziualne',5,1,'bridge/dvd.gif',''); -INSERT INTO `itemtypes` VALUES ('MU', 'Muzyka',5,0,'bridge/sound.gif',''); -INSERT INTO `itemtypes` VALUES ('CR', 'Wydawnictwa ciągłe',5,0,'bridge/periodical.gif',''); -INSERT INTO `itemtypes` VALUES ('REF', 'Reference',0,1,'',''); +INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES +('BK', 'Książki',5,0,'bridge/book.gif',''), +('MX', 'Materiały mieszane',5,0,'bridge/kit.gif',''), +('CF', 'Pliki komputerowe',5,0,'bridge/computer_file.gif',''), +('MP', 'Mapy',5,0,'bridge/map.gif',''), +('VM', 'Materiały wziualne',5,1,'bridge/dvd.gif',''), +('MU', 'Muzyka',5,0,'bridge/sound.gif',''), +('CR', 'Wydawnictwa ciągłe',5,0,'bridge/periodical.gif',''), +('REF', 'Reference',0,1,'',''); diff --git a/installer/data/mysql/ru-RU/optional/library_item_types.sql b/installer/data/mysql/ru-RU/optional/library_item_types.sql index c21adc9..b8e0da3 100644 --- a/installer/data/mysql/ru-RU/optional/library_item_types.sql +++ b/installer/data/mysql/ru-RU/optional/library_item_types.sql @@ -1,17 +1,12 @@ +SET foreign_key_checks = 0; TRUNCATE itemtypes; - -INSERT INTO `itemtypes` VALUES ('BK', ' Книги',5,0,'bridge/book.gif',''); - -INSERT INTO `itemtypes` VALUES ('MX', 'Смешанные атериалы',5,0,'bridge/kit.gif',''); - -INSERT INTO `itemtypes` VALUES ('CF', 'Компьютерные файлы',5,0,'bridge/computer_file.gif',''); - -INSERT INTO `itemtypes` VALUES ('MP', 'Карты',5,0,'bridge/map.gif',''); - -INSERT INTO `itemtypes` VALUES ('VM', 'Визуальные материалы',5,1,'bridge/dvd.gif',''); - -INSERT INTO `itemtypes` VALUES ('MU', 'Музыка',5,0,'bridge/sound.gif',''); - -INSERT INTO `itemtypes` VALUES ('CR', 'Продолжающиеся ресурсы',5,0,'bridge/periodical.gif',''); - -INSERT INTO `itemtypes` VALUES ('REF', 'Справочники',0,1,'',''); +SET foreign_key_checks = 1; +INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES +('BK', ' Книги',5,0,'bridge/book.gif',''), +('MX', 'Смешанные атериалы',5,0,'bridge/kit.gif',''), +('CF', 'Компьютерные файлы',5,0,'bridge/computer_file.gif',''), +('MP', 'Карты',5,0,'bridge/map.gif',''), +('VM', 'Визуальные материалы',5,1,'bridge/dvd.gif',''), +('MU', 'Музыка',5,0,'bridge/sound.gif',''), +('CR', 'Продолжающиеся ресурсы',5,0,'bridge/periodical.gif',''), +('REF', 'Справочники',0,1,'',''); -- 1.7.9.5