From 21efea5b502aa26a74c1fdd565ef90487774fd00 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 8 Oct 2021 22:22:09 -0400 Subject: [PATCH 1/3] [twitter] Update description of autocreate contact option after contact drop feature was removed --- twitter/twitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 32e110e9..3e5419f4 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -409,7 +409,7 @@ function twitter_settings(App $a, &$s) '$field' => ['twitter-import', DI::l10n()->t('Import the remote timeline'), $importenabled, ''] ]); $s .= Renderer::replaceMacros($field_checkbox, [ - '$field' => ['twitter-create_user', DI::l10n()->t('Automatically create contacts'), $create_userenabled, DI::l10n()->t('This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.')] + '$field' => ['twitter-create_user', DI::l10n()->t('Automatically create contacts'), $create_userenabled, DI::l10n()->t('This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here.')] ]); $s .= '
'; $s .= '
'; From 24740d0ba05d15f7a43ce98bebaec3715d93a401 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 8 Oct 2021 22:22:26 -0400 Subject: [PATCH 2/3] [twitter] Fix typo in remote API path for likes --- twitter/twitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 3e5419f4..e07cc74f 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -630,7 +630,7 @@ function twitter_post_hook(App $a, array &$b) if ($b['verb'] == Activity::LIKE) { Logger::info('Like', ['uid' => $b['uid'], 'id' => twitter_get_id($b["thr-parent"])]); - twitter_api_post($b['deleted'] ? 'favorite/destroy' : 'favorite/create', twitter_get_id($b["thr-parent"]), $b["uid"]); + twitter_api_post($b['deleted'] ? 'favorites/destroy' : 'favorites/create', twitter_get_id($b["thr-parent"]), $b["uid"]); return; } From 9e5768a8f7fa5a65927049e72d8d7d1060dd6d0a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 8 Oct 2021 22:25:42 -0400 Subject: [PATCH 3/3] [twitter] Update main translation file after updating a string --- twitter/lang/C/messages.po | 50 ++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/twitter/lang/C/messages.po b/twitter/lang/C/messages.po index cbb77a49..b1236421 100644 --- a/twitter/lang/C/messages.po +++ b/twitter/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:16+0100\n" +"POT-Creation-Date: 2021-10-08 22:25-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,27 +17,27 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: twitter.php:189 +#: twitter.php:224 msgid "Post to Twitter" msgstr "" -#: twitter.php:234 +#: twitter.php:269 msgid "" "You submitted an empty PIN, please Sign In with Twitter again to get a new " "one." msgstr "" -#: twitter.php:291 twitter.php:295 +#: twitter.php:329 twitter.php:333 msgid "Twitter Import/Export/Mirror" msgstr "" -#: twitter.php:302 +#: twitter.php:340 msgid "" "No consumer key pair for Twitter found. Please contact your site " "administrator." msgstr "" -#: twitter.php:314 +#: twitter.php:352 msgid "" "At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " @@ -46,42 +46,42 @@ msgid "" "be posted to Twitter." msgstr "" -#: twitter.php:315 +#: twitter.php:353 msgid "Log in with Twitter" msgstr "" -#: twitter.php:317 +#: twitter.php:355 msgid "Copy the PIN from Twitter here" msgstr "" -#: twitter.php:322 twitter.php:377 twitter.php:768 +#: twitter.php:360 twitter.php:415 twitter.php:803 msgid "Save Settings" msgstr "" -#: twitter.php:324 twitter.php:379 +#: twitter.php:362 twitter.php:417 msgid "An error occured: " msgstr "" -#: twitter.php:341 +#: twitter.php:379 msgid "Currently connected to: " msgstr "" -#: twitter.php:342 twitter.php:352 +#: twitter.php:380 twitter.php:390 msgid "Disconnect" msgstr "" -#: twitter.php:359 +#: twitter.php:397 msgid "Allow posting to Twitter" msgstr "" -#: twitter.php:359 +#: twitter.php:397 msgid "" "If enabled all your public postings can be posted to the " "associated Twitter account. You can choose to do so by default (here) or for " "every posting separately in the posting options when writing the entry." msgstr "" -#: twitter.php:362 +#: twitter.php:400 msgid "" "Note: Due to your privacy settings (Hide your profile " "details from unknown viewers?) the link potentially included in public " @@ -89,41 +89,39 @@ msgid "" "the visitor that the access to your profile has been restricted." msgstr "" -#: twitter.php:365 +#: twitter.php:403 msgid "Send public postings to Twitter by default" msgstr "" -#: twitter.php:368 +#: twitter.php:406 msgid "Mirror all posts from twitter that are no replies" msgstr "" -#: twitter.php:371 +#: twitter.php:409 msgid "Import the remote timeline" msgstr "" -#: twitter.php:374 +#: twitter.php:412 msgid "Automatically create contacts" msgstr "" -#: twitter.php:374 +#: twitter.php:412 msgid "" "This will automatically create a contact in Friendica as soon as you receive " "a message from an existing contact via the Twitter network. If you do not " "enable this, you need to manually add those Twitter contacts in Friendica " -"from whom you would like to see posts here. However if enabled, you cannot " -"merely remove a twitter contact from the Friendica contact list, as it will " -"recreate this contact when they post again." +"from whom you would like to see posts here." msgstr "" -#: twitter.php:770 +#: twitter.php:805 msgid "Consumer key" msgstr "" -#: twitter.php:771 +#: twitter.php:806 msgid "Consumer secret" msgstr "" -#: twitter.php:967 +#: twitter.php:1002 #, php-format msgid "%s on Twitter" msgstr ""