From f9d2115e6c10b023685ef62f0f0af7d25db9ea4b Mon Sep 17 00:00:00 2001 From: Magnus Enger Date: Mon, 26 Mar 2012 22:05:45 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 7436 - Set itemtypes.rentalcharge = 0 in sample data for nb-NO and de-DE Set the rentalcharge = 0 for sample itemtypes (except Music for nb-NO). To test: Run through the web-installer for nb-NO and de-DE, and check that itemtypes are displayed correctly for each language. Signed-off-by: Katrin Fischer . Note: You have to install the language first in order to be able to select it in the web installer. There was a problem in the po files for nb-NO that kept all files from being created correctly. I fixed the po file and did an installation with all sample files. There is a problem with z3950servers.sql that is not caused by this patch: z3950servers.sql ERROR 1136 (21S01) at line 1: Column count doesn't match value count at row 1 Web installer for de-DE ran without problems on the sample files. --- .../data/mysql/de-DE/optional/sample_itemtypes.sql | 14 +++++++------- .../mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/sample_itemtypes.sql b/installer/data/mysql/de-DE/optional/sample_itemtypes.sql index 9c91d27..b4c6174 100644 --- a/installer/data/mysql/de-DE/optional/sample_itemtypes.sql +++ b/installer/data/mysql/de-DE/optional/sample_itemtypes.sql @@ -1,8 +1,8 @@ -INSERT INTO `itemtypes` VALUES ('BK', 'Bücher',5,0,'bridge/book.gif',''); -INSERT INTO `itemtypes` VALUES ('MX', 'Medienkombinationen',5,0,'bridge/kit.gif',''); -INSERT INTO `itemtypes` VALUES ('CF', 'Datenträger',5,0,'bridge/computer_file.gif',''); -INSERT INTO `itemtypes` VALUES ('MP', 'Karten',5,0,'bridge/map.gif',''); -INSERT INTO `itemtypes` VALUES ('VM', 'AV-Medien',5,1,'bridge/dvd.gif',''); -INSERT INTO `itemtypes` VALUES ('MU', 'Musik',5,0,'bridge/sound.gif',''); -INSERT INTO `itemtypes` VALUES ('CR', 'Zeitschriften',5,0,'bridge/periodical.gif',''); +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,'',''); 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 c66e817..120d4d6 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,11 @@ -- 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',5,0,'bridge/book.gif',''); -INSERT INTO `itemtypes` VALUES ('MX', 'Blandet innhold',5,0,'bridge/kit.gif',''); -INSERT INTO `itemtypes` VALUES ('CF', 'Datafiler',5,0,'bridge/computer_file.gif',''); -INSERT INTO `itemtypes` VALUES ('MP', 'Kart',5,0,'bridge/map.gif',''); -INSERT INTO `itemtypes` VALUES ('VM', 'Visuelt materiale',5,1,'bridge/dvd.gif',''); +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',5,0,'bridge/periodical.gif',''); +INSERT INTO `itemtypes` VALUES ('CR', 'Periodika',0,0,'bridge/periodical.gif',''); INSERT INTO `itemtypes` VALUES ('REF', 'Oppslagsverk',0,1,'',''); -- 1.7.5.4