From 4f5390c09ef469e966be4f66113078823066da1f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 5 Dec 2015 02:02:13 +0100 Subject: [PATCH 1/4] Needed changes for a changed core function --- appnet/appnet.php | 6 +++--- buffer/buffer.php | 6 +++--- statusnet/statusnet.php | 4 ++-- twitter/twitter.php | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appnet/appnet.php b/appnet/appnet.php index 9eb71713..10deb96d 100644 --- a/appnet/appnet.php +++ b/appnet/appnet.php @@ -357,12 +357,12 @@ function appnet_create_entities($a, $b, $postdata) { $start = $pos + 1; } - if (isset($postdata["url"]) AND isset($postdata["title"])) { + if (isset($postdata["url"]) AND isset($postdata["title"]) AND ($postdata["type"] != "photo")) { $postdata["title"] = shortenmsg($postdata["title"], 90); $max = 256 - strlen($postdata["title"]); $text = shortenmsg($text, $max); $text .= "\n[".$postdata["title"]."](".$postdata["url"].")"; - } elseif (isset($postdata["url"])) { + } elseif (isset($postdata["url"]) AND ($postdata["type"] != "photo")) { $postdata["url"] = short_link($postdata["url"]); $max = 240; $text = shortenmsg($text, $max); @@ -524,7 +524,7 @@ function appnet_send(&$a,&$b) { "value" => $attached_data ); - if (isset($post["url"]) AND !isset($post["title"])) { + if (isset($post["url"]) AND !isset($post["title"]) AND ($post["type"] != "photo")) { $display_url = str_replace(array("http://www.", "https://www."), array("", ""), $post["url"]); $display_url = str_replace(array("http://", "https://"), array("", ""), $display_url); diff --git a/buffer/buffer.php b/buffer/buffer.php index 90a79758..ebd3c37c 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -341,13 +341,13 @@ function buffer_send(&$a,&$b) { // Seems like a bug to me // Buffer doesn't add links to Twitter and App.net (but pictures) //if ($includedlinks AND isset($post["url"])) - if (($profile->service == "twitter") AND isset($post["url"])) + if (($profile->service == "twitter") AND isset($post["url"]) AND ($post["type"] != "photo")) $post["text"] .= " ".$post["url"]; - elseif (($profile->service == "appdotnet") AND isset($post["url"]) AND isset($post["title"])) { + elseif (($profile->service == "appdotnet") AND isset($post["url"]) AND isset($post["title"]) AND ($post["type"] != "photo")) { $post["title"] = shortenmsg($post["title"], 90); $post["text"] = shortenmsg($post["text"], $limit - (24 + strlen($post["title"]))); $post["text"] .= "\n[".$post["title"]."](".$post["url"].")"; - } elseif (($profile->service == "appdotnet") AND isset($post["url"])) + } elseif (($profile->service == "appdotnet") AND isset($post["url"]) AND ($post["type"] != "photo")) $post["text"] .= " ".$post["url"]; elseif ($profile->service == "google") $post["text"] .= html_entity_decode(" ", ENT_QUOTES, 'UTF-8'); // Send a special blank to identify the post through the "fromgplus" addon diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index da6cb8af..12c26e47 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -581,7 +581,7 @@ function statusnet_post_hook(&$a,&$b) { $image = ""; - if (isset($msgarr["url"])) { + if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo")) { if ((strlen($msgarr["url"]) > 20) AND ((strlen($msg." \n".$msgarr["url"]) > $max_char))) $msg .= " \n".short_link($msgarr["url"]); @@ -738,7 +738,7 @@ function statusnet_prepare_body(&$a,&$b) { $msgarr = plaintext($a, $item, $max_char, true, 7); $msg = $msgarr["text"]; - if (isset($msgarr["url"])) + if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo")) $msg .= " ".$msgarr["url"]; if (isset($msgarr["image"])) diff --git a/twitter/twitter.php b/twitter/twitter.php index 704f6193..a6a27ea8 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -475,7 +475,7 @@ function twitter_post_hook(&$a,&$b) { $image = ""; - if (isset($msgarr["url"])) + if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo")) $msg .= "\n".$msgarr["url"]; elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video")) $image = $msgarr["image"]; @@ -707,7 +707,7 @@ function twitter_prepare_body(&$a,&$b) { $msgarr = plaintext($a, $item, $max_char, true, 8); $msg = $msgarr["text"]; - if (isset($msgarr["url"])) + if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo")) $msg .= " ".$msgarr["url"]; if (isset($msgarr["image"])) -- 2.45.3 From 29c44ec92fc8bac79f2a0f45a971d70da5bff7a5 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Sat, 12 Dec 2015 16:01:11 +0100 Subject: [PATCH 2/4] nsfw-words input to textarea for more comfortable usage --- nsfw/nsfw.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 8e8c44c5..a72559ac 100755 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -88,7 +88,7 @@ function nsfw_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; $s .= ''; - $s .= ''; + $s .= ''; $s .= '
'; $s .= '
'; -- 2.45.3 From 4aea294776e524cf498a19b49c69bdc0a929dab7 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Sat, 12 Dec 2015 16:39:27 +0100 Subject: [PATCH 3/4] Update nsfw.php --- nsfw/nsfw.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index a72559ac..af383d20 100755 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -88,7 +88,7 @@ function nsfw_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; $s .= ''; - $s .= ''; + $s .= ''; $s .= '
'; $s .= '
'; -- 2.45.3 From 3f6b4541755ac3b34f88b41b4711f359c94b617a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 14 Dec 2015 19:57:45 +0100 Subject: [PATCH 4/4] update to the translations of some addons --- dav/lang/it/messages.po | 4 ++-- forumlist/lang/it/messages.po | 4 ++-- langfilter/lang/it/messages.po | 42 ++++++++++++++++++++++------------ langfilter/lang/it/strings.php | 6 +++-- statusnet/lang/fr/messages.po | 7 +++--- statusnet/lang/fr/strings.php | 2 +- 6 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dav/lang/it/messages.po b/dav/lang/it/messages.po index 7f6a9e83..ae53f06e 100644 --- a/dav/lang/it/messages.po +++ b/dav/lang/it/messages.po @@ -10,9 +10,9 @@ 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-09-10 11:55+0000\n" +"PO-Revision-Date: 2015-12-14 11:10+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\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" diff --git a/forumlist/lang/it/messages.po b/forumlist/lang/it/messages.po index f92aa870..4bc22e36 100644 --- a/forumlist/lang/it/messages.po +++ b/forumlist/lang/it/messages.po @@ -10,9 +10,9 @@ 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-10-22 07:55+0000\n" +"PO-Revision-Date: 2015-12-14 11:14+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\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" diff --git a/langfilter/lang/it/messages.po b/langfilter/lang/it/messages.po index 58e16e53..81cca5dd 100644 --- a/langfilter/lang/it/messages.po +++ b/langfilter/lang/it/messages.po @@ -5,12 +5,13 @@ # # Translators: # fabrixxm , 2015 +# Sandro Santilli , 2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-24 19:11+0200\n" -"PO-Revision-Date: 2015-08-31 11:58+0000\n" +"POT-Creation-Date: 2015-09-22 15:18+0200\n" +"PO-Revision-Date: 2015-12-14 10:47+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -19,11 +20,11 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: langfilter.php:43 +#: langfilter.php:44 msgid "Language Filter" msgstr "Filtro Lingua" -#: langfilter.php:44 +#: langfilter.php:45 msgid "" "This addon tries to identify the language of a postings. If it does not " "match any language spoken by you (see below) the posting will be collapsed. " @@ -31,29 +32,40 @@ msgid "" "postings." msgstr "Questo plugin prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti." -#: langfilter.php:45 +#: langfilter.php:46 msgid "Use the language filter" msgstr "Usa il filtro lingua" -#: langfilter.php:46 +#: langfilter.php:47 msgid "I speak" -msgstr "I parlo" - -#: langfilter.php:46 -msgid "" -"List of abbreviations for languages you speak, comma seperated. For excample" -" \"de,it\"." -msgstr "Lista di abbreviazioni per le lingue che parli, separate da virgola. Per esempio \"it,de\"" +msgstr "Parlo" #: langfilter.php:47 +msgid "" +"List of abbreviations (iso2 codes) for languages you speak, comma separated." +" For example \"de,it\"." +msgstr "Lista di abbreviazioni (codici iso2) per le lingue che parli, separate da virgola. Per esempio \"it,de\"" + +#: langfilter.php:48 +msgid "Minimum confidence in language detection" +msgstr "Fiducia minima nel rilevamento della lingua" + +#: langfilter.php:48 +msgid "" +"Minimum confidence in language detection being correct, from 0 to 100. Posts" +" will not be filtered when the confidence of language detection is below " +"this percent value." +msgstr "Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I post non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale." + +#: langfilter.php:49 msgid "Save Settings" msgstr "Salva Impostazioni" -#: langfilter.php:66 +#: langfilter.php:73 msgid "Language Filter Settings saved." msgstr "Impostazioni Filtro Lingua salvate." -#: langfilter.php:105 +#: langfilter.php:123 #, php-format msgid "unspoken language %s - Click to open/close" msgstr "lingua non parlata %s - Clicca per aprire/chiudere" diff --git a/langfilter/lang/it/strings.php b/langfilter/lang/it/strings.php index c9bee30a..ecb7b8d3 100644 --- a/langfilter/lang/it/strings.php +++ b/langfilter/lang/it/strings.php @@ -8,8 +8,10 @@ function string_plural_select_it($n){ $a->strings["Language Filter"] = "Filtro Lingua"; $a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Questo plugin prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti."; $a->strings["Use the language filter"] = "Usa il filtro lingua"; -$a->strings["I speak"] = "I parlo"; -$a->strings["List of abbreviations for languages you speak, comma seperated. For excample \"de,it\"."] = "Lista di abbreviazioni per le lingue che parli, separate da virgola. Per esempio \"it,de\""; +$a->strings["I speak"] = "Parlo"; +$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista di abbreviazioni (codici iso2) per le lingue che parli, separate da virgola. Per esempio \"it,de\""; +$a->strings["Minimum confidence in language detection"] = "Fiducia minima nel rilevamento della lingua"; +$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I post non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale."; $a->strings["Save Settings"] = "Salva Impostazioni"; $a->strings["Language Filter Settings saved."] = "Impostazioni Filtro Lingua salvate."; $a->strings["unspoken language %s - Click to open/close"] = "lingua non parlata %s - Clicca per aprire/chiudere"; diff --git a/statusnet/lang/fr/messages.po b/statusnet/lang/fr/messages.po index d06f814c..b73d7d90 100644 --- a/statusnet/lang/fr/messages.po +++ b/statusnet/lang/fr/messages.po @@ -4,14 +4,15 @@ # # # Translators: +# Damien Goutte-Gattat , 2015 # Nicola Spanti , 2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-27 07:21+0200\n" -"PO-Revision-Date: 2015-08-30 17:23+0000\n" -"Last-Translator: Nicola Spanti \n" +"PO-Revision-Date: 2015-12-12 11:28+0000\n" +"Last-Translator: Damien Goutte-Gattat \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" @@ -27,7 +28,7 @@ msgstr "Publier sur GNU Social" msgid "" "Please contact your site administrator.
The provided API URL is not " "valid." -msgstr "" +msgstr "Merci de contacter l'administrateur du site.
L'URL d'API fournie est invalide." #: statusnet.php:225 msgid "We could not contact the GNU Social API with the Path you entered." diff --git a/statusnet/lang/fr/strings.php b/statusnet/lang/fr/strings.php index 19108cba..c70d012c 100644 --- a/statusnet/lang/fr/strings.php +++ b/statusnet/lang/fr/strings.php @@ -6,7 +6,7 @@ function string_plural_select_fr($n){ }} ; $a->strings["Post to GNU Social"] = "Publier sur GNU Social"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = ""; +$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Merci de contacter l'administrateur du site.
L'URL d'API fournie est invalide."; $a->strings["We could not contact the GNU Social API with the Path you entered."] = ""; $a->strings["GNU Social settings updated."] = "Paramètres du GNU Social mis à jour."; $a->strings["GNU Social Import/Export/Mirror"] = ""; -- 2.45.3