mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 16:15:13 +00:00
Merge branch 'dev' into release
This commit is contained in:
Mike Macgirvin
commit
90c3eb993f
4 changed files with 78 additions and 74 deletions
|
|
@ -43,6 +43,7 @@ class Apgateway extends Controller
|
|||
$mappedPath = $this->mapObject(str_replace('did:key:' . $key, '', rtrim($url, '/')), $query[0]);
|
||||
$localPath = ltrim($mappedPath, '/');
|
||||
App::$cmd = $localPath;
|
||||
$_GET['req'] = $_SERVER['REQUEST_URI'] = '/' . App::$cmd;
|
||||
App::$argv = explode('/', App::$cmd);
|
||||
|
||||
App::$argc = count(App::$argv);
|
||||
|
|
|
|||
|
|
@ -1207,6 +1207,7 @@ class Item extends Controller
|
|||
if ($r['data']['is_photo']) {
|
||||
$href = Channel::getDidResolver($ch) . '/photo/' . $r['data']['hash'] . '-1.' . photoExtensionFromType($r['data']['filetype']);
|
||||
if ($token) {
|
||||
$body = str_replace($href, $href . '?token=' . $token, $body);
|
||||
$href .= '?token=' . $token;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
148
util/messages.po
148
util/messages.po
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 24.07.08\n"
|
||||
"Project-Id-Version: 24.07.12\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-07-08 06:38+1000\n"
|
||||
"POT-Creation-Date: 2024-07-12 09:10+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"
|
||||
|
|
@ -501,7 +501,7 @@ msgstr ""
|
|||
|
||||
#: extend/addon/a/flashcards/Mod_Flashcards.php:285
|
||||
#: extend/addon/a/flashcards/Mod_Flashcards.php:286 src/Module/Search.php:510
|
||||
#: src/Module/Display.php:58 src/Module/Display.php:513
|
||||
#: src/Module/Display.php:62 src/Module/Display.php:524
|
||||
#: src/Module/Filestorage.php:41 src/Module/Inspect.php:31
|
||||
#: src/Module/Viewsrc.php:29 src/Module/Admin.php:100
|
||||
#: src/Module/Admin/Themes.php:79 src/Module/Admin/Addons.php:265
|
||||
|
|
@ -612,13 +612,13 @@ msgid "Help"
|
|||
msgstr ""
|
||||
|
||||
#: include/conversation.php:58 include/misc.php:2419 src/Module/Tagger.php:85
|
||||
#: src/Module/Subthread.php:126 src/Module/Like.php:177
|
||||
#: src/Module/Subthread.php:126 src/Module/Like.php:180
|
||||
msgid "photo"
|
||||
msgstr ""
|
||||
|
||||
#: include/conversation.php:61 include/event.php:1307 include/misc.php:2422
|
||||
#: src/Module/Tagger.php:89 src/Module/Calendar.php:238
|
||||
#: src/Module/Events.php:284 src/Module/Like.php:179
|
||||
#: src/Module/Events.php:284 src/Module/Like.php:182
|
||||
msgid "event"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -636,13 +636,13 @@ msgid "comment"
|
|||
msgstr ""
|
||||
|
||||
#: include/conversation.php:105 src/Module/Plike.php:204
|
||||
#: src/Module/Like.php:226
|
||||
#: src/Module/Like.php:229
|
||||
#, php-format
|
||||
msgid "%1$s likes %2$s's %3$s"
|
||||
msgstr ""
|
||||
|
||||
#: include/conversation.php:107 src/Module/Plike.php:207
|
||||
#: src/Module/Like.php:229
|
||||
#: src/Module/Like.php:232
|
||||
#, php-format
|
||||
msgid "%1$s doesn't like %2$s's %3$s"
|
||||
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:2445 src/Lib/Apps.php:1261
|
||||
#: src/Module/Cdav.php:884 src/Lib/Activity.php:2443 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"
|
||||
|
|
@ -1376,7 +1376,8 @@ msgstr ""
|
|||
#: src/Module/Profperm.php:35 src/Module/Cloud.php:134 src/Module/Lists.php:191
|
||||
#: src/Module/Lists.php:234 src/Module/Lists.php:263
|
||||
#: src/Module/Import_items.php:133 src/Module/Subthread.php:99
|
||||
#: src/Module/Share.php:82 src/Module/Like.php:114
|
||||
#: src/Module/Apgateway.php:80 src/Module/Nomad_gateway.php:74
|
||||
#: src/Module/Share.php:82 src/Module/Like.php:115
|
||||
msgid "Permission denied"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1418,7 +1419,7 @@ msgid "Visible to specific connections."
|
|||
msgstr ""
|
||||
|
||||
#: include/items.php:3099 include/misc.php:1716 include/misc.php:3213
|
||||
#: src/Lib/Activity.php:4051
|
||||
#: src/Lib/Activity.php:4049
|
||||
#, php-format
|
||||
msgid "%1$s (%2$s)"
|
||||
msgstr ""
|
||||
|
|
@ -1670,7 +1671,7 @@ msgstr ""
|
|||
msgid "Happy Birthday %1$s"
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:44 include/attach.php:162 include/attach.php:211
|
||||
#: include/photos.php:45 include/attach.php:162 include/attach.php:211
|
||||
#: include/attach.php:289 include/attach.php:416 include/attach.php:431
|
||||
#: include/attach.php:438 include/attach.php:517 include/attach.php:1133
|
||||
#: include/attach.php:1461 include/attach.php:1632 src/Web/WebServer.php:69
|
||||
|
|
@ -1683,7 +1684,7 @@ msgstr ""
|
|||
#: src/Module/Pdledit.php:37 src/Module/New_channel.php:115
|
||||
#: src/Module/New_channel.php:139 src/Module/Profile.php:102
|
||||
#: src/Module/Profile.php:117 src/Module/Common.php:48
|
||||
#: src/Module/Display.php:510 src/Module/Viewconnections.php:25
|
||||
#: src/Module/Display.php:521 src/Module/Viewconnections.php:25
|
||||
#: src/Module/Locs.php:105 src/Module/Connections.php:39
|
||||
#: src/Module/Block.php:31 src/Module/Block.php:84
|
||||
#: src/Module/Filestorage.php:29 src/Module/Filestorage.php:115
|
||||
|
|
@ -1696,7 +1697,7 @@ msgstr ""
|
|||
#: 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:641
|
||||
#: src/Module/Item.php:663 src/Module/Item.php:675 src/Module/Item.php:1901
|
||||
#: src/Module/Item.php:663 src/Module/Item.php:675 src/Module/Item.php:1909
|
||||
#: 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
|
||||
|
|
@ -1706,60 +1707,61 @@ msgstr ""
|
|||
#: src/Module/Calendar.php:248 src/Module/Events.php:294
|
||||
#: src/Module/Cover_photo.php:335 src/Module/Cover_photo.php:347
|
||||
#: 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: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
|
||||
#: src/Module/Mood.php:147 src/Module/Apgateway.php:81
|
||||
#: src/Module/Register.php:115 src/Module/Nomad_gateway.php:75
|
||||
#: 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: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
|
||||
msgid "Permission denied."
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:142
|
||||
#: include/photos.php:143
|
||||
#, php-format
|
||||
msgid "Image exceeds website size limit of %lu bytes"
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:153
|
||||
#: include/photos.php:154
|
||||
msgid "Image file is empty."
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:188 src/Module/Profile_photo.php:232
|
||||
#: include/photos.php:189 src/Module/Profile_photo.php:232
|
||||
#: src/Module/Cover_photo.php:210
|
||||
msgid "Unable to process image"
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:346
|
||||
#: include/photos.php:347
|
||||
msgid "Photo storage failed."
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:397
|
||||
#: include/photos.php:398
|
||||
msgid "a new photo"
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:401
|
||||
#: include/photos.php:402
|
||||
#, php-format
|
||||
msgctxt "photo_upload"
|
||||
msgid "%1$s posted %2$s to %3$s"
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:404
|
||||
#: include/photos.php:405
|
||||
#, php-format
|
||||
msgctxt "photo_upload"
|
||||
msgid "%1$s posted %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:751 src/Lib/Navbar.php:392
|
||||
#: include/photos.php:753 src/Lib/Navbar.php:392
|
||||
msgid "Photo Albums"
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:752 src/Module/Photos.php:1409 src/Module/Photos.php:1420
|
||||
#: include/photos.php:754 src/Module/Photos.php:1409 src/Module/Photos.php:1420
|
||||
#: src/Module/Photos.php:1421
|
||||
msgid "Recent Photos"
|
||||
msgstr ""
|
||||
|
||||
#: include/photos.php:756
|
||||
#: include/photos.php:758
|
||||
msgid "Upload New Photos"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2467,8 +2469,8 @@ msgstr ""
|
|||
msgid "Added by superblock"
|
||||
msgstr ""
|
||||
|
||||
#: src/Web/Router.php:168 src/Module/Display.php:151 src/Module/Display.php:169
|
||||
#: src/Module/Display.php:187 src/Module/Display.php:193
|
||||
#: src/Web/Router.php:168 src/Module/Display.php:155 src/Module/Display.php:173
|
||||
#: src/Module/Display.php:191 src/Module/Display.php:197
|
||||
#: src/Module/Block.php:86 src/Module/Page.php:149
|
||||
msgid "Page not found."
|
||||
msgstr ""
|
||||
|
|
@ -3447,7 +3449,7 @@ msgstr ""
|
|||
msgid "Profile Visibility Editor"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Profperm.php:131 src/Lib/Activity.php:3391 src/Lib/Apps.php:439
|
||||
#: src/Module/Profperm.php:131 src/Lib/Activity.php:3389 src/Lib/Apps.php:439
|
||||
#: src/Lib/Libprofile.php:753
|
||||
msgid "Profile"
|
||||
msgstr ""
|
||||
|
|
@ -3647,61 +3649,61 @@ msgstr ""
|
|||
msgid "View Common Connections"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:91 src/Module/Pubstream.php:89
|
||||
#: src/Module/Display.php:95 src/Module/Pubstream.php:89
|
||||
#: src/Module/Stream.php:263 src/Module/Rpost.php:245
|
||||
#: src/Module/Channel.php:337
|
||||
msgid "Reset form"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:391
|
||||
#: src/Module/Display.php:395
|
||||
#, php-format
|
||||
msgid "\"%1$s\", shared by %2$s with %3$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:392
|
||||
#: src/Module/Display.php:396
|
||||
#, php-format
|
||||
msgid "%1$s shared this post with %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:396
|
||||
#: src/Module/Display.php:400
|
||||
msgid "Not much to read, click to see the post."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:400
|
||||
#: src/Module/Display.php:404
|
||||
#, php-format
|
||||
msgid "%1$s shared a reaction to \"%2$s\""
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:401
|
||||
#: src/Module/Display.php:405
|
||||
#, php-format
|
||||
msgid "%s shared a reaction to this post/conversation"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:408
|
||||
#: src/Module/Display.php:412
|
||||
#, php-format
|
||||
msgid "%1$s commented \"%2$s\""
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:409
|
||||
#: src/Module/Display.php:413
|
||||
#, php-format
|
||||
msgid "%s shared a comment of this post/conversation"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:413
|
||||
#: src/Module/Display.php:417
|
||||
#, php-format
|
||||
msgid "%1$s wrote this: \"%2$s\""
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:438 src/Module/Channel.php:610
|
||||
#: src/Module/Display.php:449 src/Module/Channel.php:610
|
||||
msgid ""
|
||||
"You must enable javascript for your browser to be able to view this content."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:455
|
||||
#: src/Module/Display.php:466
|
||||
msgid "Article"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Display.php:508
|
||||
#: src/Module/Display.php:519
|
||||
msgid "Item has been removed."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5086,42 +5088,42 @@ msgstr ""
|
|||
msgid "Empty post discarded."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1615
|
||||
#: src/Module/Item.php:1623
|
||||
msgid "Duplicate post suppressed."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1662
|
||||
#: src/Module/Item.php:1670
|
||||
msgid ""
|
||||
"Draft saved. Use <a href=\"/stream?draft=1\">Drafts</a> app to continue "
|
||||
"editing."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1721
|
||||
#: src/Module/Item.php:1729
|
||||
msgid "Your comment has been posted."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1790
|
||||
#: src/Module/Item.php:1798
|
||||
msgid "System error. Post not saved."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1818
|
||||
#: src/Module/Item.php:1826
|
||||
msgid "Your post/comment is awaiting approval."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1851 src/Module/Cloud.php:132
|
||||
#: src/Module/Item.php:1859 src/Module/Cloud.php:132
|
||||
msgid "Not found"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:1995
|
||||
#: src/Module/Item.php:2003
|
||||
msgid "Unable to obtain post information from database."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:2002
|
||||
#: src/Module/Item.php:2010
|
||||
#, php-format
|
||||
msgid "You have reached your limit of %1$.0f top level posts."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Item.php:2007
|
||||
#: src/Module/Item.php:2015
|
||||
#, php-format
|
||||
msgid "You have reached your limit of %1$.0f webpages."
|
||||
msgstr ""
|
||||
|
|
@ -7747,7 +7749,7 @@ msgstr ""
|
|||
msgid "Event removed"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Subthread.php:126 src/Module/Like.php:177
|
||||
#: src/Module/Subthread.php:126 src/Module/Like.php:180
|
||||
msgid "status"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9430,22 +9432,22 @@ msgstr ""
|
|||
msgid "Save to Folder"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Like.php:222
|
||||
#: src/Module/Like.php:225
|
||||
msgid "Undo a previous action"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Like.php:232
|
||||
#, php-format
|
||||
msgid "%1$s is attending %2$s's %3$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Like.php:235
|
||||
#, php-format
|
||||
msgid "%1$s is not attending %2$s's %3$s"
|
||||
msgid "%1$s is attending %2$s's %3$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Like.php:238
|
||||
#, php-format
|
||||
msgid "%1$s is not attending %2$s's %3$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Like.php:241
|
||||
#, php-format
|
||||
msgid "%1$s may attend %2$s's %3$s"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9854,55 +9856,55 @@ msgstr ""
|
|||
msgid "Grant channel administration (delegation) permission"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:584
|
||||
#: src/Lib/Activity.php:582
|
||||
msgid "Quoted post"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3389
|
||||
#: src/Lib/Activity.php:3387
|
||||
msgid "Activity"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3397
|
||||
#: src/Lib/Activity.php:3395
|
||||
#, php-format
|
||||
msgid "Likes %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3400
|
||||
#: src/Lib/Activity.php:3398
|
||||
#, php-format
|
||||
msgid "Doesn't like %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3403
|
||||
#: src/Lib/Activity.php:3401
|
||||
#, php-format
|
||||
msgid "Flagged %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3406
|
||||
#: src/Lib/Activity.php:3404
|
||||
#, php-format
|
||||
msgid "Blocked %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3412
|
||||
#: src/Lib/Activity.php:3410
|
||||
#, php-format
|
||||
msgid "Will attend %s's event"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3415
|
||||
#: src/Lib/Activity.php:3413
|
||||
#, php-format
|
||||
msgid "Will not attend %s's event"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3418
|
||||
#: src/Lib/Activity.php:3416
|
||||
#, php-format
|
||||
msgid "May attend %s's event"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3421
|
||||
#: src/Lib/Activity.php:3419
|
||||
#, php-format
|
||||
msgid "May not attend %s's event"
|
||||
msgstr ""
|
||||
|
||||
#: src/Lib/Activity.php:3427
|
||||
#: src/Lib/Activity.php:3425
|
||||
#, php-format
|
||||
msgid "📢 Repeated %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
<?php
|
||||
define ('STD_VERSION', '24.07.11.1');
|
||||
define ('STD_VERSION', '24.07.12');
|
||||
|
|
|
|||
Loading…
Reference in a new issue