From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 31 Aug 2019 09:20:10 +0000 (+0200)
Subject: lyx2lyx: Fix revert_new_languages
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~1549
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=8bfe3d71986d207c27b1a73b8d8d15e2648e820c;hp=38f4a77410545c1af967fb5a0962207a01c67705;p=features.git

lyx2lyx: Fix revert_new_languages
---

diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index 1f9924a984..5b1a87c2c9 100644
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -1882,8 +1882,9 @@ def revert_new_languages(document):
         i = find_token(document.body, "\\lang", i+1)
         if i == -1:
             break
-        if document.body[i][6:].strip() in new_languages:
-            used_languages.add(document.language)
+        val = get_value(document.body, "\\lang", i)
+        if val in new_languages:
+            used_languages.add(val)
 
     # Korean is already supported via CJK, so leave as-is for Babel
     if ("korean" in used_languages
@@ -1893,7 +1894,7 @@ def revert_new_languages(document):
     used_languages.discard("korean")
 
     for lang in used_languages:
-        revert(lang, *new_languages[lang])
+        revert_language(document, lang, new_languages[lang][0], new_languages[lang][1])
 
 
 gloss_inset_def = [