From 0d8cf06e4aeefb00652fa5b41f50b1fd51a72819 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 13 Apr 2022 05:31:32 +0000 Subject: [PATCH] Experimental feature to enter a custom creation date --- mod/item.php | 11 +- src/Content/Conversation.php | 13 + src/Model/Item.php | 2 +- src/Module/Item/Compose.php | 16 +- src/Protocol/ActivityPub/Transmitter.php | 1 + static/defaults.config.php | 4 + view/lang/C/messages.po | 524 ++++++++++++----------- view/templates/item/compose.tpl | 1 + view/templates/jot.tpl | 1 + view/theme/frio/templates/jot.tpl | 1 + view/theme/quattro/templates/jot.tpl | 1 + view/theme/smoothly/templates/jot.tpl | 1 + 12 files changed, 306 insertions(+), 270 deletions(-) diff --git a/mod/item.php b/mod/item.php index 855e7de3f2..070934fb50 100644 --- a/mod/item.php +++ b/mod/item.php @@ -36,14 +36,12 @@ use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Session; use Friendica\Core\System; -use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Attach; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\FileTag; -use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\ItemURI; use Friendica\Model\Notification; @@ -57,7 +55,6 @@ use Friendica\Protocol\Activity; use Friendica\Security\Security; use Friendica\Util\DateTimeFormat; use Friendica\Util\ParseUrl; -use Friendica\Worker\Delivery; function item_post(App $a) { if (!Session::isAuthenticated()) { @@ -544,11 +541,11 @@ function item_post(App $a) { $datarray['author-link'] = $author['url']; $datarray['author-avatar'] = $author['thumb']; $datarray['author-id'] = Contact::getIdForURL($datarray['author-link']); - $datarray['created'] = DateTimeFormat::utcNow(); - $datarray['edited'] = DateTimeFormat::utcNow(); - $datarray['commented'] = DateTimeFormat::utcNow(); + $datarray['created'] = empty($_REQUEST['created_at']) ? DateTimeFormat::utcNow() : $_REQUEST['created_at']; + $datarray['edited'] = $datarray['created']; + $datarray['commented'] = $datarray['created']; + $datarray['changed'] = $datarray['created']; $datarray['received'] = DateTimeFormat::utcNow(); - $datarray['changed'] = DateTimeFormat::utcNow(); $datarray['extid'] = $extid; $datarray['guid'] = $guid; $datarray['uri'] = $uri; diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 0d1804981c..fd1701483b 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -316,6 +316,18 @@ class Conversation $jotplugins = ''; Hook::callAll('jot_tool', $jotplugins); + if ($this->config->get('system', 'set_creation_date')) { + $created_at = Temporal::getDateTimeField( + new \DateTime(DBA::NULL_DATETIME), + new \DateTime('now'), + null, + $this->l10n->t('Created at'), + 'created_at' + ); + } else { + $created_at = ''; + } + $tpl = Renderer::getMarkupTemplate("jot.tpl"); $o .= Renderer::replaceMacros($tpl, [ @@ -352,6 +364,7 @@ class Conversation $this->l10n->t('Scheduled at'), 'scheduled_at' ), + '$created_at' => $created_at, '$wait' => $this->l10n->t('Please wait'), '$permset' => $this->l10n->t('Permission settings'), '$shortpermset' => $this->l10n->t('Permissions'), diff --git a/src/Model/Item.php b/src/Model/Item.php index d040c876de..09890ab2c9 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -869,7 +869,7 @@ class Item $item["contact-id"] = self::contactId($item); if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) && - self::isTooOld($item)) { + empty($item['origin']) &&self::isTooOld($item)) { Logger::info('Item is too old', ['item' => $item]); return 0; } diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php index 68b14b97d6..eff7816737 100644 --- a/src/Module/Item/Compose.php +++ b/src/Module/Item/Compose.php @@ -28,6 +28,7 @@ use Friendica\Core\ACL; use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Core\Theme; +use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Item; @@ -35,7 +36,6 @@ use Friendica\Model\User; use Friendica\Module\Security\Login; use Friendica\Network\HTTPException\NotImplementedException; use Friendica\Util\Crypto; -use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; class Compose extends BaseModule @@ -135,6 +135,18 @@ class Compose extends BaseModule $contact = Contact::getById($a->getContactId()); + if ($this->config->get(local_user(), 'system', 'set_creation_date')) { + $created_at = Temporal::getDateTimeField( + new \DateTime(DBA::NULL_DATETIME), + new \DateTime('now'), + null, + $this->l10n->t('Created at'), + 'created_at' + ); + } else { + $created_at = ''; + } + $tpl = Renderer::getMarkupTemplate('item/compose.tpl'); return Renderer::replaceMacros($tpl, [ '$compose_title'=> $compose_title, @@ -172,7 +184,7 @@ class Compose extends BaseModule DI::l10n()->t('Scheduled at'), 'scheduled_at' ), - + '$created_at' => $created_at, '$title' => $title, '$category' => $category, '$body' => $body, diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index a39a4c502a..b86f94715c 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -1229,6 +1229,7 @@ class Transmitter if (in_array($data['type'], ['Create', 'Update', 'Delete'])) { $data['object'] = $object ?? self::createNote($item); + $data['published'] = DateTimeFormat::utcNow(DateTimeFormat::ATOM); } elseif ($data['type'] == 'Add') { $data = self::createAddTag($item, $data); } elseif ($data['type'] == 'Announce') { diff --git a/static/defaults.config.php b/static/defaults.config.php index 97e4b0b54b..006c3d4f57 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -505,6 +505,10 @@ return [ // Set to false if your non-sendmail agent is incompatible, or to restore old behavior of using the host address. 'sendmail_params' => true, + // set_creation_date (Boolean) + // When enabled, the user can enter a creation date when composing a post. + 'set_creation_date' => false, + // show_global_community_hint (Boolean) // When the global community page is enabled, use this option to display a hint above the stream, that this is a collection of all public top-level postings that arrive on your node. 'show_global_community_hint' => false, diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index ec2e69f68f..a0f61cc596 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2022.05-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 04:06+0000\n" +"POT-Creation-Date: 2022-04-13 05:30+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: mod/cal.php:44 mod/cal.php:48 mod/follow.php:39 mod/redir.php:36 +#: mod/cal.php:46 mod/cal.php:50 mod/follow.php:39 mod/redir.php:36 #: mod/redir.php:177 src/Module/Conversation/Community.php:181 #: src/Module/Debug/ItemBody.php:37 src/Module/Diaspora/Receive.php:57 #: src/Module/Item/Follow.php:42 src/Module/Item/Ignore.php:41 @@ -27,7 +27,7 @@ msgstr "" msgid "Access denied." msgstr "" -#: mod/cal.php:61 mod/cal.php:78 mod/photos.php:69 mod/photos.php:140 +#: mod/cal.php:63 mod/cal.php:80 mod/photos.php:69 mod/photos.php:140 #: mod/photos.php:804 src/Model/Profile.php:231 src/Module/HCard.php:52 #: src/Module/Profile/Common.php:41 src/Module/Profile/Common.php:52 #: src/Module/Profile/Contacts.php:40 src/Module/Profile/Contacts.php:50 @@ -36,55 +36,55 @@ msgstr "" msgid "User not found." msgstr "" -#: mod/cal.php:120 mod/display.php:238 src/Module/Profile/Profile.php:94 +#: mod/cal.php:122 mod/display.php:240 src/Module/Profile/Profile.php:94 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:110 #: src/Module/Update/Profile.php:56 msgid "Access to this profile has been restricted." msgstr "" -#: mod/cal.php:242 mod/events.php:377 src/Content/Nav.php:194 +#: mod/cal.php:243 mod/events.php:374 src/Content/Nav.php:194 #: src/Content/Nav.php:258 src/Module/BaseProfile.php:84 #: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:229 #: view/theme/frio/theme.php:233 msgid "Events" msgstr "" -#: mod/cal.php:243 mod/events.php:378 +#: mod/cal.php:244 mod/events.php:375 msgid "View" msgstr "" -#: mod/cal.php:244 mod/events.php:380 +#: mod/cal.php:245 mod/events.php:377 msgid "Previous" msgstr "" -#: mod/cal.php:245 mod/events.php:381 src/Module/Install.php:214 +#: mod/cal.php:246 mod/events.php:378 src/Module/Install.php:214 msgid "Next" msgstr "" -#: mod/cal.php:248 mod/events.php:386 src/Model/Event.php:457 +#: mod/cal.php:249 mod/events.php:383 src/Model/Event.php:457 msgid "today" msgstr "" -#: mod/cal.php:249 mod/events.php:387 src/Model/Event.php:458 +#: mod/cal.php:250 mod/events.php:384 src/Model/Event.php:458 #: src/Util/Temporal.php:334 msgid "month" msgstr "" -#: mod/cal.php:250 mod/events.php:388 src/Model/Event.php:459 +#: mod/cal.php:251 mod/events.php:385 src/Model/Event.php:459 #: src/Util/Temporal.php:335 msgid "week" msgstr "" -#: mod/cal.php:251 mod/events.php:389 src/Model/Event.php:460 +#: mod/cal.php:252 mod/events.php:386 src/Model/Event.php:460 #: src/Util/Temporal.php:336 msgid "day" msgstr "" -#: mod/cal.php:252 mod/events.php:390 +#: mod/cal.php:253 mod/events.php:387 msgid "list" msgstr "" -#: mod/cal.php:265 src/Console/User.php:182 src/Model/User.php:661 +#: mod/cal.php:265 src/Console/User.php:182 src/Model/User.php:660 #: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:74 #: src/Module/Admin/Users/Index.php:80 src/Module/Admin/Users/Pending.php:71 #: src/Module/Api/Twitter/ContactEndpoint.php:74 @@ -99,32 +99,32 @@ msgstr "" msgid "No exportable data found" msgstr "" -#: mod/cal.php:293 +#: mod/cal.php:292 msgid "calendar" msgstr "" -#: mod/display.php:133 mod/photos.php:808 +#: mod/display.php:135 mod/photos.php:808 #: src/Module/Conversation/Community.php:175 src/Module/Directory.php:48 #: src/Module/Search/Index.php:49 msgid "Public access denied." msgstr "" -#: mod/display.php:189 mod/display.php:263 +#: mod/display.php:191 mod/display.php:265 msgid "The requested item doesn't exist or has been deleted." msgstr "" -#: mod/display.php:343 +#: mod/display.php:345 msgid "The feed for this item is unavailable." msgstr "" -#: mod/editpost.php:38 mod/events.php:220 mod/follow.php:56 mod/follow.php:130 -#: mod/item.php:184 mod/item.php:189 mod/item.php:877 mod/message.php:69 -#: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:34 +#: mod/editpost.php:38 mod/events.php:217 mod/follow.php:56 mod/follow.php:130 +#: mod/item.php:181 mod/item.php:186 mod/item.php:874 mod/message.php:69 +#: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33 #: mod/photos.php:160 mod/photos.php:897 mod/repair_ostatus.php:31 #: mod/settings.php:49 mod/settings.php:59 mod/settings.php:430 #: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 -#: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:68 -#: mod/wall_attach.php:71 mod/wall_upload.php:90 mod/wall_upload.php:93 +#: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67 +#: mod/wall_attach.php:69 mod/wall_upload.php:89 mod/wall_upload.php:91 #: mod/wallmessage.php:37 mod/wallmessage.php:56 mod/wallmessage.php:90 #: mod/wallmessage.php:110 src/Module/Attach.php:55 src/Module/BaseApi.php:93 #: src/Module/BaseNotifications.php:97 src/Module/Contact/Advanced.php:60 @@ -162,25 +162,25 @@ msgstr "" msgid "Save" msgstr "" -#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:326 +#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:338 #: src/Module/Contact/Poke.php:176 src/Object/Post.php:988 msgid "Loading..." msgstr "" #: mod/editpost.php:93 mod/message.php:198 mod/message.php:355 -#: mod/wallmessage.php:140 src/Content/Conversation.php:327 +#: mod/wallmessage.php:140 src/Content/Conversation.php:339 msgid "Upload photo" msgstr "" -#: mod/editpost.php:94 src/Content/Conversation.php:328 +#: mod/editpost.php:94 src/Content/Conversation.php:340 msgid "upload photo" msgstr "" -#: mod/editpost.php:95 src/Content/Conversation.php:329 +#: mod/editpost.php:95 src/Content/Conversation.php:341 msgid "Attach file" msgstr "" -#: mod/editpost.php:96 src/Content/Conversation.php:330 +#: mod/editpost.php:96 src/Content/Conversation.php:342 msgid "attach file" msgstr "" @@ -209,31 +209,31 @@ msgstr "" msgid "audio link" msgstr "" -#: mod/editpost.php:103 src/Content/Conversation.php:340 -#: src/Module/Item/Compose.php:161 +#: mod/editpost.php:103 src/Content/Conversation.php:352 +#: src/Module/Item/Compose.php:173 msgid "Set your location" msgstr "" -#: mod/editpost.php:104 src/Content/Conversation.php:341 +#: mod/editpost.php:104 src/Content/Conversation.php:353 msgid "set location" msgstr "" -#: mod/editpost.php:105 src/Content/Conversation.php:342 +#: mod/editpost.php:105 src/Content/Conversation.php:354 msgid "Clear browser location" msgstr "" -#: mod/editpost.php:106 src/Content/Conversation.php:343 +#: mod/editpost.php:106 src/Content/Conversation.php:355 msgid "clear location" msgstr "" #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 -#: mod/photos.php:1495 mod/wallmessage.php:142 src/Content/Conversation.php:355 -#: src/Content/Conversation.php:699 src/Module/Item/Compose.php:165 +#: mod/photos.php:1495 mod/wallmessage.php:142 src/Content/Conversation.php:368 +#: src/Content/Conversation.php:712 src/Module/Item/Compose.php:177 #: src/Object/Post.php:522 msgid "Please wait" msgstr "" -#: mod/editpost.php:108 src/Content/Conversation.php:356 +#: mod/editpost.php:108 src/Content/Conversation.php:369 msgid "Permission settings" msgstr "" @@ -241,17 +241,17 @@ msgstr "" msgid "CC: email addresses" msgstr "" -#: mod/editpost.php:117 src/Content/Conversation.php:366 +#: mod/editpost.php:117 src/Content/Conversation.php:379 msgid "Public post" msgstr "" -#: mod/editpost.php:120 src/Content/Conversation.php:345 -#: src/Module/Item/Compose.php:166 +#: mod/editpost.php:120 src/Content/Conversation.php:357 +#: src/Module/Item/Compose.php:178 msgid "Set title" msgstr "" -#: mod/editpost.php:122 src/Content/Conversation.php:347 -#: src/Module/Item/Compose.php:167 +#: mod/editpost.php:122 src/Content/Conversation.php:359 +#: src/Module/Item/Compose.php:179 msgid "Categories (comma-separated list)" msgstr "" @@ -259,75 +259,75 @@ msgstr "" msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: mod/editpost.php:128 mod/events.php:517 mod/photos.php:1343 -#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:370 -#: src/Module/Item/Compose.php:160 src/Object/Post.php:998 +#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1343 +#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:383 +#: src/Module/Item/Compose.php:172 src/Object/Post.php:998 msgid "Preview" msgstr "" -#: mod/editpost.php:130 mod/fbrowser.php:117 mod/fbrowser.php:144 +#: mod/editpost.php:130 mod/fbrowser.php:118 mod/fbrowser.php:145 #: mod/follow.php:144 mod/photos.php:1010 mod/photos.php:1111 mod/tagrm.php:35 -#: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:373 +#: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:386 #: src/Module/Contact/Revoke.php:108 src/Module/RemoteFollow.php:127 msgid "Cancel" msgstr "" -#: mod/editpost.php:134 src/Content/Conversation.php:331 -#: src/Module/Item/Compose.php:151 src/Object/Post.php:989 +#: mod/editpost.php:134 src/Content/Conversation.php:343 +#: src/Module/Item/Compose.php:163 src/Object/Post.php:989 msgid "Bold" msgstr "" -#: mod/editpost.php:135 src/Content/Conversation.php:332 -#: src/Module/Item/Compose.php:152 src/Object/Post.php:990 +#: mod/editpost.php:135 src/Content/Conversation.php:344 +#: src/Module/Item/Compose.php:164 src/Object/Post.php:990 msgid "Italic" msgstr "" -#: mod/editpost.php:136 src/Content/Conversation.php:333 -#: src/Module/Item/Compose.php:153 src/Object/Post.php:991 +#: mod/editpost.php:136 src/Content/Conversation.php:345 +#: src/Module/Item/Compose.php:165 src/Object/Post.php:991 msgid "Underline" msgstr "" -#: mod/editpost.php:137 src/Content/Conversation.php:334 -#: src/Module/Item/Compose.php:154 src/Object/Post.php:992 +#: mod/editpost.php:137 src/Content/Conversation.php:346 +#: src/Module/Item/Compose.php:166 src/Object/Post.php:992 msgid "Quote" msgstr "" -#: mod/editpost.php:138 src/Content/Conversation.php:335 -#: src/Module/Item/Compose.php:155 src/Object/Post.php:993 +#: mod/editpost.php:138 src/Content/Conversation.php:347 +#: src/Module/Item/Compose.php:167 src/Object/Post.php:993 msgid "Code" msgstr "" -#: mod/editpost.php:139 src/Content/Conversation.php:337 -#: src/Module/Item/Compose.php:157 src/Object/Post.php:995 +#: mod/editpost.php:139 src/Content/Conversation.php:349 +#: src/Module/Item/Compose.php:169 src/Object/Post.php:995 msgid "Link" msgstr "" -#: mod/editpost.php:140 src/Content/Conversation.php:338 -#: src/Module/Item/Compose.php:158 src/Object/Post.php:996 +#: mod/editpost.php:140 src/Content/Conversation.php:350 +#: src/Module/Item/Compose.php:170 src/Object/Post.php:996 msgid "Link or Media" msgstr "" -#: mod/editpost.php:143 src/Content/Conversation.php:380 +#: mod/editpost.php:143 src/Content/Conversation.php:393 #: src/Content/Widget/VCard.php:107 src/Model/Profile.php:462 #: src/Module/Admin/Logs/View.php:93 msgid "Message" msgstr "" -#: mod/editpost.php:144 src/Content/Conversation.php:381 +#: mod/editpost.php:144 src/Content/Conversation.php:394 #: src/Module/Settings/TwoFactor/Trusted.php:137 msgid "Browser" msgstr "" -#: mod/editpost.php:145 mod/events.php:522 mod/photos.php:945 -#: mod/photos.php:1297 src/Content/Conversation.php:357 +#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:945 +#: mod/photos.php:1297 src/Content/Conversation.php:370 msgid "Permissions" msgstr "" -#: mod/editpost.php:147 src/Content/Conversation.php:383 +#: mod/editpost.php:147 src/Content/Conversation.php:396 msgid "Open Compose page" msgstr "" -#: mod/events.php:123 mod/events.php:125 +#: mod/events.php:124 mod/events.php:126 msgid "Event can not end before it has started." msgstr "" @@ -335,23 +335,23 @@ msgstr "" msgid "Event title and start time are required." msgstr "" -#: mod/events.php:379 +#: mod/events.php:376 msgid "Create New Event" msgstr "" -#: mod/events.php:478 src/Module/Admin/Logs/View.php:97 +#: mod/events.php:474 src/Module/Admin/Logs/View.php:97 msgid "Event details" msgstr "" -#: mod/events.php:479 +#: mod/events.php:475 msgid "Starting date and Title are required." msgstr "" -#: mod/events.php:480 mod/events.php:485 +#: mod/events.php:476 mod/events.php:481 msgid "Event Starts:" msgstr "" -#: mod/events.php:480 mod/events.php:510 +#: mod/events.php:476 mod/events.php:506 #: src/Module/Admin/Blocklist/Server/Add.php:104 #: src/Module/Admin/Blocklist/Server/Add.php:106 #: src/Module/Admin/Blocklist/Server/Index.php:68 @@ -370,20 +370,20 @@ msgstr "" msgid "Required" msgstr "" -#: mod/events.php:493 mod/events.php:516 +#: mod/events.php:489 mod/events.php:512 msgid "Finish date/time is not known or not relevant" msgstr "" -#: mod/events.php:495 mod/events.php:500 +#: mod/events.php:491 mod/events.php:496 msgid "Event Finishes:" msgstr "" -#: mod/events.php:506 src/Module/Profile/Profile.php:172 +#: mod/events.php:502 src/Module/Profile/Profile.php:172 #: src/Module/Settings/Profile/Index.php:238 msgid "Description:" msgstr "" -#: mod/events.php:508 src/Content/Widget/VCard.php:98 src/Model/Event.php:80 +#: mod/events.php:504 src/Content/Widget/VCard.php:98 src/Model/Event.php:80 #: src/Model/Event.php:107 src/Model/Event.php:466 src/Model/Event.php:915 #: src/Model/Profile.php:370 src/Module/Contact/Profile.php:369 #: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:185 @@ -391,15 +391,15 @@ msgstr "" msgid "Location:" msgstr "" -#: mod/events.php:510 mod/events.php:512 +#: mod/events.php:506 mod/events.php:508 msgid "Title:" msgstr "" -#: mod/events.php:513 mod/events.php:514 +#: mod/events.php:509 mod/events.php:510 msgid "Share this event" msgstr "" -#: mod/events.php:519 mod/message.php:201 mod/message.php:357 +#: mod/events.php:515 mod/message.php:201 mod/message.php:357 #: mod/photos.php:927 mod/photos.php:1031 mod/photos.php:1301 #: mod/photos.php:1342 mod/photos.php:1398 mod/photos.php:1472 #: src/Module/Admin/Item/Source.php:65 src/Module/Contact/Advanced.php:132 @@ -410,37 +410,37 @@ msgstr "" #: src/Module/Delegation.php:148 src/Module/FriendSuggest.php:144 #: src/Module/Install.php:252 src/Module/Install.php:294 #: src/Module/Install.php:331 src/Module/Invite.php:177 -#: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:247 +#: src/Module/Item/Compose.php:162 src/Module/Profile/Profile.php:247 #: src/Module/Settings/Profile/Index.php:222 src/Object/Post.php:987 #: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:119 msgid "Submit" msgstr "" -#: mod/events.php:520 src/Module/Profile/Profile.php:248 +#: mod/events.php:516 src/Module/Profile/Profile.php:248 msgid "Basic" msgstr "" -#: mod/events.php:521 src/Module/Admin/Site.php:506 src/Module/Contact.php:474 +#: mod/events.php:517 src/Module/Admin/Site.php:506 src/Module/Contact.php:474 #: src/Module/Profile/Profile.php:249 msgid "Advanced" msgstr "" -#: mod/events.php:538 +#: mod/events.php:534 msgid "Failed to remove event" msgstr "" -#: mod/fbrowser.php:60 src/Content/Nav.php:192 src/Module/BaseProfile.php:64 +#: mod/fbrowser.php:61 src/Content/Nav.php:192 src/Module/BaseProfile.php:64 #: view/theme/frio/theme.php:227 msgid "Photos" msgstr "" -#: mod/fbrowser.php:119 mod/fbrowser.php:146 +#: mod/fbrowser.php:120 mod/fbrowser.php:147 #: src/Module/Settings/Profile/Photo/Index.php:129 msgid "Upload" msgstr "" -#: mod/fbrowser.php:141 +#: mod/fbrowser.php:142 msgid "Files" msgstr "" @@ -510,27 +510,27 @@ msgstr "" msgid "The contact could not be added." msgstr "" -#: mod/item.php:134 mod/item.php:138 +#: mod/item.php:131 mod/item.php:135 msgid "Unable to locate original post." msgstr "" -#: mod/item.php:340 mod/item.php:345 +#: mod/item.php:337 mod/item.php:342 msgid "Empty post discarded." msgstr "" -#: mod/item.php:689 +#: mod/item.php:686 msgid "Post updated." msgstr "" -#: mod/item.php:699 mod/item.php:704 +#: mod/item.php:696 mod/item.php:701 msgid "Item wasn't stored." msgstr "" -#: mod/item.php:715 +#: mod/item.php:712 msgid "Item couldn't be fetched." msgstr "" -#: mod/item.php:855 src/Module/Admin/Themes/Details.php:39 +#: mod/item.php:852 src/Module/Admin/Themes/Details.php:39 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:41 #: src/Module/Debug/ItemBody.php:56 msgid "Item not found." @@ -809,51 +809,51 @@ msgstr "" msgid "Personal notes are visible only by yourself." msgstr "" -#: mod/ostatus_subscribe.php:39 +#: mod/ostatus_subscribe.php:38 msgid "Subscribing to contacts" msgstr "" -#: mod/ostatus_subscribe.php:49 +#: mod/ostatus_subscribe.php:48 msgid "No contact provided." msgstr "" -#: mod/ostatus_subscribe.php:55 +#: mod/ostatus_subscribe.php:54 msgid "Couldn't fetch information for contact." msgstr "" -#: mod/ostatus_subscribe.php:66 +#: mod/ostatus_subscribe.php:65 msgid "Couldn't fetch friends for contact." msgstr "" -#: mod/ostatus_subscribe.php:72 mod/ostatus_subscribe.php:83 +#: mod/ostatus_subscribe.php:71 mod/ostatus_subscribe.php:82 msgid "Couldn't fetch following contacts." msgstr "" -#: mod/ostatus_subscribe.php:78 +#: mod/ostatus_subscribe.php:77 msgid "Couldn't fetch remote profile." msgstr "" -#: mod/ostatus_subscribe.php:88 +#: mod/ostatus_subscribe.php:87 msgid "Unsupported network" msgstr "" -#: mod/ostatus_subscribe.php:104 mod/repair_ostatus.php:51 +#: mod/ostatus_subscribe.php:103 mod/repair_ostatus.php:51 msgid "Done" msgstr "" -#: mod/ostatus_subscribe.php:118 +#: mod/ostatus_subscribe.php:117 msgid "success" msgstr "" -#: mod/ostatus_subscribe.php:120 +#: mod/ostatus_subscribe.php:119 msgid "failed" msgstr "" -#: mod/ostatus_subscribe.php:123 +#: mod/ostatus_subscribe.php:122 msgid "ignored" msgstr "" -#: mod/ostatus_subscribe.php:128 mod/repair_ostatus.php:57 +#: mod/ostatus_subscribe.php:127 mod/repair_ostatus.php:57 msgid "Keep this window open until done." msgstr "" @@ -903,7 +903,7 @@ msgid "%1$s was tagged in %2$s by %3$s" msgstr "" #: mod/photos.php:642 mod/photos.php:645 mod/photos.php:672 -#: mod/wall_upload.php:204 src/Module/Settings/Profile/Photo/Index.php:60 +#: mod/wall_upload.php:201 src/Module/Settings/Profile/Photo/Index.php:60 #, php-format msgid "Image exceeds size limit of %s" msgstr "" @@ -926,12 +926,12 @@ msgstr "" msgid "Image file is empty." msgstr "" -#: mod/photos.php:695 mod/wall_upload.php:166 +#: mod/photos.php:695 mod/wall_upload.php:163 #: src/Module/Settings/Profile/Photo/Index.php:69 msgid "Unable to process image." msgstr "" -#: mod/photos.php:721 mod/wall_upload.php:229 +#: mod/photos.php:721 mod/wall_upload.php:226 #: src/Module/Settings/Profile/Photo/Index.php:96 msgid "Image upload failed." msgstr "" @@ -1065,7 +1065,7 @@ msgid "Rotate CCW (left)" msgstr "" #: mod/photos.php:1339 mod/photos.php:1395 mod/photos.php:1469 -#: src/Module/Contact.php:544 src/Module/Item/Compose.php:148 +#: src/Module/Contact.php:544 src/Module/Item/Compose.php:160 #: src/Object/Post.php:984 msgid "This is you" msgstr "" @@ -1075,11 +1075,11 @@ msgstr "" msgid "Comment" msgstr "" -#: mod/photos.php:1430 src/Content/Conversation.php:615 src/Object/Post.php:247 +#: mod/photos.php:1430 src/Content/Conversation.php:628 src/Object/Post.php:247 msgid "Select" msgstr "" -#: mod/photos.php:1431 mod/settings.php:624 src/Content/Conversation.php:616 +#: mod/photos.php:1431 mod/settings.php:624 src/Content/Conversation.php:629 #: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 #: src/Module/Admin/Users/Index.php:153 msgid "Delete" @@ -2045,30 +2045,30 @@ msgstr "" msgid "Unable to unfollow this contact, please contact your administrator" msgstr "" -#: mod/wall_attach.php:39 mod/wall_attach.php:46 mod/wall_attach.php:77 -#: mod/wall_upload.php:53 mod/wall_upload.php:63 mod/wall_upload.php:99 -#: mod/wall_upload.php:150 mod/wall_upload.php:153 +#: mod/wall_attach.php:40 mod/wall_attach.php:46 mod/wall_attach.php:75 +#: mod/wall_upload.php:54 mod/wall_upload.php:63 mod/wall_upload.php:97 +#: mod/wall_upload.php:148 mod/wall_upload.php:150 msgid "Invalid request." msgstr "" -#: mod/wall_attach.php:95 +#: mod/wall_attach.php:93 msgid "Sorry, maybe your upload is bigger than the PHP configuration allows" msgstr "" -#: mod/wall_attach.php:95 +#: mod/wall_attach.php:93 msgid "Or - did you try to upload an empty file?" msgstr "" -#: mod/wall_attach.php:106 +#: mod/wall_attach.php:104 #, php-format msgid "File exceeds size limit of %s" msgstr "" -#: mod/wall_attach.php:121 +#: mod/wall_attach.php:119 msgid "File upload failed." msgstr "" -#: mod/wall_upload.php:221 src/Model/Photo.php:1053 +#: mod/wall_upload.php:218 src/Model/Photo.php:1052 msgid "Wall Photos" msgstr "" @@ -2100,17 +2100,17 @@ msgstr "" msgid "Apologies but the website is unavailable at the moment." msgstr "" -#: src/App/Page.php:250 +#: src/App/Page.php:252 msgid "Delete this item?" msgstr "" -#: src/App/Page.php:251 +#: src/App/Page.php:253 msgid "" "Block this author? They won't be able to follow you nor see your public " "posts, and you won't be able to see their posts and their notifications." msgstr "" -#: src/App/Page.php:321 +#: src/App/Page.php:323 msgid "toggle mobile" msgstr "" @@ -2391,7 +2391,7 @@ msgid "%s attends maybe." msgstr "" #: src/Content/Conversation.php:222 src/Content/Conversation.php:260 -#: src/Content/Conversation.php:858 +#: src/Content/Conversation.php:871 #, php-format msgid "%s reshared this." msgstr "" @@ -2464,7 +2464,7 @@ msgstr "" msgid "Visible to everybody" msgstr "" -#: src/Content/Conversation.php:308 src/Module/Item/Compose.php:159 +#: src/Content/Conversation.php:308 src/Module/Item/Compose.php:171 #: src/Object/Post.php:997 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" @@ -2485,113 +2485,117 @@ msgstr "" msgid "Delete item(s)?" msgstr "" -#: src/Content/Conversation.php:322 +#: src/Content/Conversation.php:324 src/Module/Item/Compose.php:143 +msgid "Created at" +msgstr "" + +#: src/Content/Conversation.php:334 msgid "New Post" msgstr "" -#: src/Content/Conversation.php:325 src/Object/Post.php:499 +#: src/Content/Conversation.php:337 src/Object/Post.php:499 msgid "Share" msgstr "" -#: src/Content/Conversation.php:336 src/Module/Item/Compose.php:156 +#: src/Content/Conversation.php:348 src/Module/Item/Compose.php:168 #: src/Object/Post.php:994 msgid "Image" msgstr "" -#: src/Content/Conversation.php:339 +#: src/Content/Conversation.php:351 msgid "Video" msgstr "" -#: src/Content/Conversation.php:352 src/Module/Item/Compose.php:172 +#: src/Content/Conversation.php:364 src/Module/Item/Compose.php:184 msgid "Scheduled at" msgstr "" -#: src/Content/Conversation.php:643 src/Object/Post.php:235 +#: src/Content/Conversation.php:656 src/Object/Post.php:235 msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:659 src/Object/Post.php:470 +#: src/Content/Conversation.php:672 src/Object/Post.php:470 #: src/Object/Post.php:471 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:672 src/Object/Post.php:458 +#: src/Content/Conversation.php:685 src/Object/Post.php:458 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:673 src/Object/Post.php:459 +#: src/Content/Conversation.php:686 src/Object/Post.php:459 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:681 src/Object/Post.php:484 +#: src/Content/Conversation.php:694 src/Object/Post.php:484 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:697 +#: src/Content/Conversation.php:710 msgid "View in context" msgstr "" -#: src/Content/Conversation.php:762 +#: src/Content/Conversation.php:775 msgid "remove" msgstr "" -#: src/Content/Conversation.php:766 +#: src/Content/Conversation.php:779 msgid "Delete Selected Items" msgstr "" -#: src/Content/Conversation.php:830 src/Content/Conversation.php:833 -#: src/Content/Conversation.php:836 src/Content/Conversation.php:839 +#: src/Content/Conversation.php:843 src/Content/Conversation.php:846 +#: src/Content/Conversation.php:849 src/Content/Conversation.php:852 #, php-format msgid "You had been addressed (%s)." msgstr "" -#: src/Content/Conversation.php:842 +#: src/Content/Conversation.php:855 #, php-format msgid "You are following %s." msgstr "" -#: src/Content/Conversation.php:845 +#: src/Content/Conversation.php:858 msgid "Tagged" msgstr "" -#: src/Content/Conversation.php:860 +#: src/Content/Conversation.php:873 msgid "Reshared" msgstr "" -#: src/Content/Conversation.php:860 +#: src/Content/Conversation.php:873 #, php-format msgid "Reshared by %s <%s>" msgstr "" -#: src/Content/Conversation.php:863 +#: src/Content/Conversation.php:876 #, php-format msgid "%s is participating in this thread." msgstr "" -#: src/Content/Conversation.php:866 +#: src/Content/Conversation.php:879 msgid "Stored" msgstr "" -#: src/Content/Conversation.php:869 +#: src/Content/Conversation.php:882 msgid "Global" msgstr "" -#: src/Content/Conversation.php:872 +#: src/Content/Conversation.php:885 msgid "Relayed" msgstr "" -#: src/Content/Conversation.php:872 +#: src/Content/Conversation.php:885 #, php-format msgid "Relayed by %s <%s>" msgstr "" -#: src/Content/Conversation.php:875 +#: src/Content/Conversation.php:888 msgid "Fetched" msgstr "" -#: src/Content/Conversation.php:875 +#: src/Content/Conversation.php:888 #, php-format msgid "Fetched because of %s <%s>" msgstr "" @@ -3224,7 +3228,7 @@ msgstr "" msgid "Organisations" msgstr "" -#: src/Content/Widget.php:519 src/Model/Contact.php:1510 +#: src/Content/Widget.php:519 src/Model/Contact.php:1514 msgid "News" msgstr "" @@ -4058,71 +4062,71 @@ msgstr "" msgid "Approve" msgstr "" -#: src/Model/Contact.php:1506 +#: src/Model/Contact.php:1510 msgid "Organisation" msgstr "" -#: src/Model/Contact.php:1514 +#: src/Model/Contact.php:1518 msgid "Forum" msgstr "" -#: src/Model/Contact.php:2453 +#: src/Model/Contact.php:2457 msgid "Disallowed profile URL." msgstr "" -#: src/Model/Contact.php:2458 src/Module/Friendica.php:81 +#: src/Model/Contact.php:2462 src/Module/Friendica.php:81 msgid "Blocked domain" msgstr "" -#: src/Model/Contact.php:2463 +#: src/Model/Contact.php:2467 msgid "Connect URL missing." msgstr "" -#: src/Model/Contact.php:2472 +#: src/Model/Contact.php:2476 msgid "" "The contact could not be added. Please check the relevant network " "credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:2509 +#: src/Model/Contact.php:2513 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:2511 +#: src/Model/Contact.php:2515 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:2514 +#: src/Model/Contact.php:2518 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:2517 +#: src/Model/Contact.php:2521 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:2520 +#: src/Model/Contact.php:2524 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "" -#: src/Model/Contact.php:2521 +#: src/Model/Contact.php:2525 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:2527 +#: src/Model/Contact.php:2531 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: src/Model/Contact.php:2532 +#: src/Model/Contact.php:2536 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: src/Model/Contact.php:2591 +#: src/Model/Contact.php:2595 msgid "Unable to retrieve contact information." msgstr "" @@ -4376,7 +4380,7 @@ msgstr "" msgid "Title/Description:" msgstr "" -#: src/Model/Profile.php:996 src/Module/Admin/Summary.php:235 +#: src/Model/Profile.php:996 src/Module/Admin/Summary.php:234 msgid "Summary" msgstr "" @@ -4416,142 +4420,142 @@ msgstr "" msgid "Contact information and Social Networks" msgstr "" -#: src/Model/User.php:210 src/Model/User.php:1058 +#: src/Model/User.php:209 src/Model/User.php:1057 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "" -#: src/Model/User.php:570 src/Model/User.php:603 +#: src/Model/User.php:569 src/Model/User.php:602 msgid "Login failed" msgstr "" -#: src/Model/User.php:635 +#: src/Model/User.php:634 msgid "Not enough information to authenticate" msgstr "" -#: src/Model/User.php:730 +#: src/Model/User.php:729 msgid "Password can't be empty" msgstr "" -#: src/Model/User.php:749 +#: src/Model/User.php:748 msgid "Empty passwords are not allowed." msgstr "" -#: src/Model/User.php:753 +#: src/Model/User.php:752 msgid "" "The new password has been exposed in a public data dump, please choose " "another." msgstr "" -#: src/Model/User.php:759 +#: src/Model/User.php:758 msgid "" "The password can't contain accentuated letters, white spaces or colons (:)" msgstr "" -#: src/Model/User.php:938 +#: src/Model/User.php:937 msgid "Passwords do not match. Password unchanged." msgstr "" -#: src/Model/User.php:945 +#: src/Model/User.php:944 msgid "An invitation is required." msgstr "" -#: src/Model/User.php:949 +#: src/Model/User.php:948 msgid "Invitation could not be verified." msgstr "" -#: src/Model/User.php:957 +#: src/Model/User.php:956 msgid "Invalid OpenID url" msgstr "" -#: src/Model/User.php:970 src/Security/Authentication.php:235 +#: src/Model/User.php:969 src/Security/Authentication.php:235 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -#: src/Model/User.php:970 src/Security/Authentication.php:235 +#: src/Model/User.php:969 src/Security/Authentication.php:235 msgid "The error message was:" msgstr "" -#: src/Model/User.php:976 +#: src/Model/User.php:975 msgid "Please enter the required information." msgstr "" -#: src/Model/User.php:990 +#: src/Model/User.php:989 #, php-format msgid "" "system.username_min_length (%s) and system.username_max_length (%s) are " "excluding each other, swapping values." msgstr "" -#: src/Model/User.php:997 +#: src/Model/User.php:996 #, php-format msgid "Username should be at least %s character." msgid_plural "Username should be at least %s characters." msgstr[0] "" msgstr[1] "" -#: src/Model/User.php:1001 +#: src/Model/User.php:1000 #, php-format msgid "Username should be at most %s character." msgid_plural "Username should be at most %s characters." msgstr[0] "" msgstr[1] "" -#: src/Model/User.php:1009 +#: src/Model/User.php:1008 msgid "That doesn't appear to be your full (First Last) name." msgstr "" -#: src/Model/User.php:1014 +#: src/Model/User.php:1013 msgid "Your email domain is not among those allowed on this site." msgstr "" -#: src/Model/User.php:1018 +#: src/Model/User.php:1017 msgid "Not a valid email address." msgstr "" -#: src/Model/User.php:1021 +#: src/Model/User.php:1020 msgid "The nickname was blocked from registration by the nodes admin." msgstr "" -#: src/Model/User.php:1025 src/Model/User.php:1033 +#: src/Model/User.php:1024 src/Model/User.php:1032 msgid "Cannot use that email." msgstr "" -#: src/Model/User.php:1040 +#: src/Model/User.php:1039 msgid "Your nickname can only contain a-z, 0-9 and _." msgstr "" -#: src/Model/User.php:1048 src/Model/User.php:1105 +#: src/Model/User.php:1047 src/Model/User.php:1104 msgid "Nickname is already registered. Please choose another." msgstr "" -#: src/Model/User.php:1092 src/Model/User.php:1096 +#: src/Model/User.php:1091 src/Model/User.php:1095 msgid "An error occurred during registration. Please try again." msgstr "" -#: src/Model/User.php:1119 +#: src/Model/User.php:1118 msgid "An error occurred creating your default profile. Please try again." msgstr "" -#: src/Model/User.php:1126 +#: src/Model/User.php:1125 msgid "An error occurred creating your self contact. Please try again." msgstr "" -#: src/Model/User.php:1131 +#: src/Model/User.php:1130 msgid "Friends" msgstr "" -#: src/Model/User.php:1135 +#: src/Model/User.php:1134 msgid "" "An error occurred creating your default contact group. Please try again." msgstr "" -#: src/Model/User.php:1174 +#: src/Model/User.php:1173 msgid "Profile Photos" msgstr "" -#: src/Model/User.php:1368 +#: src/Model/User.php:1367 #, php-format msgid "" "\n" @@ -4559,7 +4563,7 @@ msgid "" "\t\t\tthe administrator of %2$s has set up an account for you." msgstr "" -#: src/Model/User.php:1371 +#: src/Model/User.php:1370 #, php-format msgid "" "\n" @@ -4596,12 +4600,12 @@ msgid "" "\t\tThank you and welcome to %4$s." msgstr "" -#: src/Model/User.php:1404 src/Model/User.php:1511 +#: src/Model/User.php:1403 src/Model/User.php:1510 #, php-format msgid "Registration details for %s" msgstr "" -#: src/Model/User.php:1424 +#: src/Model/User.php:1423 #, php-format msgid "" "\n" @@ -4617,12 +4621,12 @@ msgid "" "\t\t" msgstr "" -#: src/Model/User.php:1443 +#: src/Model/User.php:1442 #, php-format msgid "Registration at %s" msgstr "" -#: src/Model/User.php:1467 +#: src/Model/User.php:1466 #, php-format msgid "" "\n" @@ -4631,7 +4635,7 @@ msgid "" "\t\t\t" msgstr "" -#: src/Model/User.php:1475 +#: src/Model/User.php:1474 #, php-format msgid "" "\n" @@ -4698,10 +4702,10 @@ msgstr "" #: src/Module/Admin/Blocklist/Contact.php:94 #: src/Module/Admin/Blocklist/Server/Add.php:89 #: src/Module/Admin/Blocklist/Server/Index.php:78 -#: src/Module/Admin/Federation.php:194 src/Module/Admin/Item/Delete.php:64 +#: src/Module/Admin/Federation.php:195 src/Module/Admin/Item/Delete.php:64 #: src/Module/Admin/Logs/Settings.php:79 src/Module/Admin/Logs/View.php:84 #: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:498 -#: src/Module/Admin/Storage.php:138 src/Module/Admin/Summary.php:234 +#: src/Module/Admin/Storage.php:138 src/Module/Admin/Summary.php:233 #: src/Module/Admin/Themes/Details.php:90 src/Module/Admin/Themes/Index.php:111 #: src/Module/Admin/Tos.php:75 src/Module/Admin/Users/Active.php:136 #: src/Module/Admin/Users/Blocked.php:137 src/Module/Admin/Users/Create.php:61 @@ -5108,61 +5112,61 @@ msgstr "" msgid "Manage Additional Features" msgstr "" -#: src/Module/Admin/Federation.php:63 +#: src/Module/Admin/Federation.php:64 msgid "Other" msgstr "" -#: src/Module/Admin/Federation.php:134 src/Module/Admin/Federation.php:383 +#: src/Module/Admin/Federation.php:135 src/Module/Admin/Federation.php:384 msgid "unknown" msgstr "" -#: src/Module/Admin/Federation.php:167 -#, php-format -msgid "%s total systems" -msgstr "" - #: src/Module/Admin/Federation.php:168 #, php-format -msgid "%s active users last month" +msgid "%s total systems" msgstr "" #: src/Module/Admin/Federation.php:169 #, php-format -msgid "%s active users last six months" +msgid "%s active users last month" msgstr "" #: src/Module/Admin/Federation.php:170 #, php-format -msgid "%s registered users" +msgid "%s active users last six months" msgstr "" #: src/Module/Admin/Federation.php:171 #, php-format +msgid "%s registered users" +msgstr "" + +#: src/Module/Admin/Federation.php:172 +#, php-format msgid "%s locally created posts and comments" msgstr "" -#: src/Module/Admin/Federation.php:174 +#: src/Module/Admin/Federation.php:175 #, php-format msgid "%s posts per user" msgstr "" -#: src/Module/Admin/Federation.php:179 +#: src/Module/Admin/Federation.php:180 #, php-format msgid "%s users per system" msgstr "" -#: src/Module/Admin/Federation.php:189 +#: src/Module/Admin/Federation.php:190 msgid "" "This page offers you some numbers to the known part of the federated social " "network your Friendica node is part of. These numbers are not complete but " "only reflect the part of the network your node is aware of." msgstr "" -#: src/Module/Admin/Federation.php:195 src/Module/BaseAdmin.php:87 +#: src/Module/Admin/Federation.php:196 src/Module/BaseAdmin.php:87 msgid "Federation Statistics" msgstr "" -#: src/Module/Admin/Federation.php:199 +#: src/Module/Admin/Federation.php:200 #, php-format msgid "" "Currently this node is aware of %s nodes (%s active users last month, %s " @@ -6392,12 +6396,12 @@ msgstr "" msgid "Database (legacy)" msgstr "" -#: src/Module/Admin/Summary.php:55 +#: src/Module/Admin/Summary.php:54 #, php-format msgid "Template engine (%s) error: %s" msgstr "" -#: src/Module/Admin/Summary.php:59 +#: src/Module/Admin/Summary.php:58 #, php-format msgid "" "Your DB still runs with MyISAM tables. You should change the engine type to " @@ -6408,7 +6412,7 @@ msgid "" "automatic conversion.
" msgstr "" -#: src/Module/Admin/Summary.php:64 +#: src/Module/Admin/Summary.php:63 #, php-format msgid "" "Your DB still runs with InnoDB tables in the Antelope file format. You " @@ -6419,7 +6423,7 @@ msgid "" "installation for an automatic conversion.
" msgstr "" -#: src/Module/Admin/Summary.php:74 +#: src/Module/Admin/Summary.php:73 #, php-format msgid "" "Your table_definition_cache is too low (%d). This can lead to the database " @@ -6427,39 +6431,39 @@ msgid "" "to %d. See here for more information.
" msgstr "" -#: src/Module/Admin/Summary.php:84 +#: src/Module/Admin/Summary.php:83 #, php-format msgid "" "There is a new version of Friendica available for download. Your current " "version is %1$s, upstream version is %2$s" msgstr "" -#: src/Module/Admin/Summary.php:93 +#: src/Module/Admin/Summary.php:92 msgid "" "The database update failed. Please run \"php bin/console.php dbstructure " "update\" from the command line and have a look at the errors that might " "appear." msgstr "" -#: src/Module/Admin/Summary.php:97 +#: src/Module/Admin/Summary.php:96 msgid "" "The last update failed. Please run \"php bin/console.php dbstructure update" "\" from the command line and have a look at the errors that might appear. " "(Some of the errors are possibly inside the logfile.)" msgstr "" -#: src/Module/Admin/Summary.php:102 +#: src/Module/Admin/Summary.php:101 msgid "The worker was never executed. Please check your database structure!" msgstr "" -#: src/Module/Admin/Summary.php:104 +#: src/Module/Admin/Summary.php:103 #, php-format msgid "" "The last worker execution was on %s UTC. This is older than one hour. Please " "check your crontab settings." msgstr "" -#: src/Module/Admin/Summary.php:109 +#: src/Module/Admin/Summary.php:108 #, php-format msgid "" "Friendica's configuration now is stored in config/local.config.php, please " @@ -6468,7 +6472,7 @@ msgid "" "with the transition." msgstr "" -#: src/Module/Admin/Summary.php:113 +#: src/Module/Admin/Summary.php:112 #, php-format msgid "" "Friendica's configuration now is stored in config/local.config.php, please " @@ -6477,7 +6481,7 @@ msgid "" "with the transition." msgstr "" -#: src/Module/Admin/Summary.php:119 +#: src/Module/Admin/Summary.php:118 #, php-format msgid "" "%s is not reachable on your system. This is a severe " @@ -6485,82 +6489,82 @@ msgid "" "href=\"%s\">the installation page for help." msgstr "" -#: src/Module/Admin/Summary.php:137 +#: src/Module/Admin/Summary.php:136 #, php-format msgid "The logfile '%s' is not usable. No logging possible (error: '%s')" msgstr "" -#: src/Module/Admin/Summary.php:151 +#: src/Module/Admin/Summary.php:150 #, php-format msgid "The debug logfile '%s' is not usable. No logging possible (error: '%s')" msgstr "" -#: src/Module/Admin/Summary.php:167 +#: src/Module/Admin/Summary.php:166 #, php-format msgid "" "Friendica's system.basepath was updated from '%s' to '%s'. Please remove the " "system.basepath from your db to avoid differences." msgstr "" -#: src/Module/Admin/Summary.php:175 +#: src/Module/Admin/Summary.php:174 #, php-format msgid "" "Friendica's current system.basepath '%s' is wrong and the config file '%s' " "isn't used." msgstr "" -#: src/Module/Admin/Summary.php:183 +#: src/Module/Admin/Summary.php:182 #, php-format msgid "" "Friendica's current system.basepath '%s' is not equal to the config file " "'%s'. Please fix your configuration." msgstr "" -#: src/Module/Admin/Summary.php:190 +#: src/Module/Admin/Summary.php:189 msgid "Normal Account" msgstr "" -#: src/Module/Admin/Summary.php:191 +#: src/Module/Admin/Summary.php:190 msgid "Automatic Follower Account" msgstr "" -#: src/Module/Admin/Summary.php:192 +#: src/Module/Admin/Summary.php:191 msgid "Public Forum Account" msgstr "" -#: src/Module/Admin/Summary.php:193 +#: src/Module/Admin/Summary.php:192 msgid "Automatic Friend Account" msgstr "" -#: src/Module/Admin/Summary.php:194 +#: src/Module/Admin/Summary.php:193 msgid "Blog Account" msgstr "" -#: src/Module/Admin/Summary.php:195 +#: src/Module/Admin/Summary.php:194 msgid "Private Forum Account" msgstr "" -#: src/Module/Admin/Summary.php:215 +#: src/Module/Admin/Summary.php:214 msgid "Message queues" msgstr "" -#: src/Module/Admin/Summary.php:221 +#: src/Module/Admin/Summary.php:220 msgid "Server Settings" msgstr "" -#: src/Module/Admin/Summary.php:237 +#: src/Module/Admin/Summary.php:236 msgid "Registered users" msgstr "" -#: src/Module/Admin/Summary.php:239 +#: src/Module/Admin/Summary.php:238 msgid "Pending registrations" msgstr "" -#: src/Module/Admin/Summary.php:240 +#: src/Module/Admin/Summary.php:239 msgid "Version" msgstr "" -#: src/Module/Admin/Summary.php:244 +#: src/Module/Admin/Summary.php:243 msgid "Active addons" msgstr "" @@ -7271,7 +7275,7 @@ msgstr[1] "" msgid "Error while sending poke, please retry." msgstr "" -#: src/Module/Contact/Poke.php:148 src/Module/Search/Acl.php:54 +#: src/Module/Contact/Poke.php:148 src/Module/Search/Acl.php:55 msgid "You must be logged in to use this module." msgstr "" @@ -8389,19 +8393,19 @@ msgstr "" msgid "Compose new post" msgstr "" -#: src/Module/Item/Compose.php:141 +#: src/Module/Item/Compose.php:153 msgid "Visibility" msgstr "" -#: src/Module/Item/Compose.php:162 +#: src/Module/Item/Compose.php:174 msgid "Clear the location" msgstr "" -#: src/Module/Item/Compose.php:163 +#: src/Module/Item/Compose.php:175 msgid "Location services are unavailable on your device" msgstr "" -#: src/Module/Item/Compose.php:164 +#: src/Module/Item/Compose.php:176 msgid "" "Location services are disabled. Please check the website's permissions on " "your device" @@ -8673,19 +8677,19 @@ msgstr "" #: src/Module/Profile/Profile.php:326 src/Module/Profile/Profile.php:329 #: src/Module/Profile/Status.php:66 src/Module/Profile/Status.php:69 -#: src/Protocol/Feed.php:1017 src/Protocol/OStatus.php:1246 +#: src/Protocol/Feed.php:1017 src/Protocol/OStatus.php:1245 #, php-format msgid "%s's timeline" msgstr "" #: src/Module/Profile/Profile.php:327 src/Module/Profile/Status.php:67 -#: src/Protocol/Feed.php:1021 src/Protocol/OStatus.php:1250 +#: src/Protocol/Feed.php:1021 src/Protocol/OStatus.php:1249 #, php-format msgid "%s's posts" msgstr "" #: src/Module/Profile/Profile.php:328 src/Module/Profile/Status.php:68 -#: src/Protocol/Feed.php:1024 src/Protocol/OStatus.php:1253 +#: src/Protocol/Feed.php:1024 src/Protocol/OStatus.php:1252 #, php-format msgid "%s's comments" msgstr "" @@ -10615,21 +10619,21 @@ msgstr "" msgid "Show fewer" msgstr "" -#: src/Protocol/OStatus.php:1649 +#: src/Protocol/OStatus.php:1648 #, php-format msgid "%s is now following %s." msgstr "" -#: src/Protocol/OStatus.php:1650 +#: src/Protocol/OStatus.php:1649 msgid "following" msgstr "" -#: src/Protocol/OStatus.php:1653 +#: src/Protocol/OStatus.php:1652 #, php-format msgid "%s stopped following %s." msgstr "" -#: src/Protocol/OStatus.php:1654 +#: src/Protocol/OStatus.php:1653 msgid "stopped following" msgstr "" diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl index 7837036b4e..cbab655d2c 100644 --- a/view/templates/item/compose.tpl +++ b/view/templates/item/compose.tpl @@ -83,6 +83,7 @@ {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}} + {{if $created_at}}{{$created_at nofilter}}{{/if}} {{else}} diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl index 2a5df64065..6b86186b0a 100644 --- a/view/templates/jot.tpl +++ b/view/templates/jot.tpl @@ -80,6 +80,7 @@
{{$acl nofilter}} {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}} + {{if $created_at}}{{$created_at nofilter}}{{/if}}
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl index 5ef8a7b6e4..0f878d4c53 100644 --- a/view/theme/frio/templates/jot.tpl +++ b/view/theme/frio/templates/jot.tpl @@ -134,6 +134,7 @@ diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl index ba6bf52686..8823fb8b45 100644 --- a/view/theme/quattro/templates/jot.tpl +++ b/view/theme/quattro/templates/jot.tpl @@ -48,6 +48,7 @@
{{$acl nofilter}} {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}} + {{if $created_at}}{{$created_at nofilter}}{{/if}}
diff --git a/view/theme/smoothly/templates/jot.tpl b/view/theme/smoothly/templates/jot.tpl index 38f003908c..74c9d0523a 100644 --- a/view/theme/smoothly/templates/jot.tpl +++ b/view/theme/smoothly/templates/jot.tpl @@ -72,6 +72,7 @@ {{$acl nofilter}} {{$jotnets nofilter}} {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}} + {{if $created_at}}{{$created_at nofilter}}{{/if}}