mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 15:55:13 +00:00
Merge branch 'dev' of codeberg.org:streams/streams into dev
This commit is contained in:
Mike Macgirvin
commit
12ab9505ca
3 changed files with 59 additions and 52 deletions
|
|
@ -1026,14 +1026,21 @@ class Item extends Controller
|
|||
// and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
|
||||
// we may need virtual or template classes to implement the possible alternatives
|
||||
|
||||
if (str_contains($body, '[/summary]')) {
|
||||
if (str_contains($body, '[/summary]') || str_contains($body, '</summary>')) {
|
||||
$body = wrap_code($body);
|
||||
$match = '';
|
||||
$cnt = preg_match("/\[summary](.*?)\[\/summary]/ism", $body, $match);
|
||||
if ($cnt) {
|
||||
$summary .= $match[1];
|
||||
}
|
||||
$body_content = preg_replace("/^(.*?)\[summary](.*?)\[\/summary]/ism", '', $body);
|
||||
$body = trim($body_content);
|
||||
$cnt = preg_match("/\<summary>(.*?)\<\/summary>/ism", $body, $match);
|
||||
if ($cnt) {
|
||||
$summary .= $match[1];
|
||||
}
|
||||
$body = preg_replace("/^(.*?)\[summary](.*?)\[\/summary]/ism", '', $body);
|
||||
$body = preg_replace("/^(.*?)\<summary>(.*?)\<\/summary>/ism", '', $body);
|
||||
$body = trim($body);
|
||||
$body = unwrap_code($body);
|
||||
}
|
||||
|
||||
$summary = wrap_code($summary);
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 24.07.03\n"
|
||||
"Project-Id-Version: 24.07.08\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-07-03 06:51+1000\n"
|
||||
"POT-Creation-Date: 2024-07-08 06:38+1000\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"
|
||||
|
|
@ -42,7 +42,7 @@ msgstr ""
|
|||
msgid "Login"
|
||||
msgstr ""
|
||||
|
||||
#: boot.php:1128 src/Module/Rmagic.php:88 src/Lib/Channel.php:2198
|
||||
#: boot.php:1128 src/Module/Rmagic.php:88 src/Lib/Channel.php:2205
|
||||
msgid "Remote Authentication"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -892,7 +892,7 @@ msgstr ""
|
|||
#: include/conversation.php:962 include/attach.php:1380 include/attach.php:1401
|
||||
#: src/Module/Embedphotos.php:380 src/Module/Photos.php:856
|
||||
#: src/Module/Photos.php:1324 src/Module/Cdav.php:877 src/Module/Cdav.php:878
|
||||
#: src/Module/Cdav.php:884 src/Lib/Activity.php:2440 src/Lib/Apps.php:1261
|
||||
#: src/Module/Cdav.php:884 src/Lib/Activity.php:2445 src/Lib/Apps.php:1261
|
||||
#: src/Lib/Apps.php:1352 src/Widget/Portfolio.php:110 src/Widget/Album.php:100
|
||||
#: src/Storage/Browser.php:183
|
||||
msgid "Unknown"
|
||||
|
|
@ -1418,7 +1418,7 @@ msgid "Visible to specific connections."
|
|||
msgstr ""
|
||||
|
||||
#: include/items.php:3099 include/misc.php:1716 include/misc.php:3213
|
||||
#: src/Lib/Activity.php:4046
|
||||
#: src/Lib/Activity.php:4051
|
||||
#, php-format
|
||||
msgid "%1$s (%2$s)"
|
||||
msgstr ""
|
||||
|
|
@ -1695,8 +1695,8 @@ msgstr ""
|
|||
#: src/Module/Regmod.php:25 src/Module/Defperms.php:176
|
||||
#: src/Module/Defperms.php:182 src/Module/Editwebpage.php:82
|
||||
#: src/Module/Editwebpage.php:103 src/Module/Editwebpage.php:122
|
||||
#: src/Module/Editwebpage.php:138 src/Module/Item.php:636
|
||||
#: src/Module/Item.php:658 src/Module/Item.php:670 src/Module/Item.php:1893
|
||||
#: src/Module/Editwebpage.php:138 src/Module/Item.php:641
|
||||
#: src/Module/Item.php:663 src/Module/Item.php:675 src/Module/Item.php:1901
|
||||
#: src/Module/Setup.php:220 src/Module/Menu.php:136 src/Module/Menu.php:147
|
||||
#: src/Module/Blocks.php:82 src/Module/Blocks.php:89 src/Module/Invite.php:103
|
||||
#: src/Module/Editpost.php:26 src/Module/Suggestions.php:35
|
||||
|
|
@ -1708,8 +1708,8 @@ msgstr ""
|
|||
#: src/Module/Thing.php:318 src/Module/Thing.php:339 src/Module/Thing.php:381
|
||||
#: src/Module/Mood.php:147 src/Module/Register.php:115 src/Module/Poke.php:118
|
||||
#: src/Module/Editlayout.php:77 src/Module/Editlayout.php:100
|
||||
#: src/Module/Service_limits.php:16 src/Module/Channel.php:282
|
||||
#: src/Module/Channel.php:460 src/Module/Channel.php:498
|
||||
#: src/Module/Service_limits.php:16 src/Module/Channel.php:286
|
||||
#: src/Module/Channel.php:464 src/Module/Channel.php:502
|
||||
#: src/Module/Notifications.php:19 src/Module/Mitem.php:143
|
||||
#: src/Module/Api.php:31 src/Module/Chat.php:115 src/Module/Chat.php:120
|
||||
#: src/Module/Webpages.php:144 src/Lib/Chatroom.php:153
|
||||
|
|
@ -3382,7 +3382,7 @@ msgstr ""
|
|||
msgid "Remove this file"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Pin.php:49 src/Module/Item.php:593
|
||||
#: src/Module/Pin.php:49 src/Module/Item.php:598
|
||||
msgid "Unable to locate original post."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3447,7 +3447,7 @@ msgstr ""
|
|||
msgid "Profile Visibility Editor"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Profperm.php:131 src/Lib/Activity.php:3386 src/Lib/Apps.php:439
|
||||
#: src/Module/Profperm.php:131 src/Lib/Activity.php:3391 src/Lib/Apps.php:439
|
||||
#: src/Lib/Libprofile.php:753
|
||||
msgid "Profile"
|
||||
msgstr ""
|
||||
|
|
@ -3619,7 +3619,7 @@ msgstr ""
|
|||
msgid "Posts and comments"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Profile.php:62 src/Module/Channel.php:95
|
||||
#: src/Module/Profile.php:62 src/Module/Channel.php:96
|
||||
msgid "Only posts"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3649,7 +3649,7 @@ msgstr ""
|
|||
|
||||
#: src/Module/Display.php:91 src/Module/Pubstream.php:89
|
||||
#: src/Module/Stream.php:263 src/Module/Rpost.php:245
|
||||
#: src/Module/Channel.php:333
|
||||
#: src/Module/Channel.php:337
|
||||
msgid "Reset form"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3692,7 +3692,7 @@ msgstr ""
|
|||
msgid "%1$s wrote this: \"%2$s\""
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:438 src/Module/Channel.php:606
|
||||
#: src/Module/Display.php:438 src/Module/Channel.php:610
|
||||
msgid ""
|
||||
"You must enable javascript for your browser to be able to view this content."
|
||||
msgstr ""
|
||||
|
|
@ -4694,7 +4694,7 @@ msgstr ""
|
|||
msgid "No such channel"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Stream.php:232 src/Module/Channel.php:295
|
||||
#: src/Module/Stream.php:232 src/Module/Channel.php:299
|
||||
msgid "Search Results For:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5078,50 +5078,50 @@ msgstr ""
|
|||
msgid "Edit Webpage"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:690
|
||||
#: src/Module/Item.php:695
|
||||
msgid "Comment may be moderated."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:944
|
||||
#: src/Module/Item.php:949
|
||||
msgid "Empty post discarded."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1607
|
||||
#: src/Module/Item.php:1615
|
||||
msgid "Duplicate post suppressed."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1654
|
||||
#: src/Module/Item.php:1662
|
||||
msgid ""
|
||||
"Draft saved. Use <a href=\"/stream?draft=1\">Drafts</a> app to continue "
|
||||
"editing."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1713
|
||||
#: src/Module/Item.php:1721
|
||||
msgid "Your comment has been posted."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1782
|
||||
#: src/Module/Item.php:1790
|
||||
msgid "System error. Post not saved."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1810
|
||||
#: src/Module/Item.php:1818
|
||||
msgid "Your post/comment is awaiting approval."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1843 src/Module/Cloud.php:132
|
||||
#: src/Module/Item.php:1851 src/Module/Cloud.php:132
|
||||
msgid "Not found"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1987
|
||||
#: src/Module/Item.php:1995
|
||||
msgid "Unable to obtain post information from database."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1994
|
||||
#: src/Module/Item.php:2002
|
||||
#, php-format
|
||||
msgid "You have reached your limit of %1$.0f top level posts."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1999
|
||||
#: src/Module/Item.php:2007
|
||||
#, php-format
|
||||
msgid "You have reached your limit of %1$.0f webpages."
|
||||
msgstr ""
|
||||
|
|
@ -7468,11 +7468,11 @@ msgstr ""
|
|||
msgid "Authentication failed."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Rmagic.php:89 src/Lib/Channel.php:2199
|
||||
#: src/Module/Rmagic.php:89 src/Lib/Channel.php:2206
|
||||
msgid "Enter your channel address (e.g. channel@example.com)"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Rmagic.php:92 src/Lib/Channel.php:2200
|
||||
#: src/Module/Rmagic.php:92 src/Lib/Channel.php:2207
|
||||
msgid "Authenticate"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9274,7 +9274,7 @@ msgid ""
|
|||
"editor."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Channel.php:68 src/Module/Chat.php:34
|
||||
#: src/Module/Channel.php:69 src/Module/Chat.php:34
|
||||
msgid "You must be logged in to see this page."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9283,11 +9283,11 @@ msgstr ""
|
|||
msgid "This is the home page of %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Channel.php:279
|
||||
#: src/Module/Channel.php:283
|
||||
msgid "Insufficient permissions. Request redirected to profile page."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Channel.php:654
|
||||
#: src/Module/Channel.php:658
|
||||
#, php-format
|
||||
msgid "This post was published on the home page of %s."
|
||||
msgstr ""
|
||||
|
|
@ -9858,51 +9858,51 @@ msgstr ""
|
|||
msgid "Quoted post"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3384
|
||||
#: src/Lib/Activity.php:3389
|
||||
msgid "Activity"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3392
|
||||
#: src/Lib/Activity.php:3397
|
||||
#, php-format
|
||||
msgid "Likes %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3395
|
||||
#: src/Lib/Activity.php:3400
|
||||
#, php-format
|
||||
msgid "Doesn't like %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3398
|
||||
#: src/Lib/Activity.php:3403
|
||||
#, php-format
|
||||
msgid "Flagged %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3401
|
||||
#: src/Lib/Activity.php:3406
|
||||
#, php-format
|
||||
msgid "Blocked %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3407
|
||||
#: src/Lib/Activity.php:3412
|
||||
#, php-format
|
||||
msgid "Will attend %s's event"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3410
|
||||
#: src/Lib/Activity.php:3415
|
||||
#, php-format
|
||||
msgid "Will not attend %s's event"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3413
|
||||
#: src/Lib/Activity.php:3418
|
||||
#, php-format
|
||||
msgid "May attend %s's event"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3416
|
||||
#: src/Lib/Activity.php:3421
|
||||
#, php-format
|
||||
msgid "May not attend %s's event"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3422
|
||||
#: src/Lib/Activity.php:3427
|
||||
#, php-format
|
||||
msgid "📢 Repeated %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
|
@ -10185,31 +10185,31 @@ msgstr ""
|
|||
msgid "May slow page loading"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Connect.php:56 src/Lib/Connect.php:175
|
||||
#: src/Lib/Connect.php:58 src/Lib/Connect.php:177
|
||||
msgid "Channel is blocked on this site."
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Connect.php:61
|
||||
#: src/Lib/Connect.php:63
|
||||
msgid "Channel location missing."
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Connect.php:138
|
||||
#: src/Lib/Connect.php:140
|
||||
msgid "Remote channel or protocol unavailable."
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Connect.php:169
|
||||
#: src/Lib/Connect.php:171
|
||||
msgid "Channel discovery failed."
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Connect.php:182
|
||||
#: src/Lib/Connect.php:184
|
||||
msgid "Protocol not supported"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Connect.php:195
|
||||
#: src/Lib/Connect.php:197
|
||||
msgid "Cannot connect to yourself."
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Connect.php:273
|
||||
#: src/Lib/Connect.php:276
|
||||
msgid "error saving data"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
<?php
|
||||
define ('STD_VERSION', '24.07.03');
|
||||
define ('STD_VERSION', '24.07.08');
|
||||
|
|
|
|||
Loading…
Reference in a new issue