From 66ca9b01b23a9beec9077eead32a7dcb53aca292 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 21 Sep 2017 17:19:30 +0200 Subject: [PATCH 1/4] added README file --- unicode_smilies/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 unicode_smilies/README.md diff --git a/unicode_smilies/README.md b/unicode_smilies/README.md new file mode 100644 index 00000000..6b659d97 --- /dev/null +++ b/unicode_smilies/README.md @@ -0,0 +1,9 @@ +Unicode Smilies +=============== + +This addon changes the display of the default smilies supported by Friendica. +Instead of the images included, it uses the unicode representations instead. + +* On Linux use e.g. the [https://github.com/eosrei/emojione-color-font](Emojione-Color-font) to see them in color. +* For Windows 7 see [https://superuser.com/questions/1094188/how-do-i-display-the-latest-unicode-characters-esp-emoji-in-windows-browsers](this guide) how to enable these emoticons in Chrome. + -- 2.43.0 From 78f40314ea6c7f26f3649962b9375ea36072b464 Mon Sep 17 00:00:00 2001 From: St John Karp Date: Sun, 24 Sep 2017 02:45:12 -0700 Subject: [PATCH 2/4] Fix rendering of securemail user settings The securemail addon was overwriting all of the user settings form rendered before it. I've added a concatenation operator to ensure we're not losing any content on this page. --- securemail/securemail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/securemail/securemail.php b/securemail/securemail.php index 79f5e2da..b20eab9c 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -60,7 +60,7 @@ function securemail_settings(App &$a, &$s){ $t = get_markup_template('admin.tpl', 'addon/securemail/'); - $s = replace_macros($t, array( + $s .= replace_macros($t, array( '$title' => t('"Secure Mail" Settings'), '$submit' => t('Save Settings'), '$test' => t('Save and send test'), //NOTE: update also in 'post' -- 2.43.0 From c437f1566870447392942066529b249e0a316dde Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 27 Sep 2017 07:20:37 +0200 Subject: [PATCH 3/4] ZH-CN translation added THX mytbk --- diaspora/lang/zh-cn/messages.po | 62 +++++++++++++++++++++++++++++++++ diaspora/lang/zh-cn/strings.php | 17 +++++++++ 2 files changed, 79 insertions(+) create mode 100644 diaspora/lang/zh-cn/messages.po create mode 100644 diaspora/lang/zh-cn/strings.php diff --git a/diaspora/lang/zh-cn/messages.po b/diaspora/lang/zh-cn/messages.po new file mode 100644 index 00000000..beb0d17a --- /dev/null +++ b/diaspora/lang/zh-cn/messages.po @@ -0,0 +1,62 @@ +# ADDON diaspora +# Copyright (C) +# This file is distributed under the same license as the Friendica diaspora addon package. +# +# +# Translators: +# mytbk , 2017 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-22 13:18+0200\n" +"PO-Revision-Date: 2017-09-26 07:02+0000\n" +"Last-Translator: mytbk \n" +"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: diaspora.php:37 +msgid "Post to Diaspora" +msgstr "发到 Diaspora" + +#: diaspora.php:142 +msgid "" +"Can't login to your Diaspora account. Please check username and password and" +" ensure you used the complete address (including http...)" +msgstr "无法登录到你的 Diaspora 账户。请检查用户名和密码并确保你用了完整的地址（包括http...）" + +#: diaspora.php:149 diaspora.php:153 +msgid "Diaspora Export" +msgstr "Diaspora 导出" + +#: diaspora.php:163 +msgid "Enable Diaspora Post Plugin" +msgstr "启用 Diaspora 发文插件" + +#: diaspora.php:168 +msgid "Diaspora username" +msgstr "Diaspora 用户名" + +#: diaspora.php:173 +msgid "Diaspora password" +msgstr "Diaspora 密码" + +#: diaspora.php:178 +msgid "Diaspora site URL" +msgstr "Diaspora 站点 URL" + +#: diaspora.php:183 +msgid "Post to Diaspora by default" +msgstr "默认发文到 Diaspora" + +#: diaspora.php:189 +msgid "Save Settings" +msgstr "保存设置" + +#: diaspora.php:324 +msgid "Diaspora post failed. Queued for retry." +msgstr "Diaspora 发文失败。已经放入队列以重试。" diff --git a/diaspora/lang/zh-cn/strings.php b/diaspora/lang/zh-cn/strings.php new file mode 100644 index 00000000..47c0f556 --- /dev/null +++ b/diaspora/lang/zh-cn/strings.php @@ -0,0 +1,17 @@ +strings["Post to Diaspora"] = "发到 Diaspora"; +$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "无法登录到你的 Diaspora 账户。请检查用户名和密码并确保你用了完整的地址（包括http...）"; +$a->strings["Diaspora Export"] = "Diaspora 导出"; +$a->strings["Enable Diaspora Post Plugin"] = "启用 Diaspora 发文插件"; +$a->strings["Diaspora username"] = "Diaspora 用户名"; +$a->strings["Diaspora password"] = "Diaspora 密码"; +$a->strings["Diaspora site URL"] = "Diaspora 站点 URL"; +$a->strings["Post to Diaspora by default"] = "默认发文到 Diaspora"; +$a->strings["Save Settings"] = "保存设置"; +$a->strings["Diaspora post failed. Queued for retry."] = "Diaspora 发文失败。已经放入队列以重试。"; -- 2.43.0 From 29d58005dc8b8e99a686d009d22368d14da2cba9 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Oct 2017 03:20:11 +0000 Subject: [PATCH 4/4] Unicode_smilies: HTML elements sometimes where distorted --- unicode_smilies/unicode_smilies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php index ec1561ab..583f6c97 100644 --- a/unicode_smilies/unicode_smilies.php +++ b/unicode_smilies/unicode_smilies.php @@ -25,7 +25,7 @@ function unicode_smilies_smilies(&$a,&$b) { Smilies::add($b, ':-D', '😁'); Smilies::add($b, ':D', '😁'); Smilies::add($b, ';-)', '😉'); - Smilies::add($b, ';)', '😉'); + // Smilies::add($b, ';)', '😉'); // Deactivated since this leads to disturbed html entities Smilies::add($b, ':-P', '😛'); Smilies::add($b, ':-p', '😛'); Smilies::add($b, ':-O', '😮'); -- 2.43.0