bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12359 from matthiasmoritz/calendar_default_view

Browse source 
Calendar default view
This commit is contained in:
Philipp 2022-12-17 19:05:57 +01:00 committed by GitHub
commit d25fc9de9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 251 additions and 419 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2022.12-rc (Giant Rhubarb) -- Friendica 2022.12-rc (Giant Rhubarb)
-- DB_UPDATE_VERSION 1501 -- DB_UPDATE_VERSION 1502
-- ------------------------------------------ -- ------------------------------------------

102
src/Model/Event.php
View file

@ -412,66 +412,66 @@ class Event
public static function getStrings(): array public static function getStrings(): array
{ {
// First day of the week (0 = Sunday). // First day of the week (0 = Sunday).
$firstDay = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'first_day_of_week', 0); $firstDay = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'calendar', 'first_day_of_week') ?? 0;
$defaultView = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'calendar', 'defaultView') ?? 'month';
$i18n = [ return [
"firstDay" => $firstDay, 'firstDay' => $firstDay,
"allday" => DI::l10n()->t("all-day"), 'defaultView' => $defaultView,
'allday' => DI::l10n()->t('all-day'),
"Sun" => DI::l10n()->t("Sun"), 'Sun' => DI::l10n()->t('Sun'),
"Mon" => DI::l10n()->t("Mon"), 'Mon' => DI::l10n()->t('Mon'),
"Tue" => DI::l10n()->t("Tue"), 'Tue' => DI::l10n()->t('Tue'),
"Wed" => DI::l10n()->t("Wed"), 'Wed' => DI::l10n()->t('Wed'),
"Thu" => DI::l10n()->t("Thu"), 'Thu' => DI::l10n()->t('Thu'),
"Fri" => DI::l10n()->t("Fri"), 'Fri' => DI::l10n()->t('Fri'),
"Sat" => DI::l10n()->t("Sat"), 'Sat' => DI::l10n()->t('Sat'),
"Sunday" => DI::l10n()->t("Sunday"), 'Sunday' => DI::l10n()->t('Sunday'),
"Monday" => DI::l10n()->t("Monday"), 'Monday' => DI::l10n()->t('Monday'),
"Tuesday" => DI::l10n()->t("Tuesday"), 'Tuesday' => DI::l10n()->t('Tuesday'),
"Wednesday" => DI::l10n()->t("Wednesday"), 'Wednesday' => DI::l10n()->t('Wednesday'),
"Thursday" => DI::l10n()->t("Thursday"), 'Thursday' => DI::l10n()->t('Thursday'),
"Friday" => DI::l10n()->t("Friday"), 'Friday' => DI::l10n()->t('Friday'),
"Saturday" => DI::l10n()->t("Saturday"), 'Saturday' => DI::l10n()->t('Saturday'),
"Jan" => DI::l10n()->t("Jan"), 'Jan' => DI::l10n()->t('Jan'),
"Feb" => DI::l10n()->t("Feb"), 'Feb' => DI::l10n()->t('Feb'),
"Mar" => DI::l10n()->t("Mar"), 'Mar' => DI::l10n()->t('Mar'),
"Apr" => DI::l10n()->t("Apr"), 'Apr' => DI::l10n()->t('Apr'),
"May" => DI::l10n()->t("May"), 'May' => DI::l10n()->t('May'),
"Jun" => DI::l10n()->t("Jun"), 'Jun' => DI::l10n()->t('Jun'),
"Jul" => DI::l10n()->t("Jul"), 'Jul' => DI::l10n()->t('Jul'),
"Aug" => DI::l10n()->t("Aug"), 'Aug' => DI::l10n()->t('Aug'),
"Sep" => DI::l10n()->t("Sept"), 'Sep' => DI::l10n()->t('Sept'),
"Oct" => DI::l10n()->t("Oct"), 'Oct' => DI::l10n()->t('Oct'),
"Nov" => DI::l10n()->t("Nov"), 'Nov' => DI::l10n()->t('Nov'),
"Dec" => DI::l10n()->t("Dec"), 'Dec' => DI::l10n()->t('Dec'),
"January" => DI::l10n()->t("January"), 'January' => DI::l10n()->t('January'),
"February" => DI::l10n()->t("February"), 'February' => DI::l10n()->t('February'),
"March" => DI::l10n()->t("March"), 'March' => DI::l10n()->t('March'),
"April" => DI::l10n()->t("April"), 'April' => DI::l10n()->t('April'),
"June" => DI::l10n()->t("June"), 'June' => DI::l10n()->t('June'),
"July" => DI::l10n()->t("July"), 'July' => DI::l10n()->t('July'),
"August" => DI::l10n()->t("August"), 'August' => DI::l10n()->t('August'),
"September" => DI::l10n()->t("September"), 'September' => DI::l10n()->t('September'),
"October" => DI::l10n()->t("October"), 'October' => DI::l10n()->t('October'),
"November" => DI::l10n()->t("November"), 'November' => DI::l10n()->t('November'),
"December" => DI::l10n()->t("December"), 'December' => DI::l10n()->t('December'),
"today" => DI::l10n()->t("today"), 'today' => DI::l10n()->t('today'),
"month" => DI::l10n()->t("month"), 'month' => DI::l10n()->t('month'),
"week" => DI::l10n()->t("week"), 'week' => DI::l10n()->t('week'),
"day" => DI::l10n()->t("day"), 'day' => DI::l10n()->t('day'),
"noevent" => DI::l10n()->t("No events to display"), 'noevent' => DI::l10n()->t('No events to display'),
"dtstart_label" => DI::l10n()->t("Starts:"), 'dtstart_label' => DI::l10n()->t('Starts:'),
"dtend_label" => DI::l10n()->t("Finishes:"), 'dtend_label' => DI::l10n()->t('Finishes:'),
"location_label" => DI::l10n()->t("Location:") 'location_label' => DI::l10n()->t('Location:')
]; ];
return $i18n;
} }
/** /**

16
src/Module/Settings/Display.php
View file

@ -51,6 +51,7 @@ class Display extends BaseSettings
$mobile_theme = !empty($_POST['mobile_theme']) ? trim($_POST['mobile_theme']) : ''; $mobile_theme = !empty($_POST['mobile_theme']) ? trim($_POST['mobile_theme']) : '';
$enable_smile = !empty($_POST['enable_smile']) ? intval($_POST['enable_smile']) : 0; $enable_smile = !empty($_POST['enable_smile']) ? intval($_POST['enable_smile']) : 0;
$first_day_of_week = !empty($_POST['first_day_of_week']) ? intval($_POST['first_day_of_week']) : 0; $first_day_of_week = !empty($_POST['first_day_of_week']) ? intval($_POST['first_day_of_week']) : 0;
$calendar_default_view = !empty($_POST['calendar_default_view']) ? trim($_POST['calendar_default_view']): 'month';
$infinite_scroll = !empty($_POST['infinite_scroll']) ? intval($_POST['infinite_scroll']) : 0; $infinite_scroll = !empty($_POST['infinite_scroll']) ? intval($_POST['infinite_scroll']) : 0;
$no_auto_update = !empty($_POST['no_auto_update']) ? intval($_POST['no_auto_update']) : 0; $no_auto_update = !empty($_POST['no_auto_update']) ? intval($_POST['no_auto_update']) : 0;
$enable_smart_threading = !empty($_POST['enable_smart_threading']) ? intval($_POST['enable_smart_threading']) : 0; $enable_smart_threading = !empty($_POST['enable_smart_threading']) ? intval($_POST['enable_smart_threading']) : 0;
@ -93,9 +94,11 @@ class Display extends BaseSettings
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'hide_dislike' , !$enable_dislike); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'hide_dislike' , !$enable_dislike);
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'display_resharer' , $display_resharer); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'display_resharer' , $display_resharer);
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'stay_local' , $stay_local); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'stay_local' , $stay_local);
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'first_day_of_week' , $first_day_of_week);
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'preview_mode' , $preview_mode); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'preview_mode' , $preview_mode);
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'calendar', 'first_day_of_week' , $first_day_of_week);
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'calendar', 'default_view' , $calendar_default_view);
if (in_array($theme, Theme::getAllowedList())) { if (in_array($theme, Theme::getAllowedList())) {
if ($theme == $user['theme']) { if ($theme == $user['theme']) {
// call theme_post only if theme has not been changed // call theme_post only if theme has not been changed
@ -199,6 +202,14 @@ class Display extends BaseSettings
BBCode::PREVIEW_LARGE => DI::l10n()->t('Large Image'), BBCode::PREVIEW_LARGE => DI::l10n()->t('Large Image'),
]; ];
$calendar_default_view = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'calendar', 'default_view', 'month');
$calendarViews = [
'month' => DI::l10n()->t('month'),
'agendaWeek' => DI::l10n()->t('week'),
'agendaDay' => DI::l10n()->t('day'),
'listMonth' => DI::l10n()->t('list')
];
$theme_config = ''; $theme_config = '';
if ($themeconfigfile = Theme::getConfigFile($theme_selected)) { if ($themeconfigfile = Theme::getConfigFile($theme_selected)) {
require_once $themeconfigfile; require_once $themeconfigfile;
@ -235,7 +246,8 @@ class Display extends BaseSettings
'$stay_local' => ['stay_local' , DI::l10n()->t('Stay local'), $stay_local, DI::l10n()->t("Don't go to a remote system when following a contact link.")], '$stay_local' => ['stay_local' , DI::l10n()->t('Stay local'), $stay_local, DI::l10n()->t("Don't go to a remote system when following a contact link.")],
'$preview_mode' => ['preview_mode' , DI::l10n()->t('Link preview mode'), $preview_mode, 'Appearance of the link preview that is added to each post with a link.', $preview_modes, false], '$preview_mode' => ['preview_mode' , DI::l10n()->t('Link preview mode'), $preview_mode, 'Appearance of the link preview that is added to each post with a link.', $preview_modes, false],
'$first_day_of_week' => ['first_day_of_week', DI::l10n()->t('Beginning of week:'), $first_day_of_week, '', $weekdays, false], '$first_day_of_week' => ['first_day_of_week' , DI::l10n()->t('Beginning of week:') , $first_day_of_week , '', $weekdays , false],
'$calendar_default_view' => ['calendar_default_view', DI::l10n()->t('Default calendar view:'), $calendar_default_view, '', $calendarViews, false],
]); ]);
return $o; return $o;

2
static/dbstructure.config.php
View file

@ -55,7 +55,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1501); define('DB_UPDATE_VERSION', 1502);
} }
return [ return [

8
update.php
View file

@ -1138,4 +1138,10 @@ function update_1497()
{ {
DBA::e("UPDATE `user` SET `last-activity` = DATE(`login_date`) WHERE `last-activity` IS NULL"); DBA::e("UPDATE `user` SET `last-activity` = DATE(`login_date`) WHERE `last-activity` IS NULL");
return Update::SUCCESS; return Update::SUCCESS;
} }
function update_1502()
{
DBA::e("UPDATE `pconfig` SET `cat` = 'calendar' WHERE `k` = 'first_day_of_week'");
return Update::SUCCESS;
}

276
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2022.12-rc\n" "Project-Id-Version: 2022.12-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-14 21:56-0500\n" "POT-Creation-Date: 2022-12-17 02:18-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -27,7 +27,7 @@ msgstr ""
#: src/Model/Event.php:522 src/Module/Attach.php:55 src/Module/BaseApi.php:94 #: src/Model/Event.php:522 src/Module/Attach.php:55 src/Module/BaseApi.php:94
#: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52
#: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84 #: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84
#: src/Module/Calendar/Export.php:62 src/Module/Calendar/Show.php:81 #: src/Module/Calendar/Export.php:62 src/Module/Calendar/Show.php:82
#: src/Module/Contact/Advanced.php:60 src/Module/Contact/Follow.php:86 #: src/Module/Contact/Advanced.php:60 src/Module/Contact/Follow.php:86
#: src/Module/Contact/Follow.php:160 src/Module/Contact/MatchInterests.php:86 #: src/Module/Contact/Follow.php:160 src/Module/Contact/MatchInterests.php:86
#: src/Module/Contact/Suggestions.php:54 src/Module/Contact/Unfollow.php:66 #: src/Module/Contact/Suggestions.php:54 src/Module/Contact/Unfollow.php:66
@ -47,7 +47,7 @@ msgstr ""
#: src/Module/Register.php:245 src/Module/Search/Directory.php:37 #: src/Module/Register.php:245 src/Module/Search/Directory.php:37
#: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:407 #: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:407
#: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:69 #: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:69
#: src/Module/Settings/Display.php:43 src/Module/Settings/Display.php:123 #: src/Module/Settings/Display.php:43 src/Module/Settings/Display.php:126
#: src/Module/Settings/Profile/Photo/Crop.php:165 #: src/Module/Settings/Profile/Photo/Crop.php:165
#: src/Module/Settings/Profile/Photo/Index.php:111 #: src/Module/Settings/Profile/Photo/Index.php:111
#: src/Module/Settings/RemoveMe.php:117 src/Module/Settings/UserExport.php:80 #: src/Module/Settings/RemoveMe.php:117 src/Module/Settings/UserExport.php:80
@ -245,7 +245,7 @@ msgstr ""
msgid "Discard" msgid "Discard"
msgstr "" msgstr ""
#: mod/message.php:136 src/Content/Nav.php:282 view/theme/frio/theme.php:247 #: mod/message.php:136 src/Content/Nav.php:282 view/theme/frio/theme.php:248
msgid "Messages" msgid "Messages"
msgstr "" msgstr ""
@ -385,7 +385,7 @@ msgstr ""
#: mod/photos.php:66 mod/photos.php:137 mod/photos.php:582 #: mod/photos.php:66 mod/photos.php:137 mod/photos.php:582
#: src/Model/Event.php:514 src/Model/Profile.php:234 #: src/Model/Event.php:514 src/Model/Profile.php:234
#: src/Module/Calendar/Export.php:67 src/Module/Calendar/Show.php:73 #: src/Module/Calendar/Export.php:67 src/Module/Calendar/Show.php:74
#: src/Module/DFRN/Poll.php:43 src/Module/Feed.php:65 src/Module/HCard.php:51 #: src/Module/DFRN/Poll.php:43 src/Module/Feed.php:65 src/Module/HCard.php:51
#: src/Module/Profile/Common.php:40 src/Module/Profile/Common.php:51 #: src/Module/Profile/Common.php:40 src/Module/Profile/Common.php:51
#: src/Module/Profile/Contacts.php:39 src/Module/Profile/Contacts.php:49 #: src/Module/Profile/Contacts.php:39 src/Module/Profile/Contacts.php:49
@ -649,11 +649,11 @@ msgstr ""
msgid "Map" msgid "Map"
msgstr "" msgstr ""
#: src/App.php:492 #: src/App.php:500
msgid "No system theme config value set." msgid "No system theme config value set."
msgstr "" msgstr ""
#: src/App.php:613 #: src/App.php:621
msgid "Apologies but the website is unavailable at the moment." msgid "Apologies but the website is unavailable at the moment."
msgstr "" msgstr ""
@ -1535,7 +1535,7 @@ msgstr ""
msgid "%1$s tagged %2$s's %3$s with %4$s" msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr "" msgstr ""
#: src/Content/Item.php:386 view/theme/frio/theme.php:268 #: src/Content/Item.php:386 view/theme/frio/theme.php:269
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
@ -1628,54 +1628,54 @@ msgstr ""
#: src/Content/Nav.php:193 src/Module/BaseProfile.php:57 #: src/Content/Nav.php:193 src/Module/BaseProfile.php:57
#: src/Module/Contact.php:436 src/Module/Contact/Profile.php:380 #: src/Module/Contact.php:436 src/Module/Contact/Profile.php:380
#: src/Module/Settings/TwoFactor/Index.php:119 view/theme/frio/theme.php:235 #: src/Module/Settings/TwoFactor/Index.php:119 view/theme/frio/theme.php:236
msgid "Status" msgid "Status"
msgstr "" msgstr ""
#: src/Content/Nav.php:193 src/Content/Nav.php:272 #: src/Content/Nav.php:193 src/Content/Nav.php:272
#: view/theme/frio/theme.php:235 #: view/theme/frio/theme.php:236
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "" msgstr ""
#: src/Content/Nav.php:194 src/Module/BaseProfile.php:49 #: src/Content/Nav.php:194 src/Module/BaseProfile.php:49
#: src/Module/BaseSettings.php:100 src/Module/Contact.php:460 #: src/Module/BaseSettings.php:100 src/Module/Contact.php:460
#: src/Module/Contact/Profile.php:382 src/Module/Profile/Profile.php:233 #: src/Module/Contact/Profile.php:382 src/Module/Profile/Profile.php:233
#: src/Module/Welcome.php:57 view/theme/frio/theme.php:236 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:237
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
#: src/Content/Nav.php:194 view/theme/frio/theme.php:236 #: src/Content/Nav.php:194 view/theme/frio/theme.php:237
msgid "Your profile page" msgid "Your profile page"
msgstr "" msgstr ""
#: src/Content/Nav.php:195 src/Module/BaseProfile.php:65 #: src/Content/Nav.php:195 src/Module/BaseProfile.php:65
#: src/Module/Media/Photo/Browser.php:74 view/theme/frio/theme.php:240 #: src/Module/Media/Photo/Browser.php:74 view/theme/frio/theme.php:241
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
#: src/Content/Nav.php:195 view/theme/frio/theme.php:240 #: src/Content/Nav.php:195 view/theme/frio/theme.php:241
msgid "Your photos" msgid "Your photos"
msgstr "" msgstr ""
#: src/Content/Nav.php:196 src/Module/BaseProfile.php:73 #: src/Content/Nav.php:196 src/Module/BaseProfile.php:73
#: src/Module/BaseProfile.php:76 src/Module/Contact.php:452 #: src/Module/BaseProfile.php:76 src/Module/Contact.php:452
#: view/theme/frio/theme.php:241 #: view/theme/frio/theme.php:242
msgid "Media" msgid "Media"
msgstr "" msgstr ""
#: src/Content/Nav.php:196 view/theme/frio/theme.php:241 #: src/Content/Nav.php:196 view/theme/frio/theme.php:242
msgid "Your postings with media" msgid "Your postings with media"
msgstr "" msgstr ""
#: src/Content/Nav.php:197 src/Content/Nav.php:257 #: src/Content/Nav.php:197 src/Content/Nav.php:257
#: src/Module/BaseProfile.php:85 src/Module/BaseProfile.php:88 #: src/Module/BaseProfile.php:85 src/Module/BaseProfile.php:88
#: src/Module/BaseProfile.php:96 src/Module/BaseProfile.php:99 #: src/Module/BaseProfile.php:96 src/Module/BaseProfile.php:99
#: src/Module/Settings/Display.php:216 view/theme/frio/theme.php:242 #: src/Module/Settings/Display.php:227 view/theme/frio/theme.php:243
#: view/theme/frio/theme.php:246 #: view/theme/frio/theme.php:247
msgid "Calendar" msgid "Calendar"
msgstr "" msgstr ""
#: src/Content/Nav.php:197 view/theme/frio/theme.php:242 #: src/Content/Nav.php:197 view/theme/frio/theme.php:243
msgid "Your calendar" msgid "Your calendar"
msgstr "" msgstr ""
@ -1745,7 +1745,7 @@ msgstr ""
#: src/Content/Nav.php:238 src/Content/Nav.php:293 #: src/Content/Nav.php:238 src/Content/Nav.php:293
#: src/Content/Text/HTML.php:899 src/Module/BaseProfile.php:127 #: src/Content/Text/HTML.php:899 src/Module/BaseProfile.php:127
#: src/Module/BaseProfile.php:130 src/Module/Contact.php:373 #: src/Module/BaseProfile.php:130 src/Module/Contact.php:373
#: src/Module/Contact.php:467 view/theme/frio/theme.php:249 #: src/Module/Contact.php:467 view/theme/frio/theme.php:250
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -1784,11 +1784,11 @@ msgstr ""
msgid "Terms of Service of this Friendica instance" msgid "Terms of Service of this Friendica instance"
msgstr "" msgstr ""
#: src/Content/Nav.php:270 view/theme/frio/theme.php:245 #: src/Content/Nav.php:270 view/theme/frio/theme.php:246
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: src/Content/Nav.php:270 view/theme/frio/theme.php:245 #: src/Content/Nav.php:270 view/theme/frio/theme.php:246
msgid "Conversations from your friends" msgid "Conversations from your friends"
msgstr "" msgstr ""
@ -1817,7 +1817,7 @@ msgstr ""
msgid "Mark all system notifications as seen" msgid "Mark all system notifications as seen"
msgstr "" msgstr ""
#: src/Content/Nav.php:282 view/theme/frio/theme.php:247 #: src/Content/Nav.php:282 view/theme/frio/theme.php:248
msgid "Private mail" msgid "Private mail"
msgstr "" msgstr ""
@ -1839,15 +1839,15 @@ msgstr ""
#: src/Content/Nav.php:291 src/Module/Admin/Addons/Details.php:114 #: src/Content/Nav.php:291 src/Module/Admin/Addons/Details.php:114
#: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:170 #: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:170
#: src/Module/Welcome.php:52 view/theme/frio/theme.php:248 #: src/Module/Welcome.php:52 view/theme/frio/theme.php:249
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
#: src/Content/Nav.php:291 view/theme/frio/theme.php:248 #: src/Content/Nav.php:291 view/theme/frio/theme.php:249
msgid "Account settings" msgid "Account settings"
msgstr "" msgstr ""
#: src/Content/Nav.php:293 view/theme/frio/theme.php:249 #: src/Content/Nav.php:293 view/theme/frio/theme.php:250
msgid "Manage/edit friends and contacts" msgid "Manage/edit friends and contacts"
msgstr "" msgstr ""
@ -1920,8 +1920,8 @@ msgid ""
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s" "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1257 src/Model/Item.php:3688 #: src/Content/Text/BBCode.php:1257 src/Model/Item.php:3585
#: src/Model/Item.php:3694 src/Model/Item.php:3695 #: src/Model/Item.php:3591 src/Model/Item.php:3592
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
@ -2150,7 +2150,7 @@ msgid "Matrix:"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:104 src/Model/Event.php:82 #: src/Content/Widget/VCard.php:104 src/Model/Event.php:82
#: src/Model/Event.php:109 src/Model/Event.php:471 src/Model/Event.php:958 #: src/Model/Event.php:109 src/Model/Event.php:473 src/Model/Event.php:958
#: src/Model/Profile.php:373 src/Module/Contact/Profile.php:369 #: src/Model/Profile.php:373 src/Module/Contact/Profile.php:369
#: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187 #: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187
#: src/Module/Profile/Profile.php:186 #: src/Module/Profile/Profile.php:186
@ -2547,142 +2547,142 @@ msgstr ""
msgid "Could not connect to database." msgid "Could not connect to database."
msgstr "" msgstr ""
#: src/Core/L10n.php:403 src/Model/Event.php:430 #: src/Core/L10n.php:403 src/Model/Event.php:432
#: src/Module/Settings/Display.php:187 #: src/Module/Settings/Display.php:190
msgid "Monday" msgid "Monday"
msgstr "" msgstr ""
#: src/Core/L10n.php:403 src/Model/Event.php:431 #: src/Core/L10n.php:403 src/Model/Event.php:433
#: src/Module/Settings/Display.php:188 #: src/Module/Settings/Display.php:191
msgid "Tuesday" msgid "Tuesday"
msgstr "" msgstr ""
#: src/Core/L10n.php:403 src/Model/Event.php:432 #: src/Core/L10n.php:403 src/Model/Event.php:434
#: src/Module/Settings/Display.php:189 #: src/Module/Settings/Display.php:192
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
#: src/Core/L10n.php:403 src/Model/Event.php:433 #: src/Core/L10n.php:403 src/Model/Event.php:435
#: src/Module/Settings/Display.php:190 #: src/Module/Settings/Display.php:193
msgid "Thursday" msgid "Thursday"
msgstr "" msgstr ""
#: src/Core/L10n.php:403 src/Model/Event.php:434 #: src/Core/L10n.php:403 src/Model/Event.php:436
#: src/Module/Settings/Display.php:191 #: src/Module/Settings/Display.php:194
msgid "Friday" msgid "Friday"
msgstr "" msgstr ""
#: src/Core/L10n.php:403 src/Model/Event.php:435 #: src/Core/L10n.php:403 src/Model/Event.php:437
#: src/Module/Settings/Display.php:192 #: src/Module/Settings/Display.php:195
msgid "Saturday" msgid "Saturday"
msgstr "" msgstr ""
#: src/Core/L10n.php:403 src/Model/Event.php:429 #: src/Core/L10n.php:403 src/Model/Event.php:431
#: src/Module/Settings/Display.php:186 #: src/Module/Settings/Display.php:189
msgid "Sunday" msgid "Sunday"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:450 #: src/Core/L10n.php:407 src/Model/Event.php:452
msgid "January" msgid "January"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:451 #: src/Core/L10n.php:407 src/Model/Event.php:453
msgid "February" msgid "February"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:452 #: src/Core/L10n.php:407 src/Model/Event.php:454
msgid "March" msgid "March"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:453 #: src/Core/L10n.php:407 src/Model/Event.php:455
msgid "April" msgid "April"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Core/L10n.php:426 src/Model/Event.php:441 #: src/Core/L10n.php:407 src/Core/L10n.php:426 src/Model/Event.php:443
msgid "May" msgid "May"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:454 #: src/Core/L10n.php:407 src/Model/Event.php:456
msgid "June" msgid "June"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:455 #: src/Core/L10n.php:407 src/Model/Event.php:457
msgid "July" msgid "July"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:456 #: src/Core/L10n.php:407 src/Model/Event.php:458
msgid "August" msgid "August"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:457 #: src/Core/L10n.php:407 src/Model/Event.php:459
msgid "September" msgid "September"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:458 #: src/Core/L10n.php:407 src/Model/Event.php:460
msgid "October" msgid "October"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:459 #: src/Core/L10n.php:407 src/Model/Event.php:461
msgid "November" msgid "November"
msgstr "" msgstr ""
#: src/Core/L10n.php:407 src/Model/Event.php:460 #: src/Core/L10n.php:407 src/Model/Event.php:462
msgid "December" msgid "December"
msgstr "" msgstr ""
#: src/Core/L10n.php:422 src/Model/Event.php:422 #: src/Core/L10n.php:422 src/Model/Event.php:424
msgid "Mon" msgid "Mon"
msgstr "" msgstr ""
#: src/Core/L10n.php:422 src/Model/Event.php:423 #: src/Core/L10n.php:422 src/Model/Event.php:425
msgid "Tue" msgid "Tue"
msgstr "" msgstr ""
#: src/Core/L10n.php:422 src/Model/Event.php:424 #: src/Core/L10n.php:422 src/Model/Event.php:426
msgid "Wed" msgid "Wed"
msgstr "" msgstr ""
#: src/Core/L10n.php:422 src/Model/Event.php:425 #: src/Core/L10n.php:422 src/Model/Event.php:427
msgid "Thu" msgid "Thu"
msgstr "" msgstr ""
#: src/Core/L10n.php:422 src/Model/Event.php:426 #: src/Core/L10n.php:422 src/Model/Event.php:428
msgid "Fri" msgid "Fri"
msgstr "" msgstr ""
#: src/Core/L10n.php:422 src/Model/Event.php:427 #: src/Core/L10n.php:422 src/Model/Event.php:429
msgid "Sat" msgid "Sat"
msgstr "" msgstr ""
#: src/Core/L10n.php:422 src/Model/Event.php:421 #: src/Core/L10n.php:422 src/Model/Event.php:423
msgid "Sun" msgid "Sun"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:437 #: src/Core/L10n.php:426 src/Model/Event.php:439
msgid "Jan" msgid "Jan"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:438 #: src/Core/L10n.php:426 src/Model/Event.php:440
msgid "Feb" msgid "Feb"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:439 #: src/Core/L10n.php:426 src/Model/Event.php:441
msgid "Mar" msgid "Mar"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:440 #: src/Core/L10n.php:426 src/Model/Event.php:442
msgid "Apr" msgid "Apr"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:442 #: src/Core/L10n.php:426 src/Model/Event.php:444
msgid "Jun" msgid "Jun"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:443 #: src/Core/L10n.php:426 src/Model/Event.php:445
msgid "Jul" msgid "Jul"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:444 #: src/Core/L10n.php:426 src/Model/Event.php:446
msgid "Aug" msgid "Aug"
msgstr "" msgstr ""
@ -2690,15 +2690,15 @@ msgstr ""
msgid "Sep" msgid "Sep"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:446 #: src/Core/L10n.php:426 src/Model/Event.php:448
msgid "Oct" msgid "Oct"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:447 #: src/Core/L10n.php:426 src/Model/Event.php:449
msgid "Nov" msgid "Nov"
msgstr "" msgstr ""
#: src/Core/L10n.php:426 src/Model/Event.php:448 #: src/Core/L10n.php:426 src/Model/Event.php:450
msgid "Dec" msgid "Dec"
msgstr "" msgstr ""
@ -2835,7 +2835,7 @@ msgstr ""
msgid "%s: Database update" msgid "%s: Database update"
msgstr "" msgstr ""
#: src/Database/DBStructure.php:479 #: src/Database/DBStructure.php:480
#, php-format #, php-format
msgid "%s: updating %s table." msgid "%s: updating %s table."
msgstr "" msgstr ""
@ -2944,45 +2944,45 @@ msgstr ""
msgid "l F d, Y \\@ g:i A \\G\\M\\TP (e)" msgid "l F d, Y \\@ g:i A \\G\\M\\TP (e)"
msgstr "" msgstr ""
#: src/Model/Event.php:75 src/Model/Event.php:92 src/Model/Event.php:469 #: src/Model/Event.php:75 src/Model/Event.php:92 src/Model/Event.php:471
#: src/Model/Event.php:940 #: src/Model/Event.php:940
msgid "Starts:" msgid "Starts:"
msgstr "" msgstr ""
#: src/Model/Event.php:78 src/Model/Event.php:98 src/Model/Event.php:470 #: src/Model/Event.php:78 src/Model/Event.php:98 src/Model/Event.php:472
#: src/Model/Event.php:944 #: src/Model/Event.php:944
msgid "Finishes:" msgid "Finishes:"
msgstr "" msgstr ""
#: src/Model/Event.php:419 #: src/Model/Event.php:421
msgid "all-day" msgid "all-day"
msgstr "" msgstr ""
#: src/Model/Event.php:445 #: src/Model/Event.php:447
msgid "Sept" msgid "Sept"
msgstr "" msgstr ""
#: src/Model/Event.php:462 src/Module/Calendar/Show.php:126 #: src/Model/Event.php:464 src/Module/Calendar/Show.php:128
#: src/Util/Temporal.php:339 #: src/Util/Temporal.php:339
msgid "today" msgid "today"
msgstr "" msgstr ""
#: src/Model/Event.php:463 src/Module/Calendar/Show.php:127 #: src/Model/Event.php:465 src/Module/Calendar/Show.php:129
#: src/Util/Temporal.php:349 #: src/Module/Settings/Display.php:207 src/Util/Temporal.php:349
msgid "month" msgid "month"
msgstr "" msgstr ""
#: src/Model/Event.php:464 src/Module/Calendar/Show.php:128 #: src/Model/Event.php:466 src/Module/Calendar/Show.php:130
#: src/Util/Temporal.php:350 #: src/Module/Settings/Display.php:208 src/Util/Temporal.php:350
msgid "week" msgid "week"
msgstr "" msgstr ""
#: src/Model/Event.php:465 src/Module/Calendar/Show.php:129 #: src/Model/Event.php:467 src/Module/Calendar/Show.php:131
#: src/Util/Temporal.php:351 #: src/Module/Settings/Display.php:209 src/Util/Temporal.php:351
msgid "day" msgid "day"
msgstr "" msgstr ""
#: src/Model/Event.php:467 #: src/Model/Event.php:469
msgid "No events to display" msgid "No events to display"
msgstr "" msgstr ""
@ -3102,49 +3102,49 @@ msgstr ""
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:3077 #: src/Model/Item.php:3081
#, php-format #, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3600 #: src/Model/Item.php:3497
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3631 #: src/Model/Item.php:3528
#, php-format #, php-format
msgid "%2$s (%3$d%%, %1$d vote)" msgid "%2$s (%3$d%%, %1$d vote)"
msgid_plural "%2$s (%3$d%%, %1$d votes)" msgid_plural "%2$s (%3$d%%, %1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3633 #: src/Model/Item.php:3530
#, php-format #, php-format
msgid "%2$s (%1$d vote)" msgid "%2$s (%1$d vote)"
msgid_plural "%2$s (%1$d votes)" msgid_plural "%2$s (%1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3638 #: src/Model/Item.php:3535
#, php-format #, php-format
msgid "%d voter. Poll end: %s" msgid "%d voter. Poll end: %s"
msgid_plural "%d voters. Poll end: %s" msgid_plural "%d voters. Poll end: %s"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3640 #: src/Model/Item.php:3537
#, php-format #, php-format
msgid "%d voter." msgid "%d voter."
msgid_plural "%d voters." msgid_plural "%d voters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3642 #: src/Model/Item.php:3539
#, php-format #, php-format
msgid "Poll end: %s" msgid "Poll end: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3676 src/Model/Item.php:3677 #: src/Model/Item.php:3573 src/Model/Item.php:3574
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
@ -3630,7 +3630,7 @@ msgstr ""
#: src/Module/Settings/Account.php:560 src/Module/Settings/Addons.php:81 #: src/Module/Settings/Account.php:560 src/Module/Settings/Addons.php:81
#: src/Module/Settings/Connectors.php:159 #: src/Module/Settings/Connectors.php:159
#: src/Module/Settings/Connectors.php:244 #: src/Module/Settings/Connectors.php:244
#: src/Module/Settings/Delegation.php:169 src/Module/Settings/Display.php:211 #: src/Module/Settings/Delegation.php:169 src/Module/Settings/Display.php:222
#: src/Module/Settings/Features.php:76 #: src/Module/Settings/Features.php:76
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
@ -3982,11 +3982,11 @@ msgstr ""
msgid "%s is no valid input for maximum image size" msgid "%s is no valid input for maximum image size"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:342 src/Module/Settings/Display.php:141 #: src/Module/Admin/Site.php:342 src/Module/Settings/Display.php:144
msgid "No special theme for mobile devices" msgid "No special theme for mobile devices"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:359 src/Module/Settings/Display.php:151 #: src/Module/Admin/Site.php:359 src/Module/Settings/Display.php:154
#, php-format #, php-format
msgid "%s - (Experimental)" msgid "%s - (Experimental)"
msgstr "" msgstr ""
@ -5563,19 +5563,19 @@ msgstr ""
msgid "calendar" msgid "calendar"
msgstr "" msgstr ""
#: src/Module/Calendar/Show.php:122 #: src/Module/Calendar/Show.php:124
msgid "Events" msgid "Events"
msgstr "" msgstr ""
#: src/Module/Calendar/Show.php:123 #: src/Module/Calendar/Show.php:125
msgid "View" msgid "View"
msgstr "" msgstr ""
#: src/Module/Calendar/Show.php:124 #: src/Module/Calendar/Show.php:126
msgid "Create New Event" msgid "Create New Event"
msgstr "" msgstr ""
#: src/Module/Calendar/Show.php:130 #: src/Module/Calendar/Show.php:132 src/Module/Settings/Display.php:210
msgid "list" msgid "list"
msgstr "" msgstr ""
@ -9536,148 +9536,152 @@ msgstr ""
msgid "No entries." msgid "No entries."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:110 #: src/Module/Settings/Display.php:113
msgid "The theme you chose isn't available." msgid "The theme you chose isn't available."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:149 #: src/Module/Settings/Display.php:152
#, php-format #, php-format
msgid "%s - (Unsupported)" msgid "%s - (Unsupported)"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:196 #: src/Module/Settings/Display.php:199
msgid "No preview" msgid "No preview"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:197 #: src/Module/Settings/Display.php:200
msgid "No image" msgid "No image"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:198 #: src/Module/Settings/Display.php:201
msgid "Small Image" msgid "Small Image"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:199 #: src/Module/Settings/Display.php:202
msgid "Large Image" msgid "Large Image"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:210 #: src/Module/Settings/Display.php:221
msgid "Display Settings" msgid "Display Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:212 #: src/Module/Settings/Display.php:223
msgid "General Theme Settings" msgid "General Theme Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:213 #: src/Module/Settings/Display.php:224
msgid "Custom Theme Settings" msgid "Custom Theme Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:214 #: src/Module/Settings/Display.php:225
msgid "Content Settings" msgid "Content Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:215 view/theme/duepuntozero/config.php:86 #: src/Module/Settings/Display.php:226 view/theme/duepuntozero/config.php:86
#: view/theme/frio/config.php:172 view/theme/quattro/config.php:88 #: view/theme/frio/config.php:172 view/theme/quattro/config.php:88
#: view/theme/vier/config.php:136 #: view/theme/vier/config.php:136
msgid "Theme settings" msgid "Theme settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:222 #: src/Module/Settings/Display.php:233
msgid "Display Theme:" msgid "Display Theme:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:223 #: src/Module/Settings/Display.php:234
msgid "Mobile Theme:" msgid "Mobile Theme:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:226 #: src/Module/Settings/Display.php:237
msgid "Number of items to display per page:" msgid "Number of items to display per page:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:226 src/Module/Settings/Display.php:227 #: src/Module/Settings/Display.php:237 src/Module/Settings/Display.php:238
msgid "Maximum of 100 items" msgid "Maximum of 100 items"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:227 #: src/Module/Settings/Display.php:238
msgid "Number of items to display per page when viewed from mobile device:" msgid "Number of items to display per page when viewed from mobile device:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:228 #: src/Module/Settings/Display.php:239
msgid "Update browser every xx seconds" msgid "Update browser every xx seconds"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:228 #: src/Module/Settings/Display.php:239
msgid "Minimum of 10 seconds. Enter -1 to disable it." msgid "Minimum of 10 seconds. Enter -1 to disable it."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:229 #: src/Module/Settings/Display.php:240
msgid "Automatic updates only at the top of the post stream pages" msgid "Automatic updates only at the top of the post stream pages"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:229 #: src/Module/Settings/Display.php:240
msgid "" msgid ""
"Auto update may add new posts at the top of the post stream pages, which can " "Auto update may add new posts at the top of the post stream pages, which can "
"affect the scroll position and perturb normal reading if it happens anywhere " "affect the scroll position and perturb normal reading if it happens anywhere "
"else the top of the page." "else the top of the page."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:230 #: src/Module/Settings/Display.php:241
msgid "Display emoticons" msgid "Display emoticons"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:230 #: src/Module/Settings/Display.php:241
msgid "When enabled, emoticons are replaced with matching symbols." msgid "When enabled, emoticons are replaced with matching symbols."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:231 #: src/Module/Settings/Display.php:242
msgid "Infinite scroll" msgid "Infinite scroll"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:231 #: src/Module/Settings/Display.php:242
msgid "Automatic fetch new items when reaching the page end." msgid "Automatic fetch new items when reaching the page end."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:232 #: src/Module/Settings/Display.php:243
msgid "Enable Smart Threading" msgid "Enable Smart Threading"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:232 #: src/Module/Settings/Display.php:243
msgid "Enable the automatic suppression of extraneous thread indentation." msgid "Enable the automatic suppression of extraneous thread indentation."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:233 #: src/Module/Settings/Display.php:244
msgid "Display the Dislike feature" msgid "Display the Dislike feature"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:233 #: src/Module/Settings/Display.php:244
msgid "Display the Dislike button and dislike reactions on posts and comments." msgid "Display the Dislike button and dislike reactions on posts and comments."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:234 #: src/Module/Settings/Display.php:245
msgid "Display the resharer" msgid "Display the resharer"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:234 #: src/Module/Settings/Display.php:245
msgid "Display the first resharer as icon and text on a reshared item." msgid "Display the first resharer as icon and text on a reshared item."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:235 #: src/Module/Settings/Display.php:246
msgid "Stay local" msgid "Stay local"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:235 #: src/Module/Settings/Display.php:246
msgid "Don't go to a remote system when following a contact link." msgid "Don't go to a remote system when following a contact link."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:236 #: src/Module/Settings/Display.php:247
msgid "Link preview mode" msgid "Link preview mode"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:238 #: src/Module/Settings/Display.php:249
msgid "Beginning of week:" msgid "Beginning of week:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:250
msgid "Default calendar view:"
msgstr ""
#: src/Module/Settings/Features.php:74 #: src/Module/Settings/Features.php:74
msgid "Additional Features" msgid "Additional Features"
msgstr "" msgstr ""
@ -11566,11 +11570,11 @@ msgstr ""
msgid "Back to top" msgid "Back to top"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:217 #: view/theme/frio/theme.php:218
msgid "Guest" msgid "Guest"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:220 #: view/theme/frio/theme.php:221
msgid "Visitor" msgid "Visitor"
msgstr "" msgstr ""

81
view/templates/calendar/calendar_head.tpl
View file

@ -1,3 +1,8 @@
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" media="print" />
<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script> <script>
function showEvent(eventid) { function showEvent(eventid) {
$.get( $.get(
@ -10,7 +15,7 @@
function doEventPreview() { function doEventPreview() {
$('#event-edit-preview').val(1); $('#event-edit-preview').val(1);
$.post('calendar', $('#event-edit-form').serialize(), function(data) { $.post('events', $('#event-edit-form').serialize(), function(data) {
$.colorbox({ html: data }); $.colorbox({ html: data });
}); });
$('#event-edit-preview').val(0); $('#event-edit-preview').val(0);
@ -26,6 +31,7 @@
$(document).ready(function() { $(document).ready(function() {
$('#events-calendar').fullCalendar({ $('#events-calendar').fullCalendar({
defaultView: '{{$i18n.defaultView|escape:'quotes'}}',
firstDay: '{{$i18n.firstDay|escape:'quotes'}}', firstDay: '{{$i18n.firstDay|escape:'quotes'}}',
monthNames: [ monthNames: [
'{{$i18n.January|escape:'quotes'}}', '{{$i18n.January|escape:'quotes'}}',
@ -87,13 +93,13 @@
center: 'title', center: 'title',
right: 'month,agendaWeek,agendaDay' right: 'month,agendaWeek,agendaDay'
}, },
timeFormat: 'H(:mm)', timeFormat: 'H:mm',
eventClick: function(calEvent, jsEvent, view) { eventClick: function(calEvent) {
showEvent(calEvent.id); showEvent(calEvent.id);
}, },
loading: function(isLoading, view) { loading: function(isLoading) {
if(!isLoading) { if(!isLoading) {
$('td.fc-day').dblclick(function() { window.location.href='calendar/event/new?start=' + $(this).data('date'); }); $('td.fc-day').dblclick(function() { window.location.href='/calendar/event/new?start=' + $(this).data('date'); });
} }
}, },
@ -101,57 +107,39 @@
if (event.item['author-name']==null) return; if (event.item['author-name']==null) return;
switch(view.name){ switch(view.name){
case "month": case "month":
element.find(".fc-title").html( element.find(".fc-title").html(
"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format( "{0}".format(
event.item['author-avatar'], event.title
event.item['author-name'], ));
event.title break;
));
break;
case "agendaWeek": case "agendaWeek":
element.find(".fc-title").html( element.find(".fc-title").html(
"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format( "{0}<p>{1}</p><p>{2}</p>".format(
event.item['author-avatar'], event.item['author-name'],
event.item['author-name'], event.item.desc,
event.item.desc, event.item.location
event.item.location ));
)); break;
break;
case "agendaDay": case "agendaDay":
element.find(".fc-title").html( element.find(".fc-title").html(
"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format( "{0}<p>{1}</p><p>{2}</p>".format(
event.item['author-avatar'], event.item['author-name'],
event.item['author-name'], event.item.desc,
event.item.desc, event.item.location
event.item.location ));
)); break;
break;
} }
} }
}) })
// center on date
var args=location.href.replace(baseurl,"").split("/");
{{if $modparams == 2}}
if (args.length>=5) {
$("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
}
{{else}}
if (args.length>=4) {
$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
}
{{/if}}
// show event popup // show event popup
var hash = location.hash.split("-") let hash = location.hash.split("-");
if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]); if (hash.length === 2 && hash[0] === "#link") showEvent(hash[1]);
}); });
</script> </script>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#comment-edit-text-desc").bbco_autocomplete('bbcode'); $("#comment-edit-text-desc").bbco_autocomplete('bbcode');
@ -166,7 +154,7 @@
}).trigger('change'); }).trigger('change');
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr; let selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).html(); selstr = $(this).html();
$('#jot-public').hide(); $('#jot-public').hide();
@ -174,15 +162,12 @@
if(selstr == null) { if(selstr == null) {
$('#jot-public').show(); $('#jot-public').show();
} }
}).trigger('change'); }).trigger('change');
// disable the finish time input if the user disable it // disable the finish time input if the user disable it
$('#id_nofinish').change(function() { $('#id_nofinish').change(function() {
enableDisableFinishDate() enableDisableFinishDate()
}).trigger('change'); }).trigger('change');
}); });
</script> </script>

1
view/templates/settings/display.tpl
View file

@ -24,6 +24,7 @@
<h2>{{$calendar_title}}</h2> <h2>{{$calendar_title}}</h2>
{{include file="field_select.tpl" field=$first_day_of_week}} {{include file="field_select.tpl" field=$first_day_of_week}}
{{include file="field_select.tpl" field=$calendar_default_view}}
<div class="settings-submit-wrapper"> <div class="settings-submit-wrapper">
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"/> <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"/>

2
view/theme/frio/js/mod_events.js
View file

@ -39,7 +39,7 @@ $(document).ready(function () {
}); });
} }
}, },
defaultView: "month", defaultView: aStr.defaultView,
aspectRatio: 1, aspectRatio: 1,
eventRender: function (event, element, view) { eventRender: function (event, element, view) {
switch (view.name) { switch (view.name) {

1
view/theme/frio/templates/calendar/calendar_head.tpl
View file

@ -63,6 +63,7 @@
aStr.dtendLabel = '{{$i18n.dtend_label|escape:'quotes'}}'; aStr.dtendLabel = '{{$i18n.dtend_label|escape:'quotes'}}';
aStr.locationLabel = '{{$i18n.location_label|escape:'quotes'}}'; aStr.locationLabel = '{{$i18n.location_label|escape:'quotes'}}';
aStr.defaultView = '{{$i18n.defaultView|escape:'quotes'}}';
var calendar_api = '{{$calendar_api}}'; var calendar_api = '{{$calendar_api}}';
var event_api = '{{$event_api}}'; var event_api = '{{$event_api}}';

1
view/theme/frio/templates/settings/display.tpl
View file

@ -86,6 +86,7 @@
<div id="calendar-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="calendar-settings"> <div id="calendar-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="calendar-settings">
<div class="panel-body"> <div class="panel-body">
{{include file="field_select.tpl" field=$first_day_of_week}} {{include file="field_select.tpl" field=$first_day_of_week}}
{{include file="field_select.tpl" field=$calendar_default_view}}
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>

178
view/theme/vier/templates/calendar/calendar_head.tpl
View file

@ -1,178 +0,0 @@
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" media="print" />
<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script>
function showEvent(eventid) {
$.get(
'{{$event_api}}/'+ eventid,
function(data){
$.colorbox({html:data});
}
);
}
function doEventPreview() {
$('#event-edit-preview').val(1);
$.post('events',$('#event-edit-form').serialize(), function(data) {
$.colorbox({ html: data });
});
$('#event-edit-preview').val(0);
}
// disable the input for the finish date if it is not available
function enableDisableFinishDate() {
if( $('#id_nofinish').is(':checked'))
$('#id_finish_text').prop("disabled", true);
else
$('#id_finish_text').prop("disabled", false);
}
$(document).ready(function() {
$('#events-calendar').fullCalendar({
firstDay: '{{$i18n.firstDay|escape:'quotes'}}',
monthNames: [
'{{$i18n.January|escape:'quotes'}}',
'{{$i18n.February|escape:'quotes'}}',
'{{$i18n.March|escape:'quotes'}}',
'{{$i18n.April|escape:'quotes'}}',
'{{$i18n.May|escape:'quotes'}}',
'{{$i18n.June|escape:'quotes'}}',
'{{$i18n.July|escape:'quotes'}}',
'{{$i18n.August|escape:'quotes'}}',
'{{$i18n.September|escape:'quotes'}}',
'{{$i18n.October|escape:'quotes'}}',
'{{$i18n.November|escape:'quotes'}}',
'{{$i18n.December|escape:'quotes'}}'
],
monthNamesShort: [
'{{$i18n.Jan|escape:'quotes'}}',
'{{$i18n.Feb|escape:'quotes'}}',
'{{$i18n.Mar|escape:'quotes'}}',
'{{$i18n.Apr|escape:'quotes'}}',
'{{$i18n.May|escape:'quotes'}}',
'{{$i18n.Jun|escape:'quotes'}}',
'{{$i18n.Jul|escape:'quotes'}}',
'{{$i18n.Aug|escape:'quotes'}}',
'{{$i18n.Sep|escape:'quotes'}}',
'{{$i18n.Oct|escape:'quotes'}}',
'{{$i18n.Nov|escape:'quotes'}}',
'{{$i18n.Dec|escape:'quotes'}}'
],
dayNames: [
'{{$i18n.Sunday|escape:'quotes'}}',
'{{$i18n.Monday|escape:'quotes'}}',
'{{$i18n.Tuesday|escape:'quotes'}}',
'{{$i18n.Wednesday|escape:'quotes'}}',
'{{$i18n.Thursday|escape:'quotes'}}',
'{{$i18n.Friday|escape:'quotes'}}',
'{{$i18n.Saturday|escape:'quotes'}}'
],
dayNamesShort: [
'{{$i18n.Sun|escape:'quotes'}}',
'{{$i18n.Mon|escape:'quotes'}}',
'{{$i18n.Tue|escape:'quotes'}}',
'{{$i18n.Wed|escape:'quotes'}}',
'{{$i18n.Thu|escape:'quotes'}}',
'{{$i18n.Fri|escape:'quotes'}}',
'{{$i18n.Sat|escape:'quotes'}}'
],
allDayText: '{{$i18n.allday|escape:'quotes'}}',
noEventsMessage: '{{$i18n.noevent|escape:'quotes'}}',
buttonText: {
today: '{{$i18n.today|escape:'quotes'}}',
month: '{{$i18n.month|escape:'quotes'}}',
week: '{{$i18n.week|escape:'quotes'}}',
day: '{{$i18n.day|escape:'quotes'}}'
},
events: '{{$calendar_api}}',
header: {
left: 'prev,next today',
center: 'title',
right: 'month,agendaWeek,agendaDay'
},
timeFormat: 'H:mm',
eventClick: function(calEvent, jsEvent, view) {
showEvent(calEvent.id);
},
loading: function(isLoading, view) {
if(!isLoading) {
$('td.fc-day').dblclick(function() { window.location.href='/calendar/event/new?start=' + $(this).data('date'); });
}
},
eventRender: function(event, element, view) {
if (event.item['author-name']==null) return;
switch(view.name){
case "month":
element.find(".fc-title").html(
"{0}".format(
event.title
));
break;
case "agendaWeek":
element.find(".fc-title").html(
"{0}<p>{1}</p><p>{2}</p>".format(
event.item['author-name'],
event.item.desc,
event.item.location
));
break;
case "agendaDay":
element.find(".fc-title").html(
"{0}<p>{1}</p><p>{2}</p>".format(
event.item['author-name'],
event.item.desc,
event.item.location
));
break;
}
}
})
// show event popup
var hash = location.hash.split("-")
if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
});
</script>
<script language="javascript" type="text/javascript">
$(document).ready(function() {
$("#comment-edit-text-desc").bbco_autocomplete('bbcode');
$('#id_share').change(function() {
if ($('#id_share').is(':checked')) {
$('#acl-wrapper').show();
}
else {
$('#acl-wrapper').hide();
}
}).trigger('change');
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).html();
$('#jot-public').hide();
});
if(selstr == null) {
$('#jot-public').show();
}
}).trigger('change');
// disable the finish time input if the user disable it
$('#id_nofinish').change(function() {
enableDisableFinishDate()
}).trigger('change');
});
</script>