From 923d10879a1cce56ffbf234bbc0a15fbd43d9339 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Tue, 14 Nov 2006 10:07:53 +1300
Subject: [PATCH] Split the supported locales out of the base data so it can be
 more easily re-loaded on upgrades.  Added locale for Russian translation from
 Nick Khazov.

---
 dba/base-data.sql         | 13 -------------
 dba/create-database.sh    |  2 ++
 dba/supported_locales.sql | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 dba/supported_locales.sql

diff --git a/dba/base-data.sql b/dba/base-data.sql
index 98538444..50ffa35c 100644
--- a/dba/base-data.sql
+++ b/dba/base-data.sql
@@ -32,16 +32,3 @@ INSERT INTO relationship_type ( rt_id, rt_name, rt_isgroup, confers, prefix_matc
 -- Set the insert sequence to the next number, with a minimum of 1000
 SELECT setval('relationship_type_rt_id_seq', (SELECT 10 UNION SELECT rt_id FROM relationship_type ORDER BY 1 DESC LIMIT 1) );
 
--- I should be able to find people to translate into these base locales
-INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
-    VALUES( 'en_NZ', 'English', 'English' );
-INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
-    VALUES( 'de_DE', 'German',  'Deutsch' );
-INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
-    VALUES( 'es_AR', 'Argentinian Spanish', 'Español (AR)' );
-INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
-    VALUES( 'es_ES', 'Spanish (Spain)', 'Español (ES)' );
-INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
-    VALUES( 'es_MX', 'Mexican Spanish', 'Español (MX)' );
-INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
-    VALUES( 'fr_FR', 'French',  'Français' );
diff --git a/dba/create-database.sh b/dba/create-database.sh
index 072b4d9e..1bb975ec 100755
--- a/dba/create-database.sh
+++ b/dba/create-database.sh
@@ -22,3 +22,5 @@ psql -q -f "${DBADIR}/rscds.sql" "${DBNAME}" 2>&1 | egrep -v "(^CREATE |^GRANT|^
 psql -q -f "${DBADIR}/caldav_functions.sql" "${DBNAME}"
 
 psql -q -f "${DBADIR}/base-data.sql" "${DBNAME}"
+
+psql -q -f "${DBADIR}/supported_locales.sql" "${DBNAME}"
diff --git a/dba/supported_locales.sql b/dba/supported_locales.sql
new file mode 100644
index 00000000..70ea69e8
--- /dev/null
+++ b/dba/supported_locales.sql
@@ -0,0 +1,17 @@
+TRUNCATE supported_locales;
+
+-- I should be able to find people to translate into these base locales
+INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
+    VALUES( 'en_NZ', 'English', 'English' );
+INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
+    VALUES( 'de_DE', 'German',  'Deutsch' );
+INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
+    VALUES( 'es_AR', 'Argentinian Spanish', 'Español (AR)' );
+INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
+    VALUES( 'es_ES', 'Spanish (Spain)', 'Español (ES)' );
+INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
+    VALUES( 'es_MX', 'Mexican Spanish', 'Español (MX)' );
+INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
+    VALUES( 'fr_FR', 'French',  'Français' );
+INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
+    VALUES( 'ru_RU', 'Russian',  'Русский' );