From 369de2b430e16ba80c9c4710eaeaf9abdff92717 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Wed, 5 Feb 2020 09:44:28 -0300 Subject: [PATCH] Bug 24584: Rewrite optional/sample_libraries_holidays to YAML YAML version of optional sample_libraries_holidays To test: 1) Same test plan of first patch, only check table repeatable_holidays --- .../en/optional/sample_libraries_holidays.sql | 4 -- .../en/optional/sample_libraries_holidays.txt | 1 - .../en/optional/sample_libraries_holidays.yml | 51 +++++++++++++++++++ 3 files changed, 51 insertions(+), 5 deletions(-) delete mode 100644 installer/data/mysql/en/optional/sample_libraries_holidays.sql delete mode 100644 installer/data/mysql/en/optional/sample_libraries_holidays.txt create mode 100644 installer/data/mysql/en/optional/sample_libraries_holidays.yml diff --git a/installer/data/mysql/en/optional/sample_libraries_holidays.sql b/installer/data/mysql/en/optional/sample_libraries_holidays.sql deleted file mode 100644 index 33b6ff6fc4..0000000000 --- a/installer/data/mysql/en/optional/sample_libraries_holidays.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `repeatable_holidays` VALUES -(2,'MPL',0,NULL,NULL,'','Sundays'), -(3,'MPL',NULL,1,1,'','New Year\'s Day'), -(4,'MPL',NULL,25,12,'','Christmas'); diff --git a/installer/data/mysql/en/optional/sample_libraries_holidays.txt b/installer/data/mysql/en/optional/sample_libraries_holidays.txt deleted file mode 100644 index 2f478e1e91..0000000000 --- a/installer/data/mysql/en/optional/sample_libraries_holidays.txt +++ /dev/null @@ -1 +0,0 @@ -Sample holidays: Sunday, Christmas, New Year's diff --git a/installer/data/mysql/en/optional/sample_libraries_holidays.yml b/installer/data/mysql/en/optional/sample_libraries_holidays.yml new file mode 100644 index 0000000000..8fb663c440 --- /dev/null +++ b/installer/data/mysql/en/optional/sample_libraries_holidays.yml @@ -0,0 +1,51 @@ +--- +# +# Copyright 2020 Koha Development Team +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +description: + - "Sample holidays: Sunday, Christmas, New Year's" + +tables: + - repeatable_holidays: + translatable: [ description ] + multiline: [] + rows: + - id: 2 + branchcode: MPL + weekday: 0 + day: ~ + month: ~ + title: "" + description: "Sundays" + + - id: 3 + branchcode: MPL + weekday: ~ + day: 1 + month: 1 + title: "" + description: "New Year's Day" + + - id: 4 + branchcode: MPL + weekday: ~ + day: 25 + month: 12 + title: "" + description: "Christmas" -- 2.17.1