Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup insertion of translations data

Browse Source
This commit is contained in:
Kovid Goyal 2019-08-10 07:26:58 +05:30
parent eeca114876
commit 6100a4eeee
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/viewer/web_view.py
View File

@ -157,9 +157,8 @@ def create_profile():
from calibre.utils.rapydscript import compile_viewer from calibre.utils.rapydscript import compile_viewer
compile_viewer() compile_viewer()
js = P('viewer.js', data=True, allow_user_override=False) js = P('viewer.js', data=True, allow_user_override=False)
translations_json = get_translations_data() translations_json = get_translations_data() or b'null'
if translations_json: js = js.replace(b'__TRANSLATIONS_DATA__', translations_json, 1)
js = (b'window.calibre_translations_data = %s;\n\n' % translations_json) + js
insert_scripts(ans, create_script('viewer.js', js)) insert_scripts(ans, create_script('viewer.js', js))
url_handler = UrlSchemeHandler(ans) url_handler = UrlSchemeHandler(ans)
ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler) ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler)

6
src/pyj/viewer-main.pyj
View File

@ -229,8 +229,9 @@ def onerror(msg, script_url, line_number, column_number, error_object):
if window is window.top: if window is window.top:
# main # main
if window.calibre_translations_data: TRANSLATIONS_DATA = v'__TRANSLATIONS_DATA__'
install(window.calibre_translations_data) if TRANSLATIONS_DATA:
install(TRANSLATIONS_DATA)
ui_operations.get_file = get_file ui_operations.get_file = get_file
ui_operations.get_mathjax_files = get_mathjax_files ui_operations.get_mathjax_files = get_mathjax_files
ui_operations.update_url_state = update_url_state ui_operations.update_url_state = update_url_state
@ -268,4 +269,3 @@ else:
footnotes_main() footnotes_main()
else: else:
iframe_main() iframe_main()
window.calibre_translations_data = v'undefined'