From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 11 Mar 2019 10:42:54 +0000 (+0100)
Subject: revert_language: fix document language assignment
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2489
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=abf38e1820a6e491fe19211538436b0680866879;p=features.git

revert_language: fix document language assignment
---

diff --git a/lib/lyx2lyx/lyx2lyx_tools.py b/lib/lyx2lyx/lyx2lyx_tools.py
index 6c0f5aa819..75a5c820de 100644
--- a/lib/lyx2lyx/lyx2lyx_tools.py
+++ b/lib/lyx2lyx/lyx2lyx_tools.py
@@ -644,6 +644,7 @@ def revert_language(document, lyxname, babelname, polyglossianame):
     primary = False
     secondary = False
 
+    orig_doc_language = document.language
     # Main language first
     if document.language == lyxname:
         primary = True
@@ -761,14 +762,14 @@ def revert_language(document, lyxname, babelname, polyglossianame):
     # With babel, we need to add the language options
     if with_babel and (primary or secondary):
         insert_document_option(document, babelname)
-        if secondary and document.body[10] != "selectlanguage{%s}" % document.language:
+        if secondary and document.body[10] != "selectlanguage{%s}" % orig_doc_language:
             # Since the user options are always placed after the babel options,
             # we need to reset the main language
             document.body[2 : 2] = ["\\begin_layout Standard",
                                     "\\begin_inset ERT", "status open", "",
                                     "\\begin_layout Plain Layout", "", "",
                                     "\\backslash",
-                                    "selectlanguage{%s}" % document.language,
+                                    "selectlanguage{%s}" % orig_doc_language,
                                     "\\end_layout", "", "\\end_inset", "", "",
                                     "\\end_layout", ""]