From 4e7f967066a82fecc11ca33f0804f2996b87d0b5 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Wed, 4 Nov 2015 10:08:39 -0500
Subject: [PATCH] Bug 11431 [QA Followup] - Make audio alerts sql top level

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 C4/Installer.pm                                    |    1 +
 .../mysql/{de-DE/optional => }/audio_alerts.sql    |    0
 .../data/mysql/de-DE/optional/audio_alerts.txt     |    1 -
 installer/data/mysql/en/optional/audio_alerts.sql  |    4 ----
 installer/data/mysql/en/optional/audio_alerts.txt  |    1 -
 .../data/mysql/es-ES/optional/audio_alerts.sql     |    4 ----
 .../data/mysql/es-ES/optional/audio_alerts.txt     |    1 -
 .../data/mysql/fr-FR/2-Optionel/audio_alerts.sql   |    4 ----
 .../data/mysql/fr-FR/2-Optionel/audio_alerts.txt   |    1 -
 .../data/mysql/nb-NO/2-Valgfritt/audio_alerts.sql  |    4 ----
 .../data/mysql/nb-NO/2-Valgfritt/audio_alerts.txt  |    1 -
 .../data/mysql/pl-PL/optional/audio_alerts.sql     |    4 ----
 .../data/mysql/pl-PL/optional/audio_alerts.txt     |    1 -
 .../data/mysql/ru-RU/optional/audio_alerts.sql     |    4 ----
 .../data/mysql/ru-RU/optional/audio_alerts.txt     |    1 -
 .../data/mysql/uk-UA/optional/audio_alerts.sql     |    4 ----
 .../data/mysql/uk-UA/optional/audio_alerts.txt     |    1 -
 17 files changed, 1 insertions(+), 36 deletions(-)
 rename installer/data/mysql/{de-DE/optional => }/audio_alerts.sql (100%)
 delete mode 100644 installer/data/mysql/de-DE/optional/audio_alerts.txt
 delete mode 100644 installer/data/mysql/en/optional/audio_alerts.sql
 delete mode 100644 installer/data/mysql/en/optional/audio_alerts.txt
 delete mode 100644 installer/data/mysql/es-ES/optional/audio_alerts.sql
 delete mode 100644 installer/data/mysql/es-ES/optional/audio_alerts.txt
 delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/audio_alerts.sql
 delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/audio_alerts.txt
 delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/audio_alerts.sql
 delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/audio_alerts.txt
 delete mode 100644 installer/data/mysql/pl-PL/optional/audio_alerts.sql
 delete mode 100644 installer/data/mysql/pl-PL/optional/audio_alerts.txt
 delete mode 100644 installer/data/mysql/ru-RU/optional/audio_alerts.sql
 delete mode 100644 installer/data/mysql/ru-RU/optional/audio_alerts.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/audio_alerts.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/audio_alerts.txt

diff --git a/C4/Installer.pm b/C4/Installer.pm
index 0bfefb2..5fe2e16 100644
--- a/C4/Installer.pm
+++ b/C4/Installer.pm
@@ -307,6 +307,7 @@ sub load_sql_in_order {
     unshift(@fnames, $globalsysprefs);
     push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userflags.sql";
     push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userpermissions.sql";
+    push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/audio_alerts.sql";
     foreach my $file (@fnames) {
         #      warn $file;
         undef $/;
diff --git a/installer/data/mysql/de-DE/optional/audio_alerts.sql b/installer/data/mysql/audio_alerts.sql
similarity index 100%
rename from installer/data/mysql/de-DE/optional/audio_alerts.sql
rename to installer/data/mysql/audio_alerts.sql
diff --git a/installer/data/mysql/de-DE/optional/audio_alerts.txt b/installer/data/mysql/de-DE/optional/audio_alerts.txt
deleted file mode 100644
index da9fdfd..0000000
--- a/installer/data/mysql/de-DE/optional/audio_alerts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Audio alerts
diff --git a/installer/data/mysql/en/optional/audio_alerts.sql b/installer/data/mysql/en/optional/audio_alerts.sql
deleted file mode 100644
index 0c413a5..0000000
--- a/installer/data/mysql/en/optional/audio_alerts.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO audio_alerts VALUES
-(1, 1, '.audio-alert-action', 'opening.ogg'),
-(2, 2, '.audio-alert-warning', 'critical.ogg'),
-(3, 3, '.audio-alert-success', 'beep.ogg');
diff --git a/installer/data/mysql/en/optional/audio_alerts.txt b/installer/data/mysql/en/optional/audio_alerts.txt
deleted file mode 100644
index da9fdfd..0000000
--- a/installer/data/mysql/en/optional/audio_alerts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Audio alerts
diff --git a/installer/data/mysql/es-ES/optional/audio_alerts.sql b/installer/data/mysql/es-ES/optional/audio_alerts.sql
deleted file mode 100644
index 0c413a5..0000000
--- a/installer/data/mysql/es-ES/optional/audio_alerts.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO audio_alerts VALUES
-(1, 1, '.audio-alert-action', 'opening.ogg'),
-(2, 2, '.audio-alert-warning', 'critical.ogg'),
-(3, 3, '.audio-alert-success', 'beep.ogg');
diff --git a/installer/data/mysql/es-ES/optional/audio_alerts.txt b/installer/data/mysql/es-ES/optional/audio_alerts.txt
deleted file mode 100644
index da9fdfd..0000000
--- a/installer/data/mysql/es-ES/optional/audio_alerts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Audio alerts
diff --git a/installer/data/mysql/fr-FR/2-Optionel/audio_alerts.sql b/installer/data/mysql/fr-FR/2-Optionel/audio_alerts.sql
deleted file mode 100644
index 0c413a5..0000000
--- a/installer/data/mysql/fr-FR/2-Optionel/audio_alerts.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO audio_alerts VALUES
-(1, 1, '.audio-alert-action', 'opening.ogg'),
-(2, 2, '.audio-alert-warning', 'critical.ogg'),
-(3, 3, '.audio-alert-success', 'beep.ogg');
diff --git a/installer/data/mysql/fr-FR/2-Optionel/audio_alerts.txt b/installer/data/mysql/fr-FR/2-Optionel/audio_alerts.txt
deleted file mode 100644
index da9fdfd..0000000
--- a/installer/data/mysql/fr-FR/2-Optionel/audio_alerts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Audio alerts
diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/audio_alerts.sql b/installer/data/mysql/nb-NO/2-Valgfritt/audio_alerts.sql
deleted file mode 100644
index 0c413a5..0000000
--- a/installer/data/mysql/nb-NO/2-Valgfritt/audio_alerts.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO audio_alerts VALUES
-(1, 1, '.audio-alert-action', 'opening.ogg'),
-(2, 2, '.audio-alert-warning', 'critical.ogg'),
-(3, 3, '.audio-alert-success', 'beep.ogg');
diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/audio_alerts.txt b/installer/data/mysql/nb-NO/2-Valgfritt/audio_alerts.txt
deleted file mode 100644
index da9fdfd..0000000
--- a/installer/data/mysql/nb-NO/2-Valgfritt/audio_alerts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Audio alerts
diff --git a/installer/data/mysql/pl-PL/optional/audio_alerts.sql b/installer/data/mysql/pl-PL/optional/audio_alerts.sql
deleted file mode 100644
index 0c413a5..0000000
--- a/installer/data/mysql/pl-PL/optional/audio_alerts.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO audio_alerts VALUES
-(1, 1, '.audio-alert-action', 'opening.ogg'),
-(2, 2, '.audio-alert-warning', 'critical.ogg'),
-(3, 3, '.audio-alert-success', 'beep.ogg');
diff --git a/installer/data/mysql/pl-PL/optional/audio_alerts.txt b/installer/data/mysql/pl-PL/optional/audio_alerts.txt
deleted file mode 100644
index da9fdfd..0000000
--- a/installer/data/mysql/pl-PL/optional/audio_alerts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Audio alerts
diff --git a/installer/data/mysql/ru-RU/optional/audio_alerts.sql b/installer/data/mysql/ru-RU/optional/audio_alerts.sql
deleted file mode 100644
index 0c413a5..0000000
--- a/installer/data/mysql/ru-RU/optional/audio_alerts.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO audio_alerts VALUES
-(1, 1, '.audio-alert-action', 'opening.ogg'),
-(2, 2, '.audio-alert-warning', 'critical.ogg'),
-(3, 3, '.audio-alert-success', 'beep.ogg');
diff --git a/installer/data/mysql/ru-RU/optional/audio_alerts.txt b/installer/data/mysql/ru-RU/optional/audio_alerts.txt
deleted file mode 100644
index da9fdfd..0000000
--- a/installer/data/mysql/ru-RU/optional/audio_alerts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Audio alerts
diff --git a/installer/data/mysql/uk-UA/optional/audio_alerts.sql b/installer/data/mysql/uk-UA/optional/audio_alerts.sql
deleted file mode 100644
index 0c413a5..0000000
--- a/installer/data/mysql/uk-UA/optional/audio_alerts.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO audio_alerts VALUES
-(1, 1, '.audio-alert-action', 'opening.ogg'),
-(2, 2, '.audio-alert-warning', 'critical.ogg'),
-(3, 3, '.audio-alert-success', 'beep.ogg');
diff --git a/installer/data/mysql/uk-UA/optional/audio_alerts.txt b/installer/data/mysql/uk-UA/optional/audio_alerts.txt
deleted file mode 100644
index da9fdfd..0000000
--- a/installer/data/mysql/uk-UA/optional/audio_alerts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Audio alerts
-- 
1.7.2.5