From 4dcea63f86a1b4bc9af33d69102ce45ded24ef5b Mon Sep 17 00:00:00 2001
From: Frisk <furrtrex43@protonmail.ch>
Date: Mon, 27 Apr 2020 18:06:48 +0200
Subject: [PATCH] German translation by Markus, small fixes from initial
 testing

---
 discussions.py                       |  15 ++++++-----
 locale/de/LC_MESSAGES/discussions.mo | Bin 985 -> 1428 bytes
 locale/de/LC_MESSAGES/discussions.po |  37 ++++++++++++++++++++++-----
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/discussions.py b/discussions.py
index d073d9f..2e69ec6 100644
--- a/discussions.py
+++ b/discussions.py
@@ -59,11 +59,14 @@ def embed_formatter(post, post_type):
 			embed["url"] = "{wikiurl}f/p/{threadId}".format(wikiurl=settings["fandom_discussions"]["wiki_url"],
 			                                                threadId=post["threadId"])
 		if settings["fandom_discussions"]["appearance"]["embed"]["show_content"]:
-			npost = DiscussionsFromHellParser(post)
-			embed["description"] = npost.parse()
-			if npost.image_only:
-				embed["image"]["url"] = embed["description"].strip()
-				embed["description"] = ""
+			if post.get("jsonModel") is not None:
+				npost = DiscussionsFromHellParser(post)
+				embed["description"] = npost.parse()
+				if npost.image_only:
+					embed["image"]["url"] = embed["description"].strip()
+					embed["description"] = ""
+			else:  # Fallback when model is not available
+				embed["description"] = post.get("rawContent", "")
 	elif post_type == "POLL":
 		embed.event_type = "discussion/poll"
 		poll = post["poll"]
@@ -198,7 +201,7 @@ class DiscussionsFromHellParser:
 		for mark in marks:
 			if mark["type"] == "mention":
 				prefix += "["
-				suffix = "]({wiki}f/u/{userid}){suffix}".format(wiki=WIKI_SCRIPT_PATH, userid=mark["attrs"]["userId"], suffix=suffix)
+				suffix = "]({wiki}f/u/{userid}){suffix}".format(wiki=settings["fandom_discussions"]["wiki_url"], userid=mark["attrs"]["userId"], suffix=suffix)
 			elif mark["type"] == "strong":
 				prefix += "**"
 				suffix = "**{suffix}".format(suffix=suffix)
diff --git a/locale/de/LC_MESSAGES/discussions.mo b/locale/de/LC_MESSAGES/discussions.mo
index 75a22cd6e6cc8b45b7d01a65a4915918c0494da9..290c27a51efefeb0cf0825b9a268f6222a301106 100644
GIT binary patch
delta 543
zcmZ9HO-lkn7{_PTvebfJz>C&k9SRXtB0)M8;U(x|9eQCI*ijb7Rdz>0WYKGfAXy`b
z=o54cqI>6{YaOEe3K0Yy>hC79_`sjv%=7-d1iRtZ+ic*1z$T#>q(M{AE!4MnXa@R#
z7NJk5pF5`zG7rYV127Aof@dHDqdvsI21wz%1f%#r_z77CpF#9#kuN;@gMYyzFcu)>
z9BhC(7#jN@EJ5^f4WXf-FBykW?k*M_L?%F#5VB=*Cb>ovO{q)4?ZnW-Xl<b?1a<x1
zgx#9ds|Ib_ovR-wtfT@pq;+01aaBFs*ZB$6E3C|qSDG%>x+&~cRdu>bVI!NPnOuHt
zJ(<p?)1e(^$yCu~h9#J+nt2M3QLdvnRphMV`RA#|oo~f*Y+tfKwoOZNAta~0_RV1L
zUi;eP=eoh^UZrHB*GSTE`@1J!M8W<`&a^)i@mAm#id!~yq0z_tQpw=P=r!aI&BugD

delta 267
zcmbQjeUrWZo)F7a1|VPsVi_QI0b+I_&H-W&=m26tAnpWW5g?uo#8E)J0f<3j+>8ti
z3P3y+h{b{YZA=hz&H?EdApbRxo&cmhm>C#=N*I7#FaX)d!oVQS02GG+=c3falGGFh
zrRtK*lAP39rO7gkzb8*;a+5VMS1>fRGBwsVFfuUU@=44~FHKBO)eT8a%(YUOEXiCf
z=#yAnq8n0_m{**WSdw1^6zyi#QH80rQb<YVVsI@gE=kSFDM?j$)G!Zf$D@WhoBuKM
GFaiK$`!}2b

diff --git a/locale/de/LC_MESSAGES/discussions.po b/locale/de/LC_MESSAGES/discussions.po
index 8dd56f1..093c6dd 100644
--- a/locale/de/LC_MESSAGES/discussions.po
+++ b/locale/de/LC_MESSAGES/discussions.po
@@ -7,28 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-06 18:55+0200\n"
-"PO-Revision-Date: 2020-04-07 11:53+0200\n"
+"POT-Creation-Date: 2020-04-26 22:05+0200\n"
+"PO-Revision-Date: 2020-04-27 17:46+0200\n"
+"Last-Translator: \n"
 "Language-Team: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.3\n"
-"Last-Translator: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: de\n"
 
 #: discussions.py:53
 #, python-brace-format
 msgid "Replied to \"{title}\""
 msgstr "Antwortete auf „{title}“"
 
-#: discussions.py:56
+#: discussions.py:58
 #, python-brace-format
 msgid "Created \"{title}\""
 msgstr "Erstellte „{title}“"
 
-#: discussions.py:73
+#: discussions.py:70
+#, python-brace-format
+msgid "Created a poll titled \"{title}\""
+msgstr "Erstellte eine Umfrage „{title}“"
+
+#: discussions.py:75
+msgid "Option {}"
+msgstr "Option {}"
+
+#: discussions.py:76
+#, python-brace-format
+msgid "__[View image]({image_url})__"
+msgstr "__[Bild öffnen]({image_url})__"
+
+#: discussions.py:89
 #, python-brace-format
 msgid ""
 "[{author}](<{url}f/u/{creatorId}>) created [{title}](<{url}f/p/{threadId}>) "
@@ -37,7 +51,7 @@ msgstr ""
 "[{author}](<{url}f/u/{creatorId}>) erstellte [{title}](<{url}f/p/{threadId}"
 ">) in {forumName}"
 
-#: discussions.py:76
+#: discussions.py:92
 #, python-brace-format
 msgid ""
 "[{author}](<{url}f/u/{creatorId}>) created a [reply](<{url}f/p/{threadId}/r/"
@@ -45,3 +59,12 @@ msgid ""
 msgstr ""
 "[{author}](<{url}f/u/{creatorId}>) erstellte eine [Antwork](<{url}f/p/"
 "{threadId}/r/{postId}>) zu [{title}](<{url}f/p/{threadId}>) in {forumName}"
+
+#: discussions.py:97
+#, python-brace-format
+msgid ""
+"[{author}](<{url}f/u/{creatorId}>) created a poll [{title}](<{url}f/p/"
+"{threadId}>) in {forumName}"
+msgstr ""
+"[{author}](<{url}f/u/{creatorId}>) erstellte eine Umfrage [{title}](<{url}f/"
+"p/{threadId}>) in {forumName}"