Mastodon
/
Toot-Mastodon-CLI-TUI-client-Linux
mirror of https://github.com/ihabunek/toot
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #328 from danschwarz/translate_fix 

Fix for issue #318 translation of boosted toots doesn't work
This commit is contained in:
Ivan Habunek 2023-03-06 07:57:31 +01:00 committed by GitHub
parent 04beac87ed 27088b1219
commit e10bb0ebae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toot/tui/app.py
View File

@ -597,10 +597,10 @@ class TUI(urwid.Frame):
def async_translate(self, timeline, status): def async_translate(self, timeline, status):
def _translate(): def _translate():
logger.info("Translating {}".format(status)) logger.info("Translating {}".format(status))
self.footer.set_message("Translating status {}".format(status.id)) self.footer.set_message("Translating status {}".format(status.original.id))
try: try:
response = api.translate(self.app, self.user, status.id) response = api.translate(self.app, self.user, status.original.id)
if response["content"]: if response["content"]:
self.footer.set_message("Status translated") self.footer.set_message("Status translated")
else: else:
@ -615,14 +615,14 @@ class TUI(urwid.Frame):
def _done(response): def _done(response):
if response is not None: if response is not None:
status.translation = response["content"] status.original.translation = response["content"]
status.translated_from = response["detected_source_language"] status.original.translated_from = response["detected_source_language"]
status.show_translation = True status.original.show_translation = True
timeline.update_status(status) timeline.update_status(status)
# If already translated, toggle showing translation # If already translated, toggle showing translation
if status.translation: if status.original.translation:
status.show_translation = not status.show_translation status.original.show_translation = not status.original.show_translation
timeline.update_status(status) timeline.update_status(status)
else: else:
self.run_in_thread(_translate, done_callback=_done) self.run_in_thread(_translate, done_callback=_done)

6
toot/tui/timeline.py
View File

@ -340,7 +340,7 @@ class StatusDetails(urwid.Pile):
if status.data["spoiler_text"] and not status.show_sensitive: if status.data["spoiler_text"] and not status.show_sensitive:
yield ("pack", urwid.Text(("content_warning", "Marked as sensitive. Press S to view."))) yield ("pack", urwid.Text(("content_warning", "Marked as sensitive. Press S to view.")))
else: else:
content = status.translation if status.show_translation else status.data["content"] content = status.original.translation if status.original.show_translation else status.data["content"]
for line in format_content(content): for line in format_content(content):
yield ("pack", urwid.Text(highlight_hashtags(line, self.followed_tags))) yield ("pack", urwid.Text(highlight_hashtags(line, self.followed_tags)))
@ -369,8 +369,8 @@ class StatusDetails(urwid.Pile):
yield ("pack", urwid.AttrWrap(urwid.Divider("-"), "gray")) yield ("pack", urwid.AttrWrap(urwid.Divider("-"), "gray"))
translated_from = ( translated_from = (
language_name(status.translated_from) language_name(status.original.translated_from)
if status.show_translation and status.translated_from if status.original.show_translation and status.original.translated_from
else None else None
) )