From c3d39336bf910a0fe036cb81636bb19756a37ede Mon Sep 17 00:00:00 2001 From: chrysle <96722107+chrysle@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:52:55 +0100 Subject: [PATCH 1/2] [UI] Update some links Replace links in the sidebar pointing to backlink pages with a separately created page so that every visitor has access to them and the displayed text can be amended. Also merge the two categories for extendable and incorrect articles into one. --- inyoka/forum/locale/de_DE/LC_MESSAGES/django.po | 2 +- inyoka/forum/locale/django.pot | 4 ++-- inyoka/ikhaya/locale/de_DE/LC_MESSAGES/django.po | 2 +- inyoka/ikhaya/locale/django.pot | 4 ++-- inyoka/locale/de_DE/LC_MESSAGES/django.po | 2 +- inyoka/locale/django.pot | 2 +- inyoka/markup/locale/de_DE/LC_MESSAGES/django.po | 2 +- inyoka/markup/locale/django.pot | 4 ++-- inyoka/pastebin/locale/de_DE/LC_MESSAGES/django.po | 2 +- inyoka/pastebin/locale/django.pot | 4 ++-- inyoka/planet/locale/de_DE/LC_MESSAGES/django.po | 2 +- inyoka/planet/locale/django.pot | 4 ++-- inyoka/portal/locale/de_DE/LC_MESSAGES/django.po | 2 +- inyoka/portal/locale/django.pot | 2 +- inyoka/wiki/jinja2/wiki/page.html | 3 +-- inyoka/wiki/locale/de_DE/LC_MESSAGES/django.po | 5 +---- inyoka/wiki/locale/django.pot | 7 ++----- inyoka/wiki/macros.py | 1 + package-lock.json | 8 ++++---- 19 files changed, 28 insertions(+), 34 deletions(-) diff --git a/inyoka/forum/locale/de_DE/LC_MESSAGES/django.po b/inyoka/forum/locale/de_DE/LC_MESSAGES/django.po index 74e9d0047..009b50bda 100644 --- a/inyoka/forum/locale/de_DE/LC_MESSAGES/django.po +++ b/inyoka/forum/locale/de_DE/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: 2023-11-12 16:29+0100\n" "Last-Translator: Christoph Volkert <>\n" "Language: de_DE\n" diff --git a/inyoka/forum/locale/django.pot b/inyoka/forum/locale/django.pot index 5f3676655..de1ed9297 100644 --- a/inyoka/forum/locale/django.pot +++ b/inyoka/forum/locale/django.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Inyoka Project v0.36.1\n" +"Project-Id-Version: Inyoka Project 1.0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/inyoka/ikhaya/locale/de_DE/LC_MESSAGES/django.po b/inyoka/ikhaya/locale/de_DE/LC_MESSAGES/django.po index 2252f284e..054bebe66 100644 --- a/inyoka/ikhaya/locale/de_DE/LC_MESSAGES/django.po +++ b/inyoka/ikhaya/locale/de_DE/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: 2023-11-12 16:29+0100\n" "Last-Translator: Lyra\n" "Language: de_DE\n" diff --git a/inyoka/ikhaya/locale/django.pot b/inyoka/ikhaya/locale/django.pot index 148cda342..7d0d4e3c6 100644 --- a/inyoka/ikhaya/locale/django.pot +++ b/inyoka/ikhaya/locale/django.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Inyoka Project v0.36.1\n" +"Project-Id-Version: Inyoka Project 1.0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/inyoka/locale/de_DE/LC_MESSAGES/django.po b/inyoka/locale/de_DE/LC_MESSAGES/django.po index 9875e8529..d6073ad93 100644 --- a/inyoka/locale/de_DE/LC_MESSAGES/django.po +++ b/inyoka/locale/de_DE/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-21 23:38+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: 2023-11-12 16:29+0100\n" "Last-Translator: Christoph Volkert <>\n" "Language: de_DE\n" diff --git a/inyoka/locale/django.pot b/inyoka/locale/django.pot index 52f17e2f3..410421e81 100644 --- a/inyoka/locale/django.pot +++ b/inyoka/locale/django.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka Project 1.0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-21 23:38+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/inyoka/markup/locale/de_DE/LC_MESSAGES/django.po b/inyoka/markup/locale/de_DE/LC_MESSAGES/django.po index 6733ab5cc..a15b1dc23 100644 --- a/inyoka/markup/locale/de_DE/LC_MESSAGES/django.po +++ b/inyoka/markup/locale/de_DE/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: 2023-11-12 16:29+0100\n" "Last-Translator: Lyra\n" "Language: de_DE\n" diff --git a/inyoka/markup/locale/django.pot b/inyoka/markup/locale/django.pot index c1128cccc..6404a82f0 100644 --- a/inyoka/markup/locale/django.pot +++ b/inyoka/markup/locale/django.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Inyoka Project v0.36.1\n" +"Project-Id-Version: Inyoka Project 1.0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/inyoka/pastebin/locale/de_DE/LC_MESSAGES/django.po b/inyoka/pastebin/locale/de_DE/LC_MESSAGES/django.po index b6895c27a..8e358deb5 100644 --- a/inyoka/pastebin/locale/de_DE/LC_MESSAGES/django.po +++ b/inyoka/pastebin/locale/de_DE/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: 2023-11-12 16:29+0100\n" "Last-Translator: Lyra\n" "Language: de_DE\n" diff --git a/inyoka/pastebin/locale/django.pot b/inyoka/pastebin/locale/django.pot index 0db3f84b3..a4be14667 100644 --- a/inyoka/pastebin/locale/django.pot +++ b/inyoka/pastebin/locale/django.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Inyoka Project v0.36.1\n" +"Project-Id-Version: Inyoka Project 1.0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/inyoka/planet/locale/de_DE/LC_MESSAGES/django.po b/inyoka/planet/locale/de_DE/LC_MESSAGES/django.po index 2dc0b7a79..1566ad295 100644 --- a/inyoka/planet/locale/de_DE/LC_MESSAGES/django.po +++ b/inyoka/planet/locale/de_DE/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: 2023-11-12 16:29+0100\n" "Last-Translator: Lyra\n" "Language: de_DE\n" diff --git a/inyoka/planet/locale/django.pot b/inyoka/planet/locale/django.pot index 7b77390f1..eddd67248 100644 --- a/inyoka/planet/locale/django.pot +++ b/inyoka/planet/locale/django.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Inyoka Project v0.36.1\n" +"Project-Id-Version: Inyoka Project 1.0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/inyoka/portal/locale/de_DE/LC_MESSAGES/django.po b/inyoka/portal/locale/de_DE/LC_MESSAGES/django.po index 424922c13..68a64a5fb 100644 --- a/inyoka/portal/locale/de_DE/LC_MESSAGES/django.po +++ b/inyoka/portal/locale/de_DE/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-11-03 18:15+0100\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: 2023-11-12 16:29+0100\n" "Last-Translator: Christoph Volkert <>\n" "Language: de_DE\n" diff --git a/inyoka/portal/locale/django.pot b/inyoka/portal/locale/django.pot index 125c3a91f..6165931f2 100644 --- a/inyoka/portal/locale/django.pot +++ b/inyoka/portal/locale/django.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka Project 1.0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-11-03 18:15+0100\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/inyoka/wiki/jinja2/wiki/page.html b/inyoka/wiki/jinja2/wiki/page.html index 384e423a5..d7457239d 100644 --- a/inyoka/wiki/jinja2/wiki/page.html +++ b/inyoka/wiki/jinja2/wiki/page.html @@ -58,8 +58,7 @@
  • {% trans %}Sites under construction{% endtrans %}
  • {% trans %}Article Ideas{% endtrans %}
  • {% trans %}Untested Articles{% endtrans %}
  • -
  • {% trans %}Expandable Articles{% endtrans %}
  • -
  • {% trans %}Incorrect Articles{% endtrans %}
  • +
  • {% trans %}Incorrect Articles{% endtrans %}
  • {% trans %}Around the Wiki{% endtrans %}
  • diff --git a/inyoka/wiki/locale/de_DE/LC_MESSAGES/django.po b/inyoka/wiki/locale/de_DE/LC_MESSAGES/django.po index f9fd9d182..82a124a2e 100644 --- a/inyoka/wiki/locale/de_DE/LC_MESSAGES/django.po +++ b/inyoka/wiki/locale/de_DE/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Inyoka\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: 2023-11-12 16:29+0100\n" "Last-Translator: Lyra\n" "Language: de_DE\n" @@ -211,9 +211,6 @@ msgstr "Bearbeiten der Seite abgebrochen." msgid "Existing attachments" msgstr "Bestehende Anhänge" -msgid "Expandable Articles" -msgstr "Ausbaufähige Artikel" - msgid "Export" msgstr "Exportieren" diff --git a/inyoka/wiki/locale/django.pot b/inyoka/wiki/locale/django.pot index 0b91a0d12..f6e8ce725 100644 --- a/inyoka/wiki/locale/django.pot +++ b/inyoka/wiki/locale/django.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Inyoka Project v0.36.1\n" +"Project-Id-Version: Inyoka Project 1.0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-13 15:19+0200\n" +"POT-Creation-Date: 2024-11-17 13:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -210,9 +210,6 @@ msgstr "" msgid "Existing attachments" msgstr "" -msgid "Expandable Articles" -msgstr "" - msgid "Export" msgstr "" diff --git a/inyoka/wiki/macros.py b/inyoka/wiki/macros.py index d937129cd..b2c045532 100644 --- a/inyoka/wiki/macros.py +++ b/inyoka/wiki/macros.py @@ -237,6 +237,7 @@ def build_node(self, context, format): if ':' not in part: continue key = part.split(':')[0].strip() + print(key) values = [x.strip() for x in part.split(':')[1].split(',')] mapping.extend([(key, x) for x in values]) mapping = MultiMap(mapping) diff --git a/package-lock.json b/package-lock.json index 2c2b3cba1..b69eb01a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "theme-inyoka", - "version": "0.28.0", + "name": "inyoka", + "version": "1.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "theme-inyoka", - "version": "0.28.0", + "name": "inyoka", + "version": "1.0.1", "license": "BSD-3-Clause", "dependencies": { "jshint": "^2.12.0", From b8150819d7e136778a4094031b74c97deb04e7b6 Mon Sep 17 00:00:00 2001 From: chrysle <96722107+chrysle@users.noreply.github.com> Date: Sun, 17 Nov 2024 13:50:01 +0100 Subject: [PATCH 2/2] Add binary translation files --- .../forum/locale/de_DE/LC_MESSAGES/django.mo | Bin 23806 -> 23806 bytes .../ikhaya/locale/de_DE/LC_MESSAGES/django.mo | Bin 15994 -> 15994 bytes inyoka/locale/de_DE/LC_MESSAGES/django.mo | Bin 8134 -> 8134 bytes .../markup/locale/de_DE/LC_MESSAGES/django.mo | Bin 3568 -> 3568 bytes .../locale/de_DE/LC_MESSAGES/django.mo | Bin 3978 -> 3978 bytes .../planet/locale/de_DE/LC_MESSAGES/django.mo | Bin 3400 -> 3400 bytes .../portal/locale/de_DE/LC_MESSAGES/django.mo | Bin 38267 -> 38267 bytes .../wiki/locale/de_DE/LC_MESSAGES/django.mo | Bin 21864 -> 21806 bytes inyoka/wiki/macros.py | 1 - 9 files changed, 1 deletion(-) diff --git a/inyoka/forum/locale/de_DE/LC_MESSAGES/django.mo b/inyoka/forum/locale/de_DE/LC_MESSAGES/django.mo index 9ab265d8d83144c3157b5591db1c60a0e8d398cb..227eff07b68a6834ff9846102b9460c711500296 100644 GIT binary patch delta 28 kcmeyjlkwk9#tmytcnx(8%@qudt&B~z4GcH$GI7xW0HH|*skVXPW+9~v8329n2ebeH delta 26 hcmexW^Q&e9s}iq)uA#Alp{bRjrM7|5W+9~v8329H2ebeH diff --git a/inyoka/locale/de_DE/LC_MESSAGES/django.mo b/inyoka/locale/de_DE/LC_MESSAGES/django.mo index b5b96379af089805b0c30864574b922fd7d26870..bccb7cbb1fc6de1508f8b759c132a764b530e030 100644 GIT binary patch delta 26 hcmX?Rf6RWvZvkFIT|;vPLt`srQ*8so%^ZUJ_yBug2jc($ delta 26 hcmX?Rf6RWvZvkEdT_ZyUBV#LL3vC0V%^ZUJ_yBt{2jTz# diff --git a/inyoka/markup/locale/de_DE/LC_MESSAGES/django.mo b/inyoka/markup/locale/de_DE/LC_MESSAGES/django.mo index fb025ecf418af099ac101633a9bc16388b2f51f3..99d99d96ff7aaba3dde54a139956616e28c8ff95 100644 GIT binary patch delta 26 hcmew${Xu#|F*~oJuA#Ytp|O>*skVXP<_7ixHUM%K2X+7e delta 26 hcmew${Xu#|F*~n;uA#Alp{bRjrM7|5<_7ixHUM$<2X+7e diff --git a/inyoka/pastebin/locale/de_DE/LC_MESSAGES/django.mo b/inyoka/pastebin/locale/de_DE/LC_MESSAGES/django.mo index 3f5260c3ffc1938a0e0edfca4d4d8b3e6ad1f37b..28cdf807cbebe78f22343467a0d07a58d6c19a14 100644 GIT binary patch delta 26 hcmeB@?~>o3$;oS|YiO=uXl!L{s%>Dn*^D!U4FFfB1_l5C delta 26 hcmeB@?~>o3$;oS=YiO)sXli9>scm4i*^D!U4FFe$1_l5C diff --git a/inyoka/planet/locale/de_DE/LC_MESSAGES/django.mo b/inyoka/planet/locale/de_DE/LC_MESSAGES/django.mo index 0b53bedd40861f0c83a4a6522116dff90145cd86..f7506b424674889f1a493d98aed36eb4fa7b058d 100644 GIT binary patch delta 26 hcmX>hbwX-GI6JSQuA#Ytp|O>*skVXP<`niPtN>_12VVdH delta 26 hcmX>hbwX-GI6JR_uA#Alp{bRjrM7|5<`niPtN>^s2VVdH diff --git a/inyoka/portal/locale/de_DE/LC_MESSAGES/django.mo b/inyoka/portal/locale/de_DE/LC_MESSAGES/django.mo index aa35ed94d1fcef7794009e8045e60c9c9cade0f5..9886bd552698d60126647ff04cd3b4512ab55fac 100644 GIT binary patch delta 22 dcmeypis|<%rVXq??1ttFhQ?OLn|XrrodINH2YCPh delta 22 dcmeypis|<%rVXq?>;}dPh89+an|XrrodIM=2X_Df diff --git a/inyoka/wiki/locale/de_DE/LC_MESSAGES/django.mo b/inyoka/wiki/locale/de_DE/LC_MESSAGES/django.mo index 19bca34c882fbd22790a8fd39a4659f23fdda19c..bb1e68218d4e37ecb9cfd517365df5803f533c4b 100644 GIT binary patch delta 3373 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