diff --git a/src/App.php b/src/App.php index 5c85c9f26d..3ef9bdb4ed 100644 --- a/src/App.php +++ b/src/App.php @@ -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'); diff --git a/src/Model/Event.php b/src/Model/Event.php index ef2b55b68c..b569624243 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -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)); diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 30293b755f..d71fea26ff 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -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 \n" "Language-Team: LANGUAGE \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 ""