From 053e3eb9f8eb4b5831e50dbfb602e3eb0f08f1d5 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Thu, 22 Dec 2016 16:03:57 +0100 Subject: [PATCH] Bug 17809: Fix ER country appearing twice in fr-FR database files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 NOTE: Allemange occurs twice as well, correctly with DE. This patch correctly removes the ER one. Signed-off-by: Mark Tompsett Signed-off-by: Brendan Gallagher Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 016c51f3a444e50029a7053c28c6f0821d204605) Signed-off-by: Fridolin Somers --- 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 8cdd3e55ed..0dce31010f 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.20.1