Bug 11431: (QA followup) Make audio alerts sql top level

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/C4/Installer.pm b/C4/Installer.pm
index 0bfefb2..5fe2e16 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
index da9fdfd..0000000
--- a/installer/data/mysql/uk-UA/optional/audio_alerts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Audio alerts