From dff690d6332b296f6f884a68d2befb8090976316 Mon Sep 17 00:00:00 2001
From: Andy Hee <andy@hubup.pro>
Date: Sat, 2 Jun 2018 10:30:43 +0700
Subject: [PATCH] Added detailed comment for option
---
twitter/lang/C/messages.po | 56 ++++++++++++++++++++++----------------
twitter/twitter.php | 2 +-
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/twitter/lang/C/messages.po b/twitter/lang/C/messages.po
index f6d08a44..d76bb2b8 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: 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"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +17,31 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: twitter.php:193
+#: twitter.php:195
msgid "Post to Twitter"
msgstr ""
-#: twitter.php:234
+#: twitter.php:236
msgid ""
"You submitted an empty PIN, please Sign In with Twitter again to get a new "
"one."
msgstr ""
-#: twitter.php:261
+#: twitter.php:263
msgid "Twitter settings updated."
msgstr ""
-#: twitter.php:291 twitter.php:295
+#: twitter.php:293 twitter.php:297
msgid "Twitter Import/Export/Mirror"
msgstr ""
-#: twitter.php:302
+#: twitter.php:304
msgid ""
"No consumer key pair for Twitter found. Please contact your site "
"administrator."
msgstr ""
-#: twitter.php:314
+#: twitter.php:316
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 "
@@ -50,38 +50,38 @@ msgid ""
"be posted to Twitter."
msgstr ""
-#: twitter.php:315
+#: twitter.php:317
msgid "Log in with Twitter"
msgstr ""
-#: twitter.php:317
+#: twitter.php:319
msgid "Copy the PIN from Twitter here"
msgstr ""
-#: twitter.php:322 twitter.php:364 twitter.php:642
+#: twitter.php:324 twitter.php:366 twitter.php:636
msgid "Save Settings"
msgstr ""
-#: twitter.php:334
+#: twitter.php:336
msgid "Currently connected to: "
msgstr ""
-#: twitter.php:335
+#: twitter.php:337
msgid "Disconnect"
msgstr ""
-#: twitter.php:345
+#: twitter.php:347
msgid "Allow posting to Twitter"
msgstr ""
-#: twitter.php:345
+#: twitter.php:347
msgid ""
"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 "
"every posting separately in the posting options when writing the entry."
msgstr ""
-#: twitter.php:348
+#: twitter.php:350
msgid ""
"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
"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."
msgstr ""
-#: twitter.php:351
+#: twitter.php:353
msgid "Send public postings to Twitter by default"
msgstr ""
-#: twitter.php:354
+#: twitter.php:356
msgid "Mirror all posts from twitter that are no replies"
msgstr ""
-#: twitter.php:357
+#: twitter.php:359
msgid "Import the remote timeline"
msgstr ""
-#: twitter.php:360
+#: twitter.php:362
msgid "Automatically create contacts"
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."
msgstr ""
-#: twitter.php:634
+#: twitter.php:628
msgid "Settings updated."
msgstr ""
-#: twitter.php:644
+#: twitter.php:638
msgid "Consumer key"
msgstr ""
-#: twitter.php:645
+#: twitter.php:639
msgid "Consumer secret"
msgstr ""
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 5b9ac2d4..11c64164 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -359,7 +359,7 @@ function twitter_settings(App $a, &$s)
'$field' => ['twitter-import', L10n::t('Import the remote timeline'), $importenabled, '']
]);
$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>';