From ce473db0970806403191075939a96b5e57183eaa Mon Sep 17 00:00:00 2001 From: MarkusRost <2701034-MarkusRost@users.noreply.gitlab.com> Date: Tue, 11 May 2021 16:53:38 +0000 Subject: [PATCH 1/4] Ensure unique embeds URLs closes #41 --- src/formatters/discussions.py | 6 +++++- src/formatters/rc.py | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/formatters/discussions.py b/src/formatters/discussions.py index 156bc88..e62c0f6 100644 --- a/src/formatters/discussions.py +++ b/src/formatters/discussions.py @@ -185,6 +185,10 @@ async def feeds_embed_formatter(post_type, post, message_target, wiki, article_p embed.add_field(_("Report this on the support server"), settings["support"]) else: embed.add_field(_("Report this on the support server"), change_params) + if "?" in embed["url"]: + embed["url"] = embed["url"] + "&_rcid={}".format(post["id"]) + else: + embed["url"] = embed["url"] + "?_rcid={}".format(post["id"]) embed.finish_embed() return embed @@ -271,4 +275,4 @@ class DiscussionsFromHellParser: elif mark["type"] == "em": prefix += "_" suffix = "_" + suffix - return prefix, suffix \ No newline at end of file + return prefix, suffix diff --git a/src/formatters/rc.py b/src/formatters/rc.py index 88b8606..cdce408 100644 --- a/src/formatters/rc.py +++ b/src/formatters/rc.py @@ -1149,5 +1149,9 @@ async def embed_formatter(action, change, parsed_comment, categories, recent_cha new_cat = (_("**Added**: ") + ", ".join(list(categories["new"])[0:16]) + ("\n" if len(categories["new"])<=15 else _(" and {} more\n").format(len(categories["new"])-15))) if categories["new"] else "" del_cat = (_("**Removed**: ") + ", ".join(list(categories["removed"])[0:16]) + ("" if len(categories["removed"])<=15 else _(" and {} more").format(len(categories["removed"])-15))) if categories["removed"] else "" embed.add_field(_("Changed categories"), new_cat + del_cat) + if "?" in embed["url"]: + embed["url"] = embed["url"] + "&_rcid={}".format(change["rcid"]) + else: + embed["url"] = embed["url"] + "?_rcid={}".format(change["rcid"]) embed.finish_embed() return embed From 04384c20120d0987427190cecd3d62eea5fc3ade Mon Sep 17 00:00:00 2001 From: MakandIv Date: Sat, 22 May 2021 08:20:43 +0000 Subject: [PATCH 2/4] Translated using Weblate (Ukrainian) Currently translated at 100.0% (5 of 5 strings) Translation: RcGcDw/rcgcdb Translate-URL: https://translate.wikibot.de/projects/rcgcdw/rcgcdb/uk/ --- locale/uk/LC_MESSAGES/discord.mo | Bin 312 -> 1026 bytes locale/uk/LC_MESSAGES/discord.po | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/locale/uk/LC_MESSAGES/discord.mo b/locale/uk/LC_MESSAGES/discord.mo index a56878ce6a6109e6ed39506ee6db746c553121f5..932959c5728b2f7c957bf7878584fa7fdd4959ef 100644 GIT binary patch literal 1026 zcmZ8fO-~b16n!e1SaqQ>CMFs$3kie_ZIKuu<| z!2UYEAAnJ2U3+UYXH?wSI)|9dxp$M^2sBnwbL|Hg>L0n2lvbtTi$>J66qSQ`oVVEXI7u0M@I*+*N zY7>@rm&?FOr(1B?XULn`jZXYym(@PRIvKgXq( z5~gF>qNvkw!FEGam6|jv+L$Bfl}@7CPF4Kc2zA1^xEhVb<5BAAp&*QO$D>iYK@ox) z`DlD_zZ8oP1z~Sn7K=t`ak0|^O{5P!QS=OsgzjtOTyWWW(|f#t*X1-ca6QDl58kHt zmAp03s=w^N^0vuqdM#{h`OD-#$Nq-b@YYdT12_FQ1R;{3XRBS?fu@NVHeZ6~hX2BU z3CXu$7be~}*lhW)A!+LW{Fj)s>aDk@wc4Ya81N3x{tBG8y&eB8+TiZ5Fqm!b6;oEH=E>q4PD^UsSh!!2kdN delta 142 zcmZqT*ufNhPl#nI0}wC*u?!Ha05LNV>i{tbSOD=qAhrZzkQz7$D9X=DO)k;(OwkQX zEh^5;&$ChpN_J0nNt*1(7^v-7T9TieSdy8Xn3Gefke-^CT9jCln!@Fin3rCfn4YQ| UlA4%nrI44OmpYl7DT9##0Qy@Xp8x;= diff --git a/locale/uk/LC_MESSAGES/discord.po b/locale/uk/LC_MESSAGES/discord.po index 28c5c3f..8d26388 100644 --- a/locale/uk/LC_MESSAGES/discord.po +++ b/locale/uk/LC_MESSAGES/discord.po @@ -8,31 +8,36 @@ msgstr "" "Project-Id-Version: RcGcDb\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-14 16:00+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2021-05-22 12:08+0000\n" +"Last-Translator: MakandIv \n" +"Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.6\n" #: src/discord.py:29 msgid "wiki deleted" -msgstr "" +msgstr "вікі видалена" #: src/discord.py:29 src/discord.py:30 msgid "wiki inaccessible" -msgstr "" +msgstr "вікі недоступна" #: src/discord.py:30 msgid "discussions disabled" -msgstr "" +msgstr "обговорення відключені" #: src/discord.py:31 msgid "unknown error" -msgstr "" +msgstr "невідома помилка" #: src/discord.py:32 #, python-brace-format msgid "This recent changes webhook has been removed for `{reason}`!" msgstr "" +"Цей вебхук нових редагувань був видалений з наступних причин: `{reason}`!" From 65bf427823ff79acd12171074b10cfb473c69249 Mon Sep 17 00:00:00 2001 From: Weblate Date: Sun, 23 May 2021 01:31:06 +0200 Subject: [PATCH 3/4] Add `Swedish` translation --- locale/sv/LC_MESSAGES/discord.mo | Bin 0 -> 451 bytes locale/sv/LC_MESSAGES/discord.po | 38 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 locale/sv/LC_MESSAGES/discord.mo create mode 100644 locale/sv/LC_MESSAGES/discord.po diff --git a/locale/sv/LC_MESSAGES/discord.mo b/locale/sv/LC_MESSAGES/discord.mo new file mode 100644 index 0000000000000000000000000000000000000000..7034a16405b73fc4dd856c86a1f22dbd29f87cb5 GIT binary patch literal 451 zcmYL_O-{ow5QU3il_hHyMq&X1Cln!6+y)UyS|T+~mA3rt++;`%sU6vF14rNhT#vKh zP(+^eX>56B{ARv)cfMLiTZTQufnnQlVyM+Ie458g6YHFRjiq>nRO2wi_aGG$oS;bs z8B+^%n52W$ua2w)N+C6lRL(Mdv&t2o3WBV0j1yS1x(NGJ13^!Lm*6PIzK8B&5{1Xl z@hGr{RB1ewl&gYjAqncwhC?*+q5$=R$P0(pp6@5YWO8LvdA_1K;3?2$Uq* z^j{aSEB40bLfaWQSt>7BCaraRg`x@T0 zQx=r*E=m_vD$wq1+Q*$Hum1l9Bo25gGRAX)I&-G2aj}xLz+MVq6` b(Y}k?UF#7KfP>uZ;Q{7mBY@8B3#;`5B!z|= literal 0 HcmV?d00001 diff --git a/locale/sv/LC_MESSAGES/discord.po b/locale/sv/LC_MESSAGES/discord.po new file mode 100644 index 0000000..32d3e3b --- /dev/null +++ b/locale/sv/LC_MESSAGES/discord.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the RcGcDb package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: RcGcDb\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-04-14 16:42+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/discord.py:29 +msgid "wiki deleted" +msgstr "" + +#: src/discord.py:29 src/discord.py:30 +msgid "wiki inaccessible" +msgstr "" + +#: src/discord.py:30 +msgid "discussions disabled" +msgstr "" + +#: src/discord.py:31 +msgid "unknown error" +msgstr "" + +#: src/discord.py:32 +#, python-brace-format +msgid "This recent changes webhook has been removed for `{reason}`!" +msgstr "" From 54859d71c8493ecbd0f2382fbd913017be1c70d9 Mon Sep 17 00:00:00 2001 From: Spisen Date: Thu, 27 May 2021 11:46:00 +0000 Subject: [PATCH 4/4] Translated using Weblate (Swedish) Currently translated at 100.0% (5 of 5 strings) Translation: RcGcDw/rcgcdb Translate-URL: https://translate.wikibot.de/projects/rcgcdw/rcgcdb/sv/ --- locale/sv/LC_MESSAGES/discord.mo | Bin 451 -> 836 bytes locale/sv/LC_MESSAGES/discord.po | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/locale/sv/LC_MESSAGES/discord.mo b/locale/sv/LC_MESSAGES/discord.mo index 7034a16405b73fc4dd856c86a1f22dbd29f87cb5..57ce64b8700dd113ccdee473d4558b9219a1e0a8 100644 GIT binary patch delta 454 zcmZ9GJx&8L5QQf{MB-0~A0Z*77}5X*9R&p?B@zt>h_gG{wKf?e+er#QsS!0dAQF^t zh2Wtb=<{)hoCFZ(t96gH7-QHo$6) zXdAi@eFVqg8uLe;=m1)85UoMm(8_-V-GZJ$VVx3u%UW4>MA%bvF<0T}CbxmTB%+a% z+-N3&C(_HED>yfSdm@Vc(2XVKzVqC@^J0S2hwdSzHYB4Etkb~gO>ZD6jkGvXH&GVv zou`Q{ET=M%h~3{{)g+1F8tm`qPqpc#s2c7BQ4^wY`J$<}ni;RAbGitF6uI#nO=crf zIUo79oN?wynz9-Hk5$ZLiD&#)L^~F5QXyC1@yLA{%%fC?e%CC5xpEc@HyqfEegSk^ Bbr=8u delta 66 xcmX@Yc9_}Xo)F7a1|VPrVi_P-0b*t#)&XJ=umIvtprj>`2C0F8&FYNZi~#?s1|\n" +"Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.6\n" #: src/discord.py:29 msgid "wiki deleted" -msgstr "" +msgstr "wiki raderad" #: src/discord.py:29 src/discord.py:30 msgid "wiki inaccessible" -msgstr "" +msgstr "wiki oåtkomlig" #: src/discord.py:30 msgid "discussions disabled" -msgstr "" +msgstr "diskussioner inaktiverade" #: src/discord.py:31 msgid "unknown error" -msgstr "" +msgstr "okänt fel" #: src/discord.py:32 #, python-brace-format msgid "This recent changes webhook has been removed for `{reason}`!" msgstr "" +"Denna \"senaste ändringarna\"-webhooken har tagits bort på grund av " +"`{reason}`!"