From 11ed30626b6148c926dc5aac97cd47d8636949a5 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Thu, 22 Dec 2016 16:03:57 +0100 Subject: [PATCH] Bug 17809 - ER country twice in fr-FR database files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql, ER is defined twice, for "Erythrée" (correct one) and "Allemagne". Test plan : - Create a new database using fr-FR or import the sql file - Look at authorised values COUNTRY => without patch you have ER / Allemange => with patch you have ER / ErythrÃe --- installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql b/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql index 7115f51..603843b 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql @@ -45,7 +45,6 @@ INSERT INTO `authorised_values` ( `category`, `authorised_value`, `lib`) VALUES -- Country codes INSERT INTO `authorised_values` ( `category`, `authorised_value`, `lib`) VALUES ( 'COUNTRY', 'AN', 'Antilles Néerlandaises'); INSERT INTO `authorised_values` ( `category`, `authorised_value`, `lib`) VALUES ( 'COUNTRY', 'CR', 'Costa Rica'); -INSERT INTO `authorised_values` ( `category`, `authorised_value`, `lib`) VALUES ( 'COUNTRY', 'ER', 'Allemagne'); INSERT INTO `authorised_values` ( `category`, `authorised_value`, `lib`) VALUES ( 'COUNTRY', 'FR', 'France'); INSERT INTO `authorised_values` ( `category`, `authorised_value`, `lib`) VALUES ( 'COUNTRY', 'DE', 'Allemagne'); INSERT INTO `authorised_values` ( `category`, `authorised_value`, `lib`) VALUES ( 'COUNTRY', 'CN', 'Chine'); -- 2.7.4