From 6100a4eeee543273eb0448105ffaf18ddb0a338e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 10 Aug 2019 07:26:58 +0530 Subject: [PATCH] Cleanup insertion of translations data --- src/calibre/gui2/viewer/web_view.py | 5 ++--- src/pyj/viewer-main.pyj | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py index 2999d5a5a4..eefc921adb 100644 --- a/src/calibre/gui2/viewer/web_view.py +++ b/src/calibre/gui2/viewer/web_view.py @@ -157,9 +157,8 @@ def create_profile(): from calibre.utils.rapydscript import compile_viewer compile_viewer() js = P('viewer.js', data=True, allow_user_override=False) - translations_json = get_translations_data() - if translations_json: - js = (b'window.calibre_translations_data = %s;\n\n' % translations_json) + js + translations_json = get_translations_data() or b'null' + js = js.replace(b'__TRANSLATIONS_DATA__', translations_json, 1) insert_scripts(ans, create_script('viewer.js', js)) url_handler = UrlSchemeHandler(ans) ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler) diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj index 9e6cec443e..76c908a453 100644 --- a/src/pyj/viewer-main.pyj +++ b/src/pyj/viewer-main.pyj @@ -229,8 +229,9 @@ def onerror(msg, script_url, line_number, column_number, error_object): if window is window.top: # main - if window.calibre_translations_data: - install(window.calibre_translations_data) + TRANSLATIONS_DATA = v'__TRANSLATIONS_DATA__' + if TRANSLATIONS_DATA: + install(TRANSLATIONS_DATA) ui_operations.get_file = get_file ui_operations.get_mathjax_files = get_mathjax_files ui_operations.update_url_state = update_url_state @@ -268,4 +269,3 @@ else: footnotes_main() else: iframe_main() -window.calibre_translations_data = v'undefined'