friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #10917 from MrPetovan/bug/10914-event-feed-time 

Add event timezone in Model\Event::getHTML
This commit is contained in:
Michael Vogel 2021-10-25 06:33:20 +02:00 committed by GitHub
parent 3921bd06cb c1edfa2478
commit 5dc283ba8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.php
View File

@ -631,7 +631,9 @@ class App
Model\Profile::openWebAuthInit($token);
}
$auth->withSession($this);
if (!$this->mode->isBackend()) {
$auth->withSession($this);
}
if (empty($_SESSION['authenticated'])) {
header('X-Account-Management-Status: none');

2
src/Model/Event.php
View File

@ -49,7 +49,7 @@ class Event
$uriid = $event['uri-id'] ?? $uriid;
$bd_format = DI::l10n()->t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8 AM.
$bd_format = DI::l10n()->t('l F d, Y \@ g:i A \G\M\TP (e)'); // Friday October 29, 2021 @ 9:15 AM GMT-04:00 (America/New_York)
$event_start = DI::l10n()->getDay(DateTimeFormat::local($event['start'], $bd_format));

19
view/lang/C/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2021.12-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-23 21:51-0400\n"
"POT-Creation-Date: 2021-10-24 23:21-0400\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"
@ -4124,9 +4124,8 @@ msgstr ""
msgid "Unable to retrieve contact information."
msgstr ""
#: src/Model/Event.php:52 src/Model/Event.php:853
#: src/Module/Debug/Localtime.php:38
msgid "l F d, Y \\@ g:i A"
#: src/Model/Event.php:52
msgid "l F d, Y \\@ g:i A \\G\\M\\TP (e)"
msgstr ""
#: src/Model/Event.php:73 src/Model/Event.php:90 src/Model/Event.php:464
@ -4167,6 +4166,10 @@ msgstr ""
msgid "Delete event"
msgstr ""
#: src/Model/Event.php:853 src/Module/Debug/Localtime.php:38
msgid "l F d, Y \\@ g:i A"
msgstr ""
#: src/Model/Event.php:854
msgid "D g:i A"
msgstr ""
@ -8505,21 +8508,21 @@ msgstr ""
msgid "Visible to:"
msgstr ""
#: src/Module/Photo.php:122
#: src/Module/Photo.php:123
msgid "The Photo is not available."
msgstr ""
#: src/Module/Photo.php:135
#: src/Module/Photo.php:136
#, php-format
msgid "The Photo with id %s is not available."
msgstr ""
#: src/Module/Photo.php:168
#: src/Module/Photo.php:169
#, php-format
msgid "Invalid external resource with url %s."
msgstr ""
#: src/Module/Photo.php:170
#: src/Module/Photo.php:171
#, php-format
msgid "Invalid photo with id %s."
msgstr ""