Merge pull request #8134 from nupplaphil/task/di_l10n

[friendica.git] / src / Content / Widget / CalendarExport.php

diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index 829d267d8fd5ea9ee5668efade3a72cef6fdd936..693be2d6f033c127c1a748cdcf4f05883cac3fd0 100644 (file)
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -7,8 +7,8 @@
 namespace Friendica\Content\Widget;
 
 use Friendica\Content\Feature;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 /**
  * TagCloud widget
@@ -18,13 +18,13 @@ use Friendica\Core\Renderer;
 class CalendarExport
 {
        /**
-        * @brief Get the events widget.
+        * Get the events widget.
         *
         * @return string Formated HTML of the calendar widget.
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function getHTML() {
-               $a = \get_app();
+               $a = DI::app();
 
                if (empty($a->data['user'])) {
                        return;
@@ -57,13 +57,13 @@ class CalendarExport
 
                // $a->data is only available if the profile page is visited. If the visited page is not part
                // of the profile page it should be the personal /events page. So we can use $a->user.
-               $user = defaults($a->data['user'], 'nickname', $a->user['nickname']);
+               $user = ($a->data['user']['nickname'] ?? '') ?: $a->user['nickname'];
 
                $tpl = Renderer::getMarkupTemplate("widget/events.tpl");
                $return = Renderer::replaceMacros($tpl, [
-                       '$etitle'      => L10n::t("Export"),
-                       '$export_ical' => L10n::t("Export calendar as ical"),
-                       '$export_csv'  => L10n::t("Export calendar as csv"),
+                       '$etitle'      => DI::l10n()->t("Export"),
+                       '$export_ical' => DI::l10n()->t("Export calendar as ical"),
+                       '$export_csv'  => DI::l10n()->t("Export calendar as csv"),
                        '$user'        => $user
                ]);