Merge pull request #542 from tobiasd/20180311-mailstream

bugfix: mailstream addon was missing open/close settings header
This commit is contained in:
Michael Vogel 2018-03-11 19:18:02 +01:00 committed by GitHub
commit 6d3608eec7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 24 deletions

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: 2014-06-23 14:45+0200\n" "POT-Creation-Date: 2018-03-11 19:13+0100\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,62 +17,80 @@ 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"
#: mailstream.php:55 #: mailstream.php:77
msgid "From Address" msgid "From Address"
msgstr "" msgstr ""
#: mailstream.php:57 #: mailstream.php:79
msgid "Email address that stream items will appear to be from." msgid "Email address that stream items will appear to be from."
msgstr "" msgstr ""
#: mailstream.php:60 mailstream.php:282 #: mailstream.php:82 mailstream.php:380
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
#: mailstream.php:165 #: mailstream.php:223
msgid "Re:" msgid "Re:"
msgstr "" msgstr ""
#: mailstream.php:173 #: mailstream.php:231
msgid "Friendica post" msgid "Friendica post"
msgstr "" msgstr ""
#: mailstream.php:176 #: mailstream.php:234
msgid "Diaspora post" msgid "Diaspora post"
msgstr "" msgstr ""
#: mailstream.php:183 #: mailstream.php:244
msgid "Feed item" msgid "Feed item"
msgstr "" msgstr ""
#: mailstream.php:186 #: mailstream.php:247
msgid "Email" msgid "Email"
msgstr "" msgstr ""
#: mailstream.php:188 #: mailstream.php:249
msgid "Friendica Item" msgid "Friendica Item"
msgstr "" msgstr ""
#: mailstream.php:229 #: mailstream.php:293
msgid "Upstream" msgid "Upstream"
msgstr "" msgstr ""
#: mailstream.php:230 #: mailstream.php:294
msgid "Local" msgid "Local"
msgstr "" msgstr ""
#: mailstream.php:274 #: mailstream.php:362
msgid "Email Address"
msgstr ""
#: mailstream.php:276
msgid "Leave blank to use your account email address"
msgstr ""
#: mailstream.php:279
msgid "Enabled" msgid "Enabled"
msgstr "" msgstr ""
#: mailstream.php:281 #: mailstream.php:366
msgid "Email Address"
msgstr ""
#: mailstream.php:368
msgid "Leave blank to use your account email address"
msgstr ""
#: mailstream.php:371
msgid "Exclude Likes"
msgstr ""
#: mailstream.php:373
msgid "Check this to omit mailing \"Like\" notifications"
msgstr ""
#: mailstream.php:376
msgid "Attach Images"
msgstr ""
#: mailstream.php:378
msgid ""
"Download images in posts and attach them to the email. Useful for reading "
"email while offline."
msgstr ""
#: mailstream.php:379
msgid "Mail Stream Settings" msgid "Mail Stream Settings"
msgstr "" msgstr ""

View file

@ -1,5 +1,10 @@
<div class="settings-block"> <span id="settings_mailstream_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
</span>
<div id="settings_mailstream_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
<h3>{{$title}}</h3>
</span>
{{include file="field_checkbox.tpl" field=$enabled}} {{include file="field_checkbox.tpl" field=$enabled}}
{{include file="field_input.tpl" field=$address}} {{include file="field_input.tpl" field=$address}}
{{include file="field_checkbox.tpl" field=$nolikes}} {{include file="field_checkbox.tpl" field=$nolikes}}