anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix encoding issue with lyx2lyx conversion of "Date" info-insets.

Browse Source 
Remaining problem: the name of the day appears in English instead of the document language.
This commit is contained in:
Günter Milde 2019-01-23 11:06:04 +01:00
parent 5a1fb5b5fa
commit 49583b7dd0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
development/autotests/unreliableTests
View File

@ -67,9 +67,6 @@ export/examples/(|fr/)seminar_(dvi|pdf).*
# See also #9744 allow parallel configuration of TeX and non-TeX fonts. # See also #9744 allow parallel configuration of TeX and non-TeX fonts.
export/templates/acmart_pdf[45]_texF export/templates/acmart_pdf[45]_texF
# "UnicodeDecodeError" with Python 2
export/examples/ja/multilingual_lyx.*
Sublabel: wrong_output Sublabel: wrong_output
###################### ######################
@ -119,3 +116,7 @@ export/export/latex/ru-accent-ascii_pdf2
export/templates/acmart_dvi.* export/templates/acmart_dvi.*
#export/templates/acmart_ps # not tested by ctest autotests #export/templates/acmart_ps # not tested by ctest autotests
export/templates/acmart_pdf export/templates/acmart_pdf
# lyx2lyx back-conversion of "Date" info-inset writes
# the name of the day in English instead of Japanese.
export/examples/ja/multilingual_lyx.*

4
lib/lyx2lyx/lyx_2_4.py
View File

@ -1094,6 +1094,10 @@ def revert_dateinfo(document):
fmt = re.sub('[^\'%]d', '%d', fmt) fmt = re.sub('[^\'%]d', '%d', fmt)
fmt = fmt.replace("'", "") fmt = fmt.replace("'", "")
result = dte.strftime(fmt) result = dte.strftime(fmt)
if sys.version_info < (3,0):
# In Python 2, datetime module works with binary strings,
# our dateformat strings are utf8-encoded:
result = result.decode('utf-8')
document.body[i : j+1] = result document.body[i : j+1] = result
i = i + 1 i = i + 1