X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FEvent.php;h=dc818d8f15715055392137f5151ed2e7b78fd88e;hb=a8402109b183e81dad4e5443883dd292df094b86;hp=06d391745da3cc760a97363c7256384cf6ee2571;hpb=2f3f41ed9cdb4229d78bdf2f91b0617403a8dd62;p=friendica.git

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 06d391745d..dc818d8f15 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -198,7 +198,7 @@ class Event
 
 	public static function sortByDate(array $event_list): array
 	{
-		usort($event_list, ['self', 'compareDatesCallback']);
+		usort($event_list, [self::class, 'compareDatesCallback']);
 		return $event_list;
 	}
 
@@ -412,66 +412,66 @@ class Event
 	public static function getStrings(): array
 	{
 		// First day of the week (0 = Sunday).
-		$firstDay = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'first_day_of_week', 0);
-
-		$i18n = [
-			"firstDay" => $firstDay,
-			"allday"   => DI::l10n()->t("all-day"),
-
-			"Sun" => DI::l10n()->t("Sun"),
-			"Mon" => DI::l10n()->t("Mon"),
-			"Tue" => DI::l10n()->t("Tue"),
-			"Wed" => DI::l10n()->t("Wed"),
-			"Thu" => DI::l10n()->t("Thu"),
-			"Fri" => DI::l10n()->t("Fri"),
-			"Sat" => DI::l10n()->t("Sat"),
-
-			"Sunday"    => DI::l10n()->t("Sunday"),
-			"Monday"    => DI::l10n()->t("Monday"),
-			"Tuesday"   => DI::l10n()->t("Tuesday"),
-			"Wednesday" => DI::l10n()->t("Wednesday"),
-			"Thursday"  => DI::l10n()->t("Thursday"),
-			"Friday"    => DI::l10n()->t("Friday"),
-			"Saturday"  => DI::l10n()->t("Saturday"),
-
-			"Jan" => DI::l10n()->t("Jan"),
-			"Feb" => DI::l10n()->t("Feb"),
-			"Mar" => DI::l10n()->t("Mar"),
-			"Apr" => DI::l10n()->t("Apr"),
-			"May" => DI::l10n()->t("May"),
-			"Jun" => DI::l10n()->t("Jun"),
-			"Jul" => DI::l10n()->t("Jul"),
-			"Aug" => DI::l10n()->t("Aug"),
-			"Sep" => DI::l10n()->t("Sept"),
-			"Oct" => DI::l10n()->t("Oct"),
-			"Nov" => DI::l10n()->t("Nov"),
-			"Dec" => DI::l10n()->t("Dec"),
-
-			"January"   => DI::l10n()->t("January"),
-			"February"  => DI::l10n()->t("February"),
-			"March"     => DI::l10n()->t("March"),
-			"April"     => DI::l10n()->t("April"),
-			"June"      => DI::l10n()->t("June"),
-			"July"      => DI::l10n()->t("July"),
-			"August"    => DI::l10n()->t("August"),
-			"September" => DI::l10n()->t("September"),
-			"October"   => DI::l10n()->t("October"),
-			"November"  => DI::l10n()->t("November"),
-			"December"  => DI::l10n()->t("December"),
-
-			"today" => DI::l10n()->t("today"),
-			"month" => DI::l10n()->t("month"),
-			"week"  => DI::l10n()->t("week"),
-			"day"   => DI::l10n()->t("day"),
-
-			"noevent" => DI::l10n()->t("No events to display"),
-
-			"dtstart_label"  => DI::l10n()->t("Starts:"),
-			"dtend_label"    => DI::l10n()->t("Finishes:"),
-			"location_label" => DI::l10n()->t("Location:")
-		];
+		$firstDay    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'calendar', 'first_day_of_week') ?? 0;
+		$defaultView = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'calendar', 'defaultView') ?? 'month';
 
-		return $i18n;
+		return [
+			'firstDay'    => $firstDay,
+			'defaultView' => $defaultView,
+			'allday'      => DI::l10n()->t('all-day'),
+
+			'Sun' => DI::l10n()->t('Sun'),
+			'Mon' => DI::l10n()->t('Mon'),
+			'Tue' => DI::l10n()->t('Tue'),
+			'Wed' => DI::l10n()->t('Wed'),
+			'Thu' => DI::l10n()->t('Thu'),
+			'Fri' => DI::l10n()->t('Fri'),
+			'Sat' => DI::l10n()->t('Sat'),
+
+			'Sunday'    => DI::l10n()->t('Sunday'),
+			'Monday'    => DI::l10n()->t('Monday'),
+			'Tuesday'   => DI::l10n()->t('Tuesday'),
+			'Wednesday' => DI::l10n()->t('Wednesday'),
+			'Thursday'  => DI::l10n()->t('Thursday'),
+			'Friday'    => DI::l10n()->t('Friday'),
+			'Saturday'  => DI::l10n()->t('Saturday'),
+
+			'Jan' => DI::l10n()->t('Jan'),
+			'Feb' => DI::l10n()->t('Feb'),
+			'Mar' => DI::l10n()->t('Mar'),
+			'Apr' => DI::l10n()->t('Apr'),
+			'May' => DI::l10n()->t('May'),
+			'Jun' => DI::l10n()->t('Jun'),
+			'Jul' => DI::l10n()->t('Jul'),
+			'Aug' => DI::l10n()->t('Aug'),
+			'Sep' => DI::l10n()->t('Sept'),
+			'Oct' => DI::l10n()->t('Oct'),
+			'Nov' => DI::l10n()->t('Nov'),
+			'Dec' => DI::l10n()->t('Dec'),
+
+			'January'   => DI::l10n()->t('January'),
+			'February'  => DI::l10n()->t('February'),
+			'March'     => DI::l10n()->t('March'),
+			'April'     => DI::l10n()->t('April'),
+			'June'      => DI::l10n()->t('June'),
+			'July'      => DI::l10n()->t('July'),
+			'August'    => DI::l10n()->t('August'),
+			'September' => DI::l10n()->t('September'),
+			'October'   => DI::l10n()->t('October'),
+			'November'  => DI::l10n()->t('November'),
+			'December'  => DI::l10n()->t('December'),
+
+			'today' => DI::l10n()->t('today'),
+			'month' => DI::l10n()->t('month'),
+			'week'  => DI::l10n()->t('week'),
+			'day'   => DI::l10n()->t('day'),
+
+			'noevent' => DI::l10n()->t('No events to display'),
+
+			'dtstart_label'  => DI::l10n()->t('Starts:'),
+			'dtend_label'    => DI::l10n()->t('Finishes:'),
+			'location_label' => DI::l10n()->t('Location:')
+		];
 	}
 
 	/**
@@ -656,7 +656,7 @@ class Event
 		}
 
 		// Show edit and drop actions only if the user is the owner of the event and the event
-		// is a real event (no bithdays).
+		// is a real event (no birthdays).
 		$edit = null;
 		$copy = null;
 		$drop = null;