From 805e931e534763685ef94fb0c824a88f774441a3 Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Mon, 4 Dec 2023 17:35:56 +0000 Subject: [PATCH 01/14] Translated using Weblate (Croatian) Currently translated at 97.8% (89 of 91 strings) Translation: Mobilizon/Activity Translate-URL: https://weblate.framasoft.org/projects/mobilizon/activity/hr/ --- priv/gettext/hr/LC_MESSAGES/activity.po | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/priv/gettext/hr/LC_MESSAGES/activity.po b/priv/gettext/hr/LC_MESSAGES/activity.po index 1f446c6fa..088edd1b6 100644 --- a/priv/gettext/hr/LC_MESSAGES/activity.po +++ b/priv/gettext/hr/LC_MESSAGES/activity.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-25 07:55+0000\n" -"PO-Revision-Date: 2022-10-23 23:00+0000\n" +"PO-Revision-Date: 2023-12-04 17:47+0000\n" "Last-Translator: Milo Ivir \n" "Language-Team: Croatian \n" @@ -11,9 +11,9 @@ msgstr "" "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.14.1\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 5.2.1\n" ## This file is a PO Template file. ## @@ -486,64 +486,64 @@ msgstr "%{profile} su odobrili člana %{member}." #: lib/web/templates/email/activity/_event_activity_item.text.eex:31 #, elixir-autogen, elixir-format msgid "%{profile} joined your event %{event}." -msgstr "" +msgstr "%{profile} se pridružio/la tvom događaju %{event}." #: lib/web/views/email_view.ex:61 #, elixir-autogen, elixir-format msgid "An anonymous profile" -msgstr "" +msgstr "Anonimni profil" #: lib/web/templates/email/email_anonymous_activity.html.heex:107 #: lib/web/templates/email/email_anonymous_activity.text.eex:14 -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "%{profile} has posted a private announcement about event %{event}." -msgstr "%{profile} su objavili najavu za događaj %{event}." +msgstr "%{profile} je objavio/la privatnu najavu za događaj %{event}." #: lib/web/templates/email/email_anonymous_activity.html.heex:50 #: lib/web/templates/email/email_anonymous_activity.text.eex:6 -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "%{profile} has posted a public announcement under event %{event}." -msgstr "%{profile} su objavili najavu za događaj %{event}." +msgstr "%{profile} je objavio/la javnu najavu za događaj %{event}." #: lib/web/templates/email/activity/_conversation_activity_item.html.heex:3 -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "%{profile} mentionned you in a %{conversation}." -msgstr "%{profile} su vas spomenuli u komentaru događaja %{event}." +msgstr "%{profile} te je spomenuo/la u konverzaciji %{conversation}." #: lib/web/templates/email/activity/_conversation_activity_item.text.eex:1 -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "%{profile} mentionned you in a conversation." -msgstr "%{profile} su vas spomenuli u komentaru događaja %{event}." +msgstr "%{profile} te je spomenuo/la u jednoj konverzaciji." #: lib/service/activity/renderer/conversation.ex:36 #, elixir-autogen, elixir-format msgid "%{profile} replied to your message" -msgstr "" +msgstr "%{profile} je odgovorio/la na tvoju poruku" #: lib/web/templates/email/activity/_conversation_activity_item.html.heex:10 -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "%{profile} replied you in a %{conversation}." -msgstr "%{profile} su odgovorili na razgovor %{discussion}." +msgstr "%{profile} ti je odgovorio/la u jednoj %{conversation}." #: lib/web/templates/email/activity/_conversation_activity_item.text.eex:6 #, elixir-autogen, elixir-format msgid "%{profile} replied you in a conversation." -msgstr "" +msgstr "%{profile} ti je odgovorio/la u jednoj konverzaciji." #: lib/service/activity/renderer/conversation.ex:49 #, elixir-autogen, elixir-format msgid "%{profile} sent a private message about event %{event}" -msgstr "" +msgstr "%{profile} je poslao/la privatnu poruku o događaju %{event}" #: lib/service/activity/renderer/conversation.ex:23 #, elixir-autogen, elixir-format msgid "%{profile} sent you a message" -msgstr "" +msgstr "%{profile} ti je poslao/la poruku" #: lib/web/email/activity.ex:52 #, elixir-autogen, elixir-format msgid "Informations about your event %{event}" -msgstr "" +msgstr "Informacije o tvom događaju %{event}" #: lib/web/templates/email/email_anonymous_activity.html.heex:118 #: lib/web/templates/email/email_anonymous_activity.text.eex:20 From 0118d974e9dedca5d597d14a3073e91071570b21 Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Mon, 4 Dec 2023 17:58:02 +0000 Subject: [PATCH 02/14] Translated using Weblate (Croatian) Currently translated at 100.0% (91 of 91 strings) Translation: Mobilizon/Activity Translate-URL: https://weblate.framasoft.org/projects/mobilizon/activity/hr/ --- priv/gettext/hr/LC_MESSAGES/activity.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/priv/gettext/hr/LC_MESSAGES/activity.po b/priv/gettext/hr/LC_MESSAGES/activity.po index 088edd1b6..779659aeb 100644 --- a/priv/gettext/hr/LC_MESSAGES/activity.po +++ b/priv/gettext/hr/LC_MESSAGES/activity.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-25 07:55+0000\n" -"PO-Revision-Date: 2023-12-04 17:47+0000\n" +"PO-Revision-Date: 2023-12-04 18:10+0000\n" "Last-Translator: Milo Ivir \n" "Language-Team: Croatian \n" @@ -550,9 +550,13 @@ msgstr "Informacije o tvom događaju %{event}" #, elixir-autogen, elixir-format msgid "It might give details on how to join the event, so make sure to read it appropriately." msgstr "" +"Može sadržavati pojedinosti o tome kako se pridružiti događaju, stoga ga " +"svakako pročitaj." #: lib/web/templates/email/email_anonymous_activity.html.heex:156 #: lib/web/templates/email/email_anonymous_activity.text.eex:28 #, elixir-autogen, elixir-format msgid "This information is sent privately to you as a person who registered for this event. Share the informations above with other people with caution." msgstr "" +"Ove informacije se šalju privatno tebi kao osobi koja se prijavila za ovaj " +"događaj. Dijeli gore navedene informacije s drugima s oprezom." From d777d8874c8f272f26b7f71b18f8996f7273cf8d Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Mon, 4 Dec 2023 18:01:38 +0000 Subject: [PATCH 03/14] Translated using Weblate (Croatian) Currently translated at 80.0% (284 of 355 strings) Translation: Mobilizon/Backend Translate-URL: https://weblate.framasoft.org/projects/mobilizon/backend/hr/ --- priv/gettext/hr/LC_MESSAGES/default.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/priv/gettext/hr/LC_MESSAGES/default.po b/priv/gettext/hr/LC_MESSAGES/default.po index 34a5ceb1e..5975fd1eb 100644 --- a/priv/gettext/hr/LC_MESSAGES/default.po +++ b/priv/gettext/hr/LC_MESSAGES/default.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-25 07:56+0000\n" -"PO-Revision-Date: 2023-05-27 13:05+0000\n" +"PO-Revision-Date: 2023-12-04 18:10+0000\n" "Last-Translator: Milo Ivir \n" "Language-Team: Croatian \n" @@ -13,7 +13,7 @@ msgstr "" "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.17\n" +"X-Generator: Weblate 5.2.1\n" #: lib/web/templates/email/password_reset.html.heex:66 #, elixir-autogen, elixir-format @@ -1451,7 +1451,7 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group." msgstr "" -"Tim za moderiranje tvoje instance je odlučio suspendirati grupu " +"Tim za moderiranje tvoje instance je odlučio suspendiratigrupu " "%{group_name} (%{group_address}). Više nisi član ove grupe." #: lib/web/templates/email/actor_suspension_participants.html.heex:18 @@ -2105,9 +2105,9 @@ msgid "As this group was located on this instance, all of its data has been irre msgstr "" #: lib/web/templates/email/report.text.eex:11 -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "Events" -msgstr "Događaj" +msgstr "Događaji" #: lib/web/templates/email/report.html.heex:115 #, elixir-autogen, elixir-format, fuzzy From 5e7edc07840e0076acc7117cc5856fb528808432 Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Mon, 4 Dec 2023 18:04:43 +0000 Subject: [PATCH 04/14] Translated using Weblate (Croatian) Currently translated at 85.9% (1410 of 1640 strings) Translation: Mobilizon/Frontend Translate-URL: https://weblate.framasoft.org/projects/mobilizon/frontend/hr/ --- src/i18n/hr.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/i18n/hr.json b/src/i18n/hr.json index 92236da91..4516e8d51 100644 --- a/src/i18n/hr.json +++ b/src/i18n/hr.json @@ -124,6 +124,7 @@ "Are you sure you want to cancel the event creation? You'll lose all modifications.": "Jeste li sigurni da želite poništiti stvaranje događaja? Izgubiti ćete sve izmjene.", "Are you sure you want to cancel the event edition? You'll lose all modifications.": "Jeste li sigurni da želite poništiti uređivanje događaja? Izgubiti ćete sve izmjene.", "Are you sure you want to cancel your participation at event \"{title}\"?": "Jeste li sigurni da ne želite više sudjelovati u događaju \"{title}\"?", + "Are you sure you want to delete this entire conversation?": "Stvarno želiš izbrisati ovu cijelu konverzaciju?", "Are you sure you want to delete this entire discussion?": "Jeste li sigurni da želite izbrisati cijeli razgovor?", "Are you sure you want to delete this event? This action cannot be reverted.": "Jeste li sigurni da želite izbrisati ovaj događaj? Nećete moći poništiti ovu odluku.", "Are you sure you want to delete this post? This action cannot be reverted.": "Stvarno želiš izbrisati ovaj događaj? Ovo je nepovratna radnja.", @@ -199,6 +200,7 @@ "Closed": "Zatvoreno", "Comment body": "Tekst komentara", "Comment deleted": "Komentar obrisan", + "Comment from a private conversation": "Komentiraj iz privatne konverzacije", "Comment from {'@'}{username} reported": "Komentar od {'@'}{username} prijavljen", "Comment text can't be empty": "Komentar ne smije biti prazan", "Comments": "Komentari", @@ -214,6 +216,8 @@ "Congratulations, your account is now created!": "Čestitke, kreirali ste račun!", "Contact": "Kontaktiraj", "Continue editing": "Nastavi uređivanje", + "Conversation with {participants}": "Konverzacija s učesnicima {participants}", + "Conversations": "Konverzacije", "Cookies and Local storage": "Kolačići i Lokalno spremište", "Copy URL to clipboard": "Kopiraj URL u međuspremnik", "Copy details to clipboard": "Kopiraj detalje u međuspremnik", @@ -271,6 +275,7 @@ "Delete group": "Izbriši grupu", "Delete my account": "Izbriši moj račun", "Delete post": "Izbriši objavu", + "Delete this conversation": "Izbriši ovu konverzaciju", "Delete this discussion": "Izbriši razgovor", "Delete this identity": "Izbriši ovaj identitet", "Delete your identity": "Izbriši svoj identitet", @@ -540,6 +545,7 @@ "Light": "Svijetla", "Limited number of places": "Ograničeni broj mjesta", "List": "Popis", + "List of conversations": "Popis konverzacija", "List title": "Naslov popisa", "Live": "Uživo", "Load more": "Učitaj više", @@ -703,6 +709,7 @@ "Open": "Otvori", "Open a topic on our forum": "Otvori temu na našem forumu", "Open an issue on our bug tracker (advanced users)": "Otvori problem na našem bug tragaču (napredni korisnici)", + "Open conversations": "Otvori konverzacije", "Open main menu": "Otvori glavni izbornik", "Open user menu": "Otvori korisnički izbornik", "Opened reports": "Otvorene prijave", @@ -999,6 +1006,7 @@ "There are {participants} participants.": "{participants} sudionika.", "There is no activity yet. Start doing some things to see activity appear here.": "Još nema aktivnosti. Počnite nešto raditi kako bi se aktivnosti ovdje pojavile.", "There will be no way to recover your data.": "Neće biti načina vratiti vaše podatke.", + "There's no conversations yet": "Još nema konverzacija", "There's no discussions yet": "Nema razgovora", "These events may interest you": "Možda vas interesiraju ovi događaji", "These feeds contain event data for the events for which any of your profiles is a participant or creator. You should keep these private. You can find feeds for specific profiles on each profile edition page.": "Ovi feedovi sadrže podatke događaja za događaje za koje je ovaj specifični profil sudionik ili organizator. Trebali biste ih držati privatnim. Feedovi za sve vaše profile možete pronaći u stranici profila.", @@ -1197,6 +1205,7 @@ "You don't follow any instances yet.": "Ne pratite nijednu instancu.", "You don't have any upcoming events. Maybe try another filter?": "Nemaš nijedan nadolazeći događaj. Želiš li probati jedan drugi filtar?", "You excluded member {member}.": "Isključili ste člana {member}.", + "You have access to this conversation as a member of the {group} group": "Imaš pristup ovoj konverzaciji kao član grupe {group}", "You have attended {count} events in the past.": "Broj događaja kojima si prisustvovao/la u prošlosti: 0.|Broj događaja kojima si prisustvovao/la u prošlosti: 1.|Broj događaja kojima si prisustvovao/la u prošlosti: {count}.", "You have been invited by {invitedBy} to the following group:": "{invitedBy} su vas pozvali u grupu:", "You have been removed from this group's members.": "Izbačeni ste iz ove grupe.", From 1ce34eaffbcf60af8037a89cfdefdf5ab12d5971 Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Mon, 4 Dec 2023 18:10:32 +0000 Subject: [PATCH 05/14] Translated using Weblate (Croatian) Currently translated at 86.0% (1412 of 1640 strings) Translation: Mobilizon/Frontend Translate-URL: https://weblate.framasoft.org/projects/mobilizon/frontend/hr/ --- src/i18n/hr.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/i18n/hr.json b/src/i18n/hr.json index 4516e8d51..ff5e4399c 100644 --- a/src/i18n/hr.json +++ b/src/i18n/hr.json @@ -463,6 +463,7 @@ "I want to allow people to participate without an account.": "Želim dopustiti ljudima da sudjeluju i bez računa.", "I want to approve every participation request": "Želim odobriti svaki zahtjev za sudjelovanje", "I've been mentionned in a comment under an event": "Spomenut/a sam u komentaru u jednom događaju", + "I've been mentionned in a conversation": "Spomenut/a sam u konverzaciji", "I've been mentionned in a group discussion": "Spomenut/a sam u diskusiji grupe", "I've clicked on X, then on Y": "Pritisnuo/la sam X, zatim Y", "ICS feed for events": "ICS feed za događaje", @@ -1014,6 +1015,7 @@ "This Mobilizon instance and this event organizer allows anonymous participations, but requires validation through email confirmation.": "Ova instanca i ovi organizatori dozvoljavaju anonimne prijave, ali očekuju ovjerenje kroz email potvrdu.", "This URL doesn't seem to be valid": "Čini se da je ovaj URL neispravan", "This URL is not supported": "Ovaj URL nije podržan", + "This announcement will be send to all participants with the statuses selected below. They will not be allowed to reply to your announcement, but they can create a new conversation with you.": "Ova će se objava poslati svim sudionicima s dolje odabranim stanjima. Neće moći odgovoriti na tvoju objavu, ali mogu stvoriti novu konverzaciju s tobom.", "This application will be allowed to list group followers in all of the groups you're a member of": "Ova će aplikacija smjeti prikazati popis pratioca grupe u svim grupama čiji si član", "This event has been cancelled.": "Ovaj je događaj otkazan.", "This event is accessible only through it's link. Be careful where you post this link.": "Ovaj je događaj dostupan samo kroz njegovu poveznicu. Budite pažljivi gdje šaljete ovu poveznicu.", From aa7f870a796ffa70d6b286f75736db43b23d0412 Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Mon, 4 Dec 2023 18:16:38 +0000 Subject: [PATCH 06/14] Translated using Weblate (Croatian) Currently translated at 86.2% (1414 of 1640 strings) Translation: Mobilizon/Frontend Translate-URL: https://weblate.framasoft.org/projects/mobilizon/frontend/hr/ --- src/i18n/hr.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/hr.json b/src/i18n/hr.json index ff5e4399c..335adcf6e 100644 --- a/src/i18n/hr.json +++ b/src/i18n/hr.json @@ -216,7 +216,7 @@ "Congratulations, your account is now created!": "Čestitke, kreirali ste račun!", "Contact": "Kontaktiraj", "Continue editing": "Nastavi uređivanje", - "Conversation with {participants}": "Konverzacija s učesnicima {participants}", + "Conversation with {participants}": "Konverzacija sa sudionicima {participants}", "Conversations": "Konverzacije", "Cookies and Local storage": "Kolačići i Lokalno spremište", "Copy URL to clipboard": "Kopiraj URL u međuspremnik", @@ -895,6 +895,7 @@ "Send password reset": "Pošalji zahtjev za obnavljanje lozinke", "Send the confirmation email again": "Pošalji e-mail za potvrdu ponovo", "Send the report": "Pošalji izvještaj", + "Sent to {count} participants": "Poslano nijednom sudioniku|Poslano jednom sudioniku|Poslano {count} sudionicima", "Set an URL to a page with your own privacy policy.": "Postavi URL na stranicu sa vašom osobnom politikom privatnosti.", "Set an URL to a page with your own terms.": "Postavi URL za stranicu s tvojim uvjetima.", "Settings": "Postavke", @@ -977,6 +978,7 @@ "The event {event} was deleted by {profile}.": "{profile} su izbrisali događaj {event}.", "The event {event} was updated by {profile}.": "{profile} su ažurirali događaj {event}.", "The events you created are not shown here.": "Događaji koje ste stvorili nisu prikazani ovdje.", + "The following participants are groups, which means group members are able to reply to this conversation:": "Sljedeći sudionici su grupe, što znači da članovi grupe mogu odgovoriti na ovu konverzaciju:", "The geolocation prompt was denied.": "Upit za geolokaliziranje je odbijen.", "The group can now be joined by anyone, but new members need to be approved by an administrator.": "Grupi se sada svatko može pridružiti, ali nove članove mora odobriti administrator.", "The group can now be joined by anyone.": "Grupi se sada svatko može pridružiti.", From 1683f01662c06a9cccb61eb32abcf4ef11366914 Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Mon, 4 Dec 2023 18:22:12 +0000 Subject: [PATCH 07/14] Translated using Weblate (Croatian) Currently translated at 53.7% (143 of 266 strings) Translation: Mobilizon/Backend errors Translate-URL: https://weblate.framasoft.org/projects/mobilizon/backend-errors/hr/ --- priv/gettext/hr/LC_MESSAGES/errors.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/priv/gettext/hr/LC_MESSAGES/errors.po b/priv/gettext/hr/LC_MESSAGES/errors.po index f95b00f53..1b3a3eab1 100644 --- a/priv/gettext/hr/LC_MESSAGES/errors.po +++ b/priv/gettext/hr/LC_MESSAGES/errors.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-25 07:56+0000\n" -"PO-Revision-Date: 2023-04-11 18:20+0000\n" +"PO-Revision-Date: 2023-12-04 18:30+0000\n" "Last-Translator: Milo Ivir \n" "Language-Team: Croatian \n" @@ -13,7 +13,7 @@ msgstr "" "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.16.4\n" +"X-Generator: Weblate 5.2.1\n" ## This file is a PO Template file. ## @@ -1427,7 +1427,7 @@ msgstr "" #: lib/graphql/resolvers/conversation.ex:161 #, elixir-autogen, elixir-format msgid "Conversation needs to mention at least one participant that's not yourself" -msgstr "" +msgstr "Konverzacija treba spomenuti barem jednog sudionika koji nisi ti" #: lib/graphql/resolvers/participant.ex:396 #, elixir-autogen, elixir-format From a26ff98b13d27e207d138092edd43994adbd9b1b Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Mon, 4 Dec 2023 18:19:29 +0000 Subject: [PATCH 08/14] Translated using Weblate (Croatian) Currently translated at 86.2% (1414 of 1640 strings) Translation: Mobilizon/Frontend Translate-URL: https://weblate.framasoft.org/projects/mobilizon/frontend/hr/ --- src/i18n/hr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/hr.json b/src/i18n/hr.json index 335adcf6e..9066ec388 100644 --- a/src/i18n/hr.json +++ b/src/i18n/hr.json @@ -268,7 +268,7 @@ "Default Mobilizon terms": "Zadani Mobilizon uvjeti", "Delete": "Izbriši", "Delete account": "Izbriši račun", - "Delete conversation": "Izbriši razgovor", + "Delete conversation": "Izbriši konverzaciju", "Delete discussion": "Izbriši razgovor", "Delete event": "Izbriši događaj", "Delete everything": "Izbriši sve", @@ -520,7 +520,7 @@ "Join group": "Pridruži se grupi", "Join group {group}": "Pridruži se grupi {group}", "Join {instance}, a Mobilizon instance": "Pridruži se instanci {instance}, Mobilizon instanca", - "Keep the entire conversation about a specific topic together on a single page.": "Držite zajedno cijeli razgovor o nekoj temi na jednoj stranici.", + "Keep the entire conversation about a specific topic together on a single page.": "Zadrži cijelu konverzaciju o nekoj temi na jednoj stranici.", "Key words": "Ključne riječi", "Keyword, event title, group name, etc.": "Ključna riječ, naslov događaja, ime grupe itd.", "Language": "Jezik", From f1084c101fbb9d33d34614056b35e069c5e4e6ce Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 5 Dec 2023 07:59:06 +0100 Subject: [PATCH 09/14] fix(activitypub): fix receiving comments Should fix race conditions and actors deleted of received comments Signed-off-by: Thomas Citharel --- lib/federation/activity_pub/transmogrifier.ex | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/federation/activity_pub/transmogrifier.ex b/lib/federation/activity_pub/transmogrifier.ex index 2963deacd..121d6a1bc 100644 --- a/lib/federation/activity_pub/transmogrifier.ex +++ b/lib/federation/activity_pub/transmogrifier.ex @@ -81,7 +81,14 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do object_data |> transform_object_data_for_discussion() |> save_comment_or_discussion() + + {:ok, %Comment{} = comment} -> + # Object already exists + {:ok, nil, comment} end + + {:error, err} -> + {:error, err} end {:ok, %Comment{} = comment} -> From 89d1ee42f4577650ebf9b996a518019b2e0f373c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 5 Dec 2023 08:06:16 +0100 Subject: [PATCH 10/14] fix(backend): handle ecto errors when fetching and create entities Signed-off-by: Thomas Citharel --- lib/federation/activity_pub/fetcher.ex | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/federation/activity_pub/fetcher.ex b/lib/federation/activity_pub/fetcher.ex index 97166baa2..288c4a394 100644 --- a/lib/federation/activity_pub/fetcher.ex +++ b/lib/federation/activity_pub/fetcher.ex @@ -42,7 +42,7 @@ defmodule Mobilizon.Federation.ActivityPub.Fetcher do end @spec fetch_and_create(String.t(), Keyword.t()) :: - {:ok, map(), struct()} | {:error, atom()} | :error + {:ok, map(), struct()} | {:error, atom()} | {:error, Ecto.Changeset.t()} | :error def fetch_and_create(url, options \\ []) do case fetch(url, options) do {:ok, data} when is_map(data) -> @@ -61,6 +61,9 @@ defmodule Mobilizon.Federation.ActivityPub.Fetcher do {:error, error} when is_atom(error) -> {:error, error} + {:error, %Ecto.Changeset{} = err} -> + {:error, err} + :error -> {:error, :transmogrifier_error} end From c4d2ec69ad4ba6fc1f631adaca26b58e9e6f24e8 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 5 Dec 2023 08:14:43 +0100 Subject: [PATCH 11/14] fix(front): only show participants & announcements menu items to organizers Signed-off-by: Thomas Citharel --- src/components/Event/EventActionSection.vue | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/components/Event/EventActionSection.vue b/src/components/Event/EventActionSection.vue index f094f8b4a..46bfb8a87 100644 --- a/src/components/Event/EventActionSection.vue +++ b/src/components/Event/EventActionSection.vue @@ -107,11 +107,7 @@ {{ t("Actions") }} - + - + - +