From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 27 Aug 2019 15:35:54 +0000 (+0200)
Subject: Use acadian rather than canadien
X-Git-Tag: 2.3.4~59
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1f2598a6a15863f2d92bb6e032520bc1d7f77039;p=features.git

Use acadian rather than canadien

This is what babel-french urges, and canadien currently is broken.

acadien seems to be there for at least 15 years
---

diff --git a/lib/languages b/lib/languages
index b958022260..0b5277ad21 100644
--- a/lib/languages
+++ b/lib/languages
@@ -355,7 +355,7 @@ End
 #       PolyglossiaOpts  "variant=french"
 Language canadien
 	GuiName          "French (Canada)"
-	BabelName        canadien
+	BabelName        acadian
 #	PolyglossiaName  french
 #	PolyglossiaOpts  "variant=canadien"
 	QuoteStyle       french
diff --git a/status.23x b/status.23x
index dd96002a09..19be58dd33 100644
--- a/status.23x
+++ b/status.23x
@@ -102,6 +102,9 @@ What's new
 
 - Fix loading order problem with rotfloat/rotating and graphicx (bug 11502).
 
+- Fix LaTeX error with Canadian French as second language. LyX now uses
+  the (recommended) babel option "acadian" rather than "canadien".
+
 
 * USER INTERFACE