mexon/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #610 from AndyHee/twitter-patch

Browse source 
Added detailed comment for option
This commit is contained in:
Hypolite Petovan 2018-06-01 23:37:12 -04:00 committed by GitHub
parent 1f4757c512 dff690d633
commit 4469895b07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
twitter/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-08 07:07+0100\n" "POT-Creation-Date: 2018-06-02 10:25+0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,31 +17,31 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: twitter.php:193 #: twitter.php:195
msgid "Post to Twitter" msgid "Post to Twitter"
msgstr "" msgstr ""
#: twitter.php:234 #: twitter.php:236
msgid "" msgid ""
"You submitted an empty PIN, please Sign In with Twitter again to get a new " "You submitted an empty PIN, please Sign In with Twitter again to get a new "
"one." "one."
msgstr "" msgstr ""
#: twitter.php:261 #: twitter.php:263
msgid "Twitter settings updated." msgid "Twitter settings updated."
msgstr "" msgstr ""
#: twitter.php:291 twitter.php:295 #: twitter.php:293 twitter.php:297
msgid "Twitter Import/Export/Mirror" msgid "Twitter Import/Export/Mirror"
msgstr "" msgstr ""
#: twitter.php:302 #: twitter.php:304
msgid "" msgid ""
"No consumer key pair for Twitter found. Please contact your site " "No consumer key pair for Twitter found. Please contact your site "
"administrator." "administrator."
msgstr "" msgstr ""
#: twitter.php:314 #: twitter.php:316
msgid "" msgid ""
"At this Friendica instance the Twitter addon was enabled but you have not " "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 " "yet connected your account to your Twitter account. To do so click the "
@ -50,38 +50,38 @@ msgid ""
"be posted to Twitter." "be posted to Twitter."
msgstr "" msgstr ""
#: twitter.php:315 #: twitter.php:317
msgid "Log in with Twitter" msgid "Log in with Twitter"
msgstr "" msgstr ""
#: twitter.php:317 #: twitter.php:319
msgid "Copy the PIN from Twitter here" msgid "Copy the PIN from Twitter here"
msgstr "" msgstr ""
#: twitter.php:322 twitter.php:364 twitter.php:642 #: twitter.php:324 twitter.php:366 twitter.php:636
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
#: twitter.php:334 #: twitter.php:336
msgid "Currently connected to: " msgid "Currently connected to: "
msgstr "" msgstr ""
#: twitter.php:335 #: twitter.php:337
msgid "Disconnect" msgid "Disconnect"
msgstr "" msgstr ""
#: twitter.php:345 #: twitter.php:347
msgid "Allow posting to Twitter" msgid "Allow posting to Twitter"
msgstr "" msgstr ""
#: twitter.php:345 #: twitter.php:347
msgid "" msgid ""
"If enabled all your <strong>public</strong> postings can be posted to the " "If enabled all your <strong>public</strong> postings can be posted to the "
"associated Twitter account. You can choose to do so by default (here) or for " "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." "every posting separately in the posting options when writing the entry."
msgstr "" msgstr ""
#: twitter.php:348 #: twitter.php:350
msgid "" msgid ""
"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile " "<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
"details from unknown viewers?</em>) the link potentially included in public " "details from unknown viewers?</em>) the link potentially included in public "
@ -89,34 +89,44 @@ msgid ""
"the visitor that the access to your profile has been restricted." "the visitor that the access to your profile has been restricted."
msgstr "" msgstr ""
#: twitter.php:351 #: twitter.php:353
msgid "Send public postings to Twitter by default" msgid "Send public postings to Twitter by default"
msgstr "" msgstr ""
#: twitter.php:354 #: twitter.php:356
msgid "Mirror all posts from twitter that are no replies" msgid "Mirror all posts from twitter that are no replies"
msgstr "" msgstr ""
#: twitter.php:357 #: twitter.php:359
msgid "Import the remote timeline" msgid "Import the remote timeline"
msgstr "" msgstr ""
#: twitter.php:360 #: twitter.php:362
msgid "Automatically create contacts" msgid "Automatically create contacts"
msgstr "" msgstr ""
#: twitter.php:619 #: twitter.php:362
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."
msgstr ""
#: twitter.php:614
msgid "Twitter post failed. Queued for retry." msgid "Twitter post failed. Queued for retry."
msgstr "" msgstr ""
#: twitter.php:634 #: twitter.php:628
msgid "Settings updated." msgid "Settings updated."
msgstr "" msgstr ""
#: twitter.php:644 #: twitter.php:638
msgid "Consumer key" msgid "Consumer key"
msgstr "" msgstr ""
#: twitter.php:645 #: twitter.php:639
msgid "Consumer secret" msgid "Consumer secret"
msgstr "" msgstr ""

2
twitter/twitter.php
View file

@ -359,7 +359,7 @@ function twitter_settings(App $a, &$s)
'$field' => ['twitter-import', L10n::t('Import the remote timeline'), $importenabled, ''] '$field' => ['twitter-import', L10n::t('Import the remote timeline'), $importenabled, '']
]); ]);
$s .= replace_macros($field_checkbox, [ $s .= replace_macros($field_checkbox, [
'$field' => ['twitter-create_user', L10n::t('Automatically create contacts'), $create_userenabled, ''] '$field' => ['twitter-create_user', L10n::t('Automatically create contacts'), $create_userenabled, 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.')]
]); ]);
$s .= '<div class="clear"></div>'; $s .= '<div class="clear"></div>';