From aa0f74832a2cd4c3b08aaa5f546bb573b5c1b9b8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 3 Jun 2023 15:55:09 -0400 Subject: [PATCH] [various] Rename group to circle - Drop support for group_text - Add support for circle_text --- circle_text/group_text.php | 64 ++++++++++++++++++++++++++++++ circle_text/lang/C/messages.po | 26 ++++++++++++ circle_text/lang/ar/messages.po | 32 +++++++++++++++ circle_text/lang/ar/strings.php | 10 +++++ circle_text/lang/ca/messages.po | 36 +++++++++++++++++ circle_text/lang/ca/strings.php | 11 +++++ circle_text/lang/cs/messages.po | 37 +++++++++++++++++ circle_text/lang/cs/strings.php | 11 +++++ circle_text/lang/da-dk/messages.po | 28 +++++++++++++ circle_text/lang/da-dk/strings.php | 9 +++++ circle_text/lang/de/messages.po | 31 +++++++++++++++ circle_text/lang/de/strings.php | 9 +++++ circle_text/lang/eo/strings.php | 5 +++ circle_text/lang/es/messages.po | 33 +++++++++++++++ circle_text/lang/es/strings.php | 10 +++++ circle_text/lang/fi-fi/messages.po | 37 +++++++++++++++++ circle_text/lang/fi-fi/strings.php | 10 +++++ circle_text/lang/fr/messages.po | 29 ++++++++++++++ circle_text/lang/fr/strings.php | 9 +++++ circle_text/lang/hu/messages.po | 28 +++++++++++++ circle_text/lang/hu/strings.php | 9 +++++ circle_text/lang/is/strings.php | 5 +++ circle_text/lang/it/messages.po | 33 +++++++++++++++ circle_text/lang/it/strings.php | 10 +++++ circle_text/lang/nb-no/strings.php | 5 +++ circle_text/lang/nl/messages.po | 36 +++++++++++++++++ circle_text/lang/nl/strings.php | 9 +++++ circle_text/lang/pl/messages.po | 28 +++++++++++++ circle_text/lang/pl/strings.php | 9 +++++ circle_text/lang/pt-br/strings.php | 5 +++ circle_text/lang/ro/messages.po | 36 +++++++++++++++++ circle_text/lang/ro/strings.php | 11 +++++ circle_text/lang/ru/messages.po | 36 +++++++++++++++++ circle_text/lang/ru/strings.php | 11 +++++ circle_text/lang/sv/messages.po | 28 +++++++++++++ circle_text/lang/sv/strings.php | 8 ++++ circle_text/lang/zh-cn/strings.php | 6 +++ circle_text/templates/settings.tpl | 1 + diaspora/diaspora.php | 2 +- diaspora/lang/C/messages.po | 36 ++++++++--------- group_text/group_text.php | 2 + js_upload/lang/C/messages.po | 20 +++++----- js_upload/templates/js_upload.tpl | 10 ++--- pumpio/pumpio.php | 8 ++-- twitter/twitter.php | 4 +- 45 files changed, 793 insertions(+), 40 deletions(-) create mode 100644 circle_text/group_text.php create mode 100644 circle_text/lang/C/messages.po create mode 100644 circle_text/lang/ar/messages.po create mode 100644 circle_text/lang/ar/strings.php create mode 100644 circle_text/lang/ca/messages.po create mode 100644 circle_text/lang/ca/strings.php create mode 100644 circle_text/lang/cs/messages.po create mode 100644 circle_text/lang/cs/strings.php create mode 100644 circle_text/lang/da-dk/messages.po create mode 100644 circle_text/lang/da-dk/strings.php create mode 100644 circle_text/lang/de/messages.po create mode 100644 circle_text/lang/de/strings.php create mode 100644 circle_text/lang/eo/strings.php create mode 100644 circle_text/lang/es/messages.po create mode 100644 circle_text/lang/es/strings.php create mode 100644 circle_text/lang/fi-fi/messages.po create mode 100644 circle_text/lang/fi-fi/strings.php create mode 100644 circle_text/lang/fr/messages.po create mode 100644 circle_text/lang/fr/strings.php create mode 100644 circle_text/lang/hu/messages.po create mode 100644 circle_text/lang/hu/strings.php create mode 100644 circle_text/lang/is/strings.php create mode 100644 circle_text/lang/it/messages.po create mode 100644 circle_text/lang/it/strings.php create mode 100644 circle_text/lang/nb-no/strings.php create mode 100644 circle_text/lang/nl/messages.po create mode 100644 circle_text/lang/nl/strings.php create mode 100644 circle_text/lang/pl/messages.po create mode 100644 circle_text/lang/pl/strings.php create mode 100644 circle_text/lang/pt-br/strings.php create mode 100644 circle_text/lang/ro/messages.po create mode 100644 circle_text/lang/ro/strings.php create mode 100644 circle_text/lang/ru/messages.po create mode 100644 circle_text/lang/ru/strings.php create mode 100644 circle_text/lang/sv/messages.po create mode 100644 circle_text/lang/sv/strings.php create mode 100644 circle_text/lang/zh-cn/strings.php create mode 100644 circle_text/templates/settings.tpl diff --git a/circle_text/group_text.php b/circle_text/group_text.php new file mode 100644 index 00000000..b52cbc19 --- /dev/null +++ b/circle_text/group_text.php @@ -0,0 +1,64 @@ + + */ + +use Friendica\Core\Hook; +use Friendica\Core\Renderer; +use Friendica\DI; + +function circle_text_install() +{ + Hook::register('addon_settings', __FILE__, 'circle_text_settings'); + Hook::register('addon_settings_post', __FILE__, 'circle_text_settings_post'); +} + +/** + * + * Callback from the settings post function. + * $post contains the $_POST array. + * We will make sure we've got a valid user account + * and if so set our configuration setting for this person. + * + */ + +function circle_text_settings_post(array $post) +{ + if (!DI::userSession()->getLocalUserId() || empty($post['circle_text-submit'])) { + return; + } + + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'circle_edit_image_limit', intval($post['circle_text'])); +} + + +/** + * + * Called from the Addon Setting form. + * Add our own settings info to the page. + * + */ + +function circle_text_settings(array &$data) +{ + if (!DI::userSession()->getLocalUserId()) { + return; + } + + $enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'circle_edit_image_limit') ?? + DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'groupedit_image_limit'); + + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/circle_text/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['circle_text', DI::l10n()->t('Use a text only (non-image) circle selector in the "circle edit" menu'), $enabled], + ]); + + $data = [ + 'addon' => 'circle_text', + 'title' => DI::l10n()->t('Circle Text'), + 'html' => $html, + ]; +} diff --git a/circle_text/lang/C/messages.po b/circle_text/lang/C/messages.po new file mode 100644 index 00000000..27c0e60e --- /dev/null +++ b/circle_text/lang/C/messages.po @@ -0,0 +1,26 @@ +# ADDON circle_text +# Copyright (C) +# This file is distributed under the same license as the Friendica circle_text addon package. +# +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-06-03 15:48-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: group_text.php:56 +msgid "Use a text only (non-image) circle selector in the \"circle edit\" menu" +msgstr "" + +#: group_text.php:61 +msgid "Circle Text" +msgstr "" diff --git a/circle_text/lang/ar/messages.po b/circle_text/lang/ar/messages.po new file mode 100644 index 00000000..cfe9bb63 --- /dev/null +++ b/circle_text/lang/ar/messages.po @@ -0,0 +1,32 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Farida Khalaf , 2021 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"PO-Revision-Date: 2021-02-21 02:59+0000\n" +"Last-Translator: Farida Khalaf \n" +"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#: group_text.php:62 +msgid "Group Text" +msgstr "نص المجموعة:" + +#: group_text.php:64 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "استخدم محدد نصي للمجموعة فقط (غير مصور) في قائمة \"تعديل المجموعة\"" + +#: group_text.php:70 +msgid "Save Settings" +msgstr "حفظ الإعدادات" diff --git a/circle_text/lang/ar/strings.php b/circle_text/lang/ar/strings.php new file mode 100644 index 00000000..20e8496a --- /dev/null +++ b/circle_text/lang/ar/strings.php @@ -0,0 +1,10 @@ +=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else { return 5; } +}} +$a->strings['Group Text'] = 'نص المجموعة:'; +$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'استخدم محدد نصي للمجموعة فقط (غير مصور) في قائمة "تعديل المجموعة"'; +$a->strings['Save Settings'] = 'حفظ الإعدادات'; diff --git a/circle_text/lang/ca/messages.po b/circle_text/lang/ca/messages.po new file mode 100644 index 00000000..7081c0d7 --- /dev/null +++ b/circle_text/lang/ca/messages.po @@ -0,0 +1,36 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Joan Bar , 2019 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2019-10-14 00:45+0000\n" +"Last-Translator: Joan Bar \n" +"Language-Team: Catalan (http://www.transifex.com/Friendica/friendica/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: group_text.php:46 +msgid "Group Text settings updated." +msgstr "La configuració del text del grup s'ha actualitzat." + +#: group_text.php:76 +msgid "Group Text" +msgstr "Missatge del grup" + +#: group_text.php:78 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Utilitzeu un selector de grup de només text (que no sigui una imatge) al menú 'Edita grup'" + +#: group_text.php:84 +msgid "Submit" +msgstr "sotmetre's" diff --git a/circle_text/lang/ca/strings.php b/circle_text/lang/ca/strings.php new file mode 100644 index 00000000..b28db322 --- /dev/null +++ b/circle_text/lang/ca/strings.php @@ -0,0 +1,11 @@ +strings['Group Text settings updated.'] = 'La configuració del text del grup s\'ha actualitzat.'; +$a->strings['Group Text'] = 'Missatge del grup'; +$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utilitzeu un selector de grup de només text (que no sigui una imatge) al menú \'Edita grup\''; +$a->strings['Submit'] = 'sotmetre\'s'; diff --git a/circle_text/lang/cs/messages.po b/circle_text/lang/cs/messages.po new file mode 100644 index 00000000..8b56b630 --- /dev/null +++ b/circle_text/lang/cs/messages.po @@ -0,0 +1,37 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Aditoo, 2018 +# michal_s , 2014-2015 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2018-09-12 09:47+0000\n" +"Last-Translator: Aditoo\n" +"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" +"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" + +#: group_text.php:46 +msgid "Group Text settings updated." +msgstr "Nastavení Group Text aktualizována." + +#: group_text.php:76 +msgid "Group Text" +msgstr "Skupinový text" + +#: group_text.php:78 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Použijte pouze textový (bezobrázkový) výběr skupiny v menu úpravy skupin." + +#: group_text.php:84 +msgid "Submit" +msgstr "Odeslat" diff --git a/circle_text/lang/cs/strings.php b/circle_text/lang/cs/strings.php new file mode 100644 index 00000000..510453af --- /dev/null +++ b/circle_text/lang/cs/strings.php @@ -0,0 +1,11 @@ += 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else { return 3; } +}} +$a->strings['Group Text settings updated.'] = 'Nastavení Group Text aktualizována.'; +$a->strings['Group Text'] = 'Skupinový text'; +$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Použijte pouze textový (bezobrázkový) výběr skupiny v menu úpravy skupin.'; +$a->strings['Submit'] = 'Odeslat'; diff --git a/circle_text/lang/da-dk/messages.po b/circle_text/lang/da-dk/messages.po new file mode 100644 index 00000000..9f1fbefa --- /dev/null +++ b/circle_text/lang/da-dk/messages.po @@ -0,0 +1,28 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Anton , 2022 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" +"PO-Revision-Date: 2014-06-23 08:35+0000\n" +"Last-Translator: Anton , 2022\n" +"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: da_DK\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: group_text.php:58 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Brug en kun-tekst (intet billede) gruppevælger i grupperedigeringsmenuen" + +#: group_text.php:63 +msgid "Group Text" +msgstr "Gruppebesked" diff --git a/circle_text/lang/da-dk/strings.php b/circle_text/lang/da-dk/strings.php new file mode 100644 index 00000000..4306b769 --- /dev/null +++ b/circle_text/lang/da-dk/strings.php @@ -0,0 +1,9 @@ +strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Brug en kun-tekst (intet billede) gruppevælger i grupperedigeringsmenuen'; +$a->strings['Group Text'] = 'Gruppebesked'; diff --git a/circle_text/lang/de/messages.po b/circle_text/lang/de/messages.po new file mode 100644 index 00000000..e4e5d782 --- /dev/null +++ b/circle_text/lang/de/messages.po @@ -0,0 +1,31 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Andreas H., 2014 +# Tobias Diekershoff , 2014 +# Tobias Diekershoff , 2021 +# Ulf Rompe , 2019 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" +"PO-Revision-Date: 2014-06-23 08:35+0000\n" +"Last-Translator: Tobias Diekershoff , 2021\n" +"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: group_text.php:58 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen" + +#: group_text.php:63 +msgid "Group Text" +msgstr "Gruppen als Text" diff --git a/circle_text/lang/de/strings.php b/circle_text/lang/de/strings.php new file mode 100644 index 00000000..7a75b54d --- /dev/null +++ b/circle_text/lang/de/strings.php @@ -0,0 +1,9 @@ +strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Beim Bearbeiten von Gruppen Text statt Bilder anzeigen'; +$a->strings['Group Text'] = 'Gruppen als Text'; diff --git a/circle_text/lang/eo/strings.php b/circle_text/lang/eo/strings.php new file mode 100644 index 00000000..4e220fb0 --- /dev/null +++ b/circle_text/lang/eo/strings.php @@ -0,0 +1,5 @@ +strings["Group Text"] = ""; +$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = ""; +$a->strings["Submit"] = "Sendi"; diff --git a/circle_text/lang/es/messages.po b/circle_text/lang/es/messages.po new file mode 100644 index 00000000..5d6d4107 --- /dev/null +++ b/circle_text/lang/es/messages.po @@ -0,0 +1,33 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Albert, 2016 +# Senex Petrovic , 2021 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"PO-Revision-Date: 2021-04-01 09:56+0000\n" +"Last-Translator: Senex Petrovic \n" +"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: group_text.php:62 +msgid "Group Text" +msgstr "Grupo de Texto" + +#: group_text.php:64 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Utilice sólo el selector de grupo de texto (no imagen) en el menú \"edición de grupo\"" + +#: group_text.php:70 +msgid "Save Settings" +msgstr "Guardar Ajustes" diff --git a/circle_text/lang/es/strings.php b/circle_text/lang/es/strings.php new file mode 100644 index 00000000..632130fd --- /dev/null +++ b/circle_text/lang/es/strings.php @@ -0,0 +1,10 @@ +strings['Group Text'] = 'Grupo de Texto'; +$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utilice sólo el selector de grupo de texto (no imagen) en el menú "edición de grupo"'; +$a->strings['Save Settings'] = 'Guardar Ajustes'; diff --git a/circle_text/lang/fi-fi/messages.po b/circle_text/lang/fi-fi/messages.po new file mode 100644 index 00000000..2e3782fd --- /dev/null +++ b/circle_text/lang/fi-fi/messages.po @@ -0,0 +1,37 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Kris, 2018 +# Kris, 2018 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2018-04-08 15:51+0000\n" +"Last-Translator: Kris\n" +"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fi_FI\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: group_text.php:46 +msgid "Group Text settings updated." +msgstr "Group Text -asetukset päivitetty." + +#: group_text.php:76 +msgid "Group Text" +msgstr "Group Text" + +#: group_text.php:78 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "" + +#: group_text.php:84 +msgid "Submit" +msgstr "Lähetä" diff --git a/circle_text/lang/fi-fi/strings.php b/circle_text/lang/fi-fi/strings.php new file mode 100644 index 00000000..5bcd0ddc --- /dev/null +++ b/circle_text/lang/fi-fi/strings.php @@ -0,0 +1,10 @@ +strings['Group Text settings updated.'] = 'Group Text -asetukset päivitetty.'; +$a->strings['Group Text'] = 'Group Text'; +$a->strings['Submit'] = 'Lähetä'; diff --git a/circle_text/lang/fr/messages.po b/circle_text/lang/fr/messages.po new file mode 100644 index 00000000..c076d697 --- /dev/null +++ b/circle_text/lang/fr/messages.po @@ -0,0 +1,29 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# bob lebonche , 2021 +# Hypolite Petovan , 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" +"PO-Revision-Date: 2014-06-23 08:35+0000\n" +"Last-Translator: bob lebonche , 2021\n" +"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" + +#: group_text.php:58 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Utiliser uniquement un groupe de texte (pas d'image) dans le menu \"groupedit\"" + +#: group_text.php:63 +msgid "Group Text" +msgstr "Groupe de texte" diff --git a/circle_text/lang/fr/strings.php b/circle_text/lang/fr/strings.php new file mode 100644 index 00000000..657d7657 --- /dev/null +++ b/circle_text/lang/fr/strings.php @@ -0,0 +1,9 @@ +strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utiliser uniquement un groupe de texte (pas d\'image) dans le menu "groupedit"'; +$a->strings['Group Text'] = 'Groupe de texte'; diff --git a/circle_text/lang/hu/messages.po b/circle_text/lang/hu/messages.po new file mode 100644 index 00000000..2c4f19c9 --- /dev/null +++ b/circle_text/lang/hu/messages.po @@ -0,0 +1,28 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Balázs Úr, 2020-2021 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" +"PO-Revision-Date: 2014-06-23 08:35+0000\n" +"Last-Translator: Balázs Úr, 2020-2021\n" +"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: group_text.php:58 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Csak szöveges (kép nélküli) csoportválasztó használata a „csoportszerkesztés” menüben" + +#: group_text.php:63 +msgid "Group Text" +msgstr "Csoportszöveg" diff --git a/circle_text/lang/hu/strings.php b/circle_text/lang/hu/strings.php new file mode 100644 index 00000000..ac72f9e0 --- /dev/null +++ b/circle_text/lang/hu/strings.php @@ -0,0 +1,9 @@ +strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Csak szöveges (kép nélküli) csoportválasztó használata a „csoportszerkesztés” menüben'; +$a->strings['Group Text'] = 'Csoportszöveg'; diff --git a/circle_text/lang/is/strings.php b/circle_text/lang/is/strings.php new file mode 100644 index 00000000..d331b2f9 --- /dev/null +++ b/circle_text/lang/is/strings.php @@ -0,0 +1,5 @@ +strings["Group Text"] = ""; +$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = ""; +$a->strings["Submit"] = "Senda inn"; diff --git a/circle_text/lang/it/messages.po b/circle_text/lang/it/messages.po new file mode 100644 index 00000000..daab3fb6 --- /dev/null +++ b/circle_text/lang/it/messages.po @@ -0,0 +1,33 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# fabrixxm , 2014-2015 +# Sylke Vicious , 2021 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"PO-Revision-Date: 2021-02-16 12:48+0000\n" +"Last-Translator: Sylke Vicious \n" +"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: group_text.php:62 +msgid "Group Text" +msgstr "Editor Gruppi Testuale" + +#: group_text.php:64 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Usa un selettore testuale (senza immagini) nella pagina \"modifica gruppo\"" + +#: group_text.php:70 +msgid "Save Settings" +msgstr "Salva Impostazioni" diff --git a/circle_text/lang/it/strings.php b/circle_text/lang/it/strings.php new file mode 100644 index 00000000..e52683e9 --- /dev/null +++ b/circle_text/lang/it/strings.php @@ -0,0 +1,10 @@ +strings['Group Text'] = 'Editor Gruppi Testuale'; +$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Usa un selettore testuale (senza immagini) nella pagina "modifica gruppo"'; +$a->strings['Save Settings'] = 'Salva Impostazioni'; diff --git a/circle_text/lang/nb-no/strings.php b/circle_text/lang/nb-no/strings.php new file mode 100644 index 00000000..cd9bebd4 --- /dev/null +++ b/circle_text/lang/nb-no/strings.php @@ -0,0 +1,5 @@ +strings["Group Text"] = ""; +$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = ""; +$a->strings["Submit"] = "Lagre"; diff --git a/circle_text/lang/nl/messages.po b/circle_text/lang/nl/messages.po new file mode 100644 index 00000000..56b5aae0 --- /dev/null +++ b/circle_text/lang/nl/messages.po @@ -0,0 +1,36 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Jeroen De Meerleer , 2018 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2018-08-24 13:48+0000\n" +"Last-Translator: Jeroen De Meerleer \n" +"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: group_text.php:46 +msgid "Group Text settings updated." +msgstr "Groupsberichten instellingen opgeslagen" + +#: group_text.php:76 +msgid "Group Text" +msgstr "Groepsbericht" + +#: group_text.php:78 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "" + +#: group_text.php:84 +msgid "Submit" +msgstr "" diff --git a/circle_text/lang/nl/strings.php b/circle_text/lang/nl/strings.php new file mode 100644 index 00000000..ba3cb3ec --- /dev/null +++ b/circle_text/lang/nl/strings.php @@ -0,0 +1,9 @@ +strings['Group Text settings updated.'] = 'Groupsberichten instellingen opgeslagen'; +$a->strings['Group Text'] = 'Groepsbericht'; diff --git a/circle_text/lang/pl/messages.po b/circle_text/lang/pl/messages.po new file mode 100644 index 00000000..a1d6a3c8 --- /dev/null +++ b/circle_text/lang/pl/messages.po @@ -0,0 +1,28 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Waldemar Stoczkowski, 2018 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" +"PO-Revision-Date: 2014-06-23 08:35+0000\n" +"Last-Translator: Waldemar Stoczkowski, 2018\n" +"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" + +#: group_text.php:58 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Użyj tylko tekst (bez obrazu) selektor grupy w menu \"Edycja grupy\"" + +#: group_text.php:63 +msgid "Group Text" +msgstr "Grupuj tekst" diff --git a/circle_text/lang/pl/strings.php b/circle_text/lang/pl/strings.php new file mode 100644 index 00000000..96157c99 --- /dev/null +++ b/circle_text/lang/pl/strings.php @@ -0,0 +1,9 @@ +=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else { return 3; } +}} +$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Użyj tylko tekst (bez obrazu) selektor grupy w menu "Edycja grupy"'; +$a->strings['Group Text'] = 'Grupuj tekst'; diff --git a/circle_text/lang/pt-br/strings.php b/circle_text/lang/pt-br/strings.php new file mode 100644 index 00000000..4579a5b1 --- /dev/null +++ b/circle_text/lang/pt-br/strings.php @@ -0,0 +1,5 @@ +strings["Group Text"] = ""; +$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = ""; +$a->strings["Submit"] = "Enviar"; diff --git a/circle_text/lang/ro/messages.po b/circle_text/lang/ro/messages.po new file mode 100644 index 00000000..c912f113 --- /dev/null +++ b/circle_text/lang/ro/messages.po @@ -0,0 +1,36 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Doru DEACONU , 2014 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2014-11-27 14:15+0000\n" +"Last-Translator: Doru DEACONU \n" +"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ro_RO\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#: group_text.php:46 +msgid "Group Text settings updated." +msgstr "Configurările Text Grup, au fost actualizate." + +#: group_text.php:76 +msgid "Group Text" +msgstr "Text Grup" + +#: group_text.php:78 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Folosiți în meniul \"editare grup\" un selector de grup strict textual (fără-imagine)" + +#: group_text.php:84 +msgid "Submit" +msgstr "Trimite" diff --git a/circle_text/lang/ro/strings.php b/circle_text/lang/ro/strings.php new file mode 100644 index 00000000..892ffc68 --- /dev/null +++ b/circle_text/lang/ro/strings.php @@ -0,0 +1,11 @@ +19)||(($n%100==0)&&($n!=0)))) { return 2; } else { return 1; } +}} +$a->strings['Group Text settings updated.'] = 'Configurările Text Grup, au fost actualizate.'; +$a->strings['Group Text'] = 'Text Grup'; +$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Folosiți în meniul "editare grup" un selector de grup strict textual (fără-imagine)'; +$a->strings['Submit'] = 'Trimite'; diff --git a/circle_text/lang/ru/messages.po b/circle_text/lang/ru/messages.po new file mode 100644 index 00000000..05a25367 --- /dev/null +++ b/circle_text/lang/ru/messages.po @@ -0,0 +1,36 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Stanislav N. , 2017 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2017-04-08 17:26+0000\n" +"Last-Translator: Stanislav N. \n" +"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#: group_text.php:46 +msgid "Group Text settings updated." +msgstr "Настройки Group Text обновлены." + +#: group_text.php:76 +msgid "Group Text" +msgstr "Group Text" + +#: group_text.php:78 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Используйте текстовый (не изображение) селектор группы в режиме редактирования группы" + +#: group_text.php:84 +msgid "Submit" +msgstr "Добавить" diff --git a/circle_text/lang/ru/strings.php b/circle_text/lang/ru/strings.php new file mode 100644 index 00000000..0f74e7ca --- /dev/null +++ b/circle_text/lang/ru/strings.php @@ -0,0 +1,11 @@ +=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else { return 3; } +}} +$a->strings['Group Text settings updated.'] = 'Настройки Group Text обновлены.'; +$a->strings['Group Text'] = 'Group Text'; +$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Используйте текстовый (не изображение) селектор группы в режиме редактирования группы'; +$a->strings['Submit'] = 'Добавить'; diff --git a/circle_text/lang/sv/messages.po b/circle_text/lang/sv/messages.po new file mode 100644 index 00000000..8ddc1806 --- /dev/null +++ b/circle_text/lang/sv/messages.po @@ -0,0 +1,28 @@ +# ADDON group_text +# Copyright (C) +# This file is distributed under the same license as the Friendica group_text addon package. +# +# +# Translators: +# Kristoffer Grundström , 2022 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" +"PO-Revision-Date: 2022-01-16 00:35+0000\n" +"Last-Translator: Kristoffer Grundström \n" +"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: group_text.php:58 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "" + +#: group_text.php:63 +msgid "Group Text" +msgstr "Grupptext" diff --git a/circle_text/lang/sv/strings.php b/circle_text/lang/sv/strings.php new file mode 100644 index 00000000..5d5e98db --- /dev/null +++ b/circle_text/lang/sv/strings.php @@ -0,0 +1,8 @@ +strings['Group Text'] = 'Grupptext'; diff --git a/circle_text/lang/zh-cn/strings.php b/circle_text/lang/zh-cn/strings.php new file mode 100644 index 00000000..a7b37bf2 --- /dev/null +++ b/circle_text/lang/zh-cn/strings.php @@ -0,0 +1,6 @@ +strings["Group Text settings updated."] = "组正文设置更新了。"; +$a->strings["Group Text"] = "组正文"; +$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "用光正文(无图片)组选择器在「组编辑」单"; +$a->strings["Submit"] = "提交"; diff --git a/circle_text/templates/settings.tpl b/circle_text/templates/settings.tpl new file mode 100644 index 00000000..2f3f4ce7 --- /dev/null +++ b/circle_text/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index d48ddac6..cb2eb996 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -205,7 +205,7 @@ function diaspora_send(array &$b) $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b)); // Dont't post if the post doesn't belong to us. - // This is a check for forum postings + // This is a check for group postings $self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { diff --git a/diaspora/lang/C/messages.po b/diaspora/lang/C/messages.po index 262e4cd8..b9944720 100644 --- a/diaspora/lang/C/messages.po +++ b/diaspora/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 19:17-0500\n" +"POT-Creation-Date: 2023-06-03 15:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,84 +17,84 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: diaspora.php:44 +#: diaspora.php:43 msgid "Post to Diaspora" msgstr "" -#: diaspora.php:67 +#: diaspora.php:66 #, php-format msgid "" "Please remember: You can always be reached from Diaspora with your Friendica " "handle %s. " msgstr "" -#: diaspora.php:68 +#: diaspora.php:67 msgid "" "This connector is only meant if you still want to use your old Diaspora " "account for some time. " msgstr "" -#: diaspora.php:69 +#: diaspora.php:68 #, php-format msgid "" "However, it is preferred that you tell your Diaspora contacts the new handle " "%s instead." msgstr "" -#: diaspora.php:79 +#: diaspora.php:78 msgid "All aspects" msgstr "" -#: diaspora.php:80 +#: diaspora.php:79 msgid "Public" msgstr "" -#: diaspora.php:86 +#: diaspora.php:85 msgid "Post to aspect:" msgstr "" -#: diaspora.php:87 +#: diaspora.php:86 #, php-format msgid "Connected with your Diaspora account %s" msgstr "" -#: diaspora.php:90 +#: diaspora.php:89 msgid "" "Can't login to your Diaspora account. Please check handle (in the format " "user@domain.tld) and password." msgstr "" -#: diaspora.php:97 +#: diaspora.php:96 msgid "Information" msgstr "" -#: diaspora.php:98 +#: diaspora.php:97 msgid "Error" msgstr "" -#: diaspora.php:104 +#: diaspora.php:103 msgid "Enable Diaspora Post Addon" msgstr "" -#: diaspora.php:105 +#: diaspora.php:104 msgid "Diaspora handle" msgstr "" -#: diaspora.php:106 +#: diaspora.php:105 msgid "Diaspora password" msgstr "" -#: diaspora.php:106 +#: diaspora.php:105 msgid "" "Privacy notice: Your Diaspora password will be stored unencrypted to " "authenticate you with your Diaspora pod. This means your Friendica node " "administrator can have access to it." msgstr "" -#: diaspora.php:108 +#: diaspora.php:107 msgid "Post to Diaspora by default" msgstr "" -#: diaspora.php:113 +#: diaspora.php:112 msgid "Diaspora Export" msgstr "" diff --git a/group_text/group_text.php b/group_text/group_text.php index 8520f696..02e9fd0a 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -4,6 +4,8 @@ * Description: Disable images in group edit menu * Version: 1.0 * Author: Thomas Willingham + * Status: Unsupported + * Note: Please use Circle Text instead */ use Friendica\App; diff --git a/js_upload/lang/C/messages.po b/js_upload/lang/C/messages.po index 4d16fe17..0d607bd5 100644 --- a/js_upload/lang/C/messages.po +++ b/js_upload/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-23 23:53-0400\n" +"POT-Creation-Date: 2023-06-03 15:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,40 +17,40 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: js_upload.php:34 +#: js_upload.php:37 msgid "Select files for upload" msgstr "" -#: js_upload.php:35 +#: js_upload.php:38 msgid "Drop files here to upload" msgstr "" -#: js_upload.php:36 +#: js_upload.php:39 msgid "Cancel" msgstr "" -#: js_upload.php:37 +#: js_upload.php:40 msgid "Failed" msgstr "" -#: js_upload.php:215 +#: js_upload.php:209 msgid "No files were uploaded." msgstr "" -#: js_upload.php:221 +#: js_upload.php:215 msgid "Uploaded file is empty" msgstr "" -#: js_upload.php:233 +#: js_upload.php:227 #, php-format msgid "Image exceeds size limit of %s" msgstr "" -#: js_upload.php:245 +#: js_upload.php:239 #, php-format msgid "File has an invalid extension, it should be one of %s." msgstr "" -#: js_upload.php:256 +#: js_upload.php:250 msgid "Upload was cancelled, or server error encountered" msgstr "" diff --git a/js_upload/templates/js_upload.tpl b/js_upload/templates/js_upload.tpl index f45b495c..b482cd2b 100644 --- a/js_upload/templates/js_upload.tpl +++ b/js_upload/templates/js_upload.tpl @@ -35,18 +35,18 @@ let albumElm = document.getElementById('photos-upload-album-select'); let contact_allow = document.querySelector('[name="contact_allow"]:not(:disabled)'); - let group_allow = document.querySelector('[name="group_allow"]:not(:disabled)'); - let contact_deny = document.querySelector('[name="contact_deny"]:not(:disabled)'); - let group_deny = document.querySelector('[name="group_deny"]:not(:disabled)'); + let circle_allow = document.querySelector('[name="circle_allow"]:not(:disabled)'); + let contact_deny = document.querySelector('[name="contact_deny"]:not(:disabled)'); + let circle_deny = document.querySelector('[name="circle_deny"]:not(:disabled)'); uploader.setParams({ newalbum : newalbumElm ? newalbumElm.value : '', album : albumElm ? albumElm.value : '', not_visible : document.getElementById('photos-upload-noshare').checked, contact_allow : contact_allow ? contact_allow.value : '', - group_allow : group_allow ? group_allow.value : '', + circle_allow : circle_allow ? circle_allow.value : '', contact_deny : contact_deny ? contact_deny.value : '', - group_deny : group_deny ? group_deny.value : '', + circle_deny : circle_deny ? circle_deny.value : '', }); } }); diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 026bd089..c27501df 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -18,7 +18,7 @@ use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Model\User; @@ -976,7 +976,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) $contact_id = $r['id']; - Group::addMember(User::getDefaultGroup($uid), $contact_id); + Circle::addMember(User::getDefaultCircle($uid), $contact_id); } else { $contact_id = $r['id']; } @@ -1353,8 +1353,8 @@ function pumpio_getreceiver(array $b) $gid = trim($gid, ' <>'); $contacts = DBA::p("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network` - FROM `group_member`, `contact` WHERE `group_member`.`gid` = ? - AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = ?", + FROM `group_member` AS `circle_member`, `contact` WHERE `circle_member`.`gid` = ? + AND `contact`.`id` = `circle_member`.`contact-id` AND `contact`.`network` = ?", $gid, Protocol::PUMPIO); while ($row = DBA::fetch($contacts)) { diff --git a/twitter/twitter.php b/twitter/twitter.php index aaa378d1..80e1a70e 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -80,7 +80,7 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Conversation; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Item; use Friendica\Model\ItemURI; use Friendica\Model\Post; @@ -1529,7 +1529,7 @@ function twitter_fetch_contact($uid, $data, $create_user) $contact_id = DBA::lastInsertId(); - Group::addMember(User::getDefaultGroup($uid), $contact_id); + Circle::addMember(User::getDefaultCircle($uid), $contact_id); } else { if ($contact['readonly'] || $contact['blocked']) { Logger::notice('Contact is blocked or readonly.', ['nickname' => $contact['nick']]);