"convert" changed to "convertForItem"

This commit is contained in:
Michael 2021-07-08 15:41:46 +00:00
parent f29bd23ea8
commit 165c6ddc63
2 changed files with 110 additions and 105 deletions

View file

@ -67,11 +67,11 @@ class Event
$o = '';
if (!empty($event['summary'])) {
$o .= "<h3>" . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . "</h3>";
$o .= "<h3>" . BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['summary']), $simple) . "</h3>";
}
if (!empty($event['desc'])) {
$o .= "<div>" . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . "</div>";
$o .= "<div>" . BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['desc']), $simple) . "</div>";
}
$o .= "<h4>" . DI::l10n()->t('Starts:') . "</h4><p>" . $event_start . "</p>";
@ -81,7 +81,7 @@ class Event
}
if (!empty($event['location'])) {
$o .= "<h4>" . DI::l10n()->t('Location:') . "</h4><p>" . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple) . "</p>";
$o .= "<h4>" . DI::l10n()->t('Location:') . "</h4><p>" . BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['location']), $simple) . "</p>";
}
return $o;
@ -89,7 +89,7 @@ class Event
$o = '<div class="vevent">' . "\r\n";
$o .= '<div class="summary event-summary">' . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . '</div>' . "\r\n";
$o .= '<div class="summary event-summary">' . BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['summary']), $simple) . '</div>' . "\r\n";
$o .= '<div class="event-start"><span class="event-label">' . DI::l10n()->t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
. DateTimeFormat::utc($event['start'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
@ -104,12 +104,12 @@ class Event
}
if (!empty($event['desc'])) {
$o .= '<div class="description event-description">' . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . '</div>' . "\r\n";
$o .= '<div class="description event-description">' . BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['desc']), $simple) . '</div>' . "\r\n";
}
if (!empty($event['location'])) {
$o .= '<div class="event-location"><span class="event-label">' . DI::l10n()->t('Location:') . '</span>&nbsp;<span class="location">'
. BBCode::convert(Strings::escapeHtml($event['location']), false, $simple)
. BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['location']), $simple)
. '</span></div>' . "\r\n";
// Include a map of the location if the [map] BBCode is used.
@ -621,9 +621,9 @@ class Event
$drop = [DI::baseUrl() . '/events/drop/' . $event['id'] , DI::l10n()->t('Delete event') , '', ''];
}
$title = BBCode::convert(Strings::escapeHtml($event['summary']));
$title = BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['summary']));
if (!$title) {
list($title, $_trash) = explode("<br", BBCode::convert(Strings::escapeHtml($event['desc'])), BBCode::API);
list($title, $_trash) = explode("<br", BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['desc'])), BBCode::API);
}
$author_link = $event['author-link'];
@ -631,9 +631,9 @@ class Event
$event['author-link'] = Contact::magicLink($author_link);
$html = self::getHTML($event);
$event['summary'] = BBCode::convert(Strings::escapeHtml($event['summary']));
$event['desc'] = BBCode::convert(Strings::escapeHtml($event['desc']));
$event['location'] = BBCode::convert(Strings::escapeHtml($event['location']));
$event['summary'] = BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['summary']));
$event['desc'] = BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['desc']));
$event['location'] = BBCode::convertForItem($event['uri-id'], Strings::escapeHtml($event['location']));
$event_list[] = [
'id' => $event['id'],
'start' => $start,

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2021.09-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-06 07:15+0000\n"
"POT-Creation-Date: 2021-07-08 15:39+0000\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"
@ -18,26 +18,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: include/api.php:1135
#: include/api.php:1135 src/Module/BaseApi.php:302
#, php-format
msgid "Daily posting limit of %d post reached. The post was rejected."
msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
msgstr[0] ""
msgstr[1] ""
#: include/api.php:1149
#: include/api.php:1149 src/Module/BaseApi.php:318
#, php-format
msgid "Weekly posting limit of %d post reached. The post was rejected."
msgid_plural "Weekly posting limit of %d posts reached. The post was rejected."
msgstr[0] ""
msgstr[1] ""
#: include/api.php:1163
#: include/api.php:1163 src/Module/BaseApi.php:334
#, php-format
msgid "Monthly posting limit of %d post reached. The post was rejected."
msgstr ""
#: include/api.php:4499 mod/photos.php:106 mod/photos.php:210
#: include/api.php:4500 mod/photos.php:106 mod/photos.php:210
#: mod/photos.php:638 mod/photos.php:1042 mod/photos.php:1059
#: mod/photos.php:1608 src/Model/User.php:1114 src/Model/User.php:1122
#: src/Model/User.php:1130 src/Module/Settings/Profile/Photo/Crop.php:98
@ -833,8 +833,8 @@ msgstr ""
#: mod/unfollow.php:82 mod/wall_attach.php:78 mod/wall_attach.php:81
#: mod/wall_upload.php:99 mod/wall_upload.php:102 mod/wallmessage.php:35
#: mod/wallmessage.php:59 mod/wallmessage.php:96 mod/wallmessage.php:120
#: src/Module/Attach.php:56 src/Module/BaseApi.php:79 src/Module/BaseApi.php:90
#: src/Module/BaseApi.php:101 src/Module/BaseApi.php:112
#: src/Module/Attach.php:56 src/Module/BaseApi.php:81 src/Module/BaseApi.php:92
#: src/Module/BaseApi.php:103 src/Module/BaseApi.php:114
#: src/Module/BaseNotifications.php:88 src/Module/Contact.php:385
#: src/Module/Contact/Advanced.php:43 src/Module/Delegation.php:118
#: src/Module/FollowConfirm.php:16 src/Module/FriendSuggest.php:44
@ -926,21 +926,21 @@ msgstr ""
msgid "Next"
msgstr ""
#: mod/cal.php:280 mod/events.php:426 src/Model/Event.php:463
#: mod/cal.php:280 mod/events.php:426 src/Model/Event.php:464
msgid "today"
msgstr ""
#: mod/cal.php:281 mod/events.php:427 src/Model/Event.php:464
#: mod/cal.php:281 mod/events.php:427 src/Model/Event.php:465
#: src/Util/Temporal.php:330
msgid "month"
msgstr ""
#: mod/cal.php:282 mod/events.php:428 src/Model/Event.php:465
#: mod/cal.php:282 mod/events.php:428 src/Model/Event.php:466
#: src/Util/Temporal.php:331
msgid "week"
msgstr ""
#: mod/cal.php:283 mod/events.php:429 src/Model/Event.php:466
#: mod/cal.php:283 mod/events.php:429 src/Model/Event.php:467
#: src/Util/Temporal.php:332
msgid "day"
msgstr ""
@ -1115,11 +1115,11 @@ msgstr ""
msgid "Invalid profile URL."
msgstr ""
#: mod/dfrn_request.php:355 src/Model/Contact.php:2297
#: mod/dfrn_request.php:355 src/Model/Contact.php:2284
msgid "Disallowed profile URL."
msgstr ""
#: mod/dfrn_request.php:361 src/Model/Contact.php:2302
#: mod/dfrn_request.php:361 src/Model/Contact.php:2289
#: src/Module/Friendica.php:80
msgid "Blocked domain"
msgstr ""
@ -1329,7 +1329,7 @@ msgid "Description:"
msgstr ""
#: mod/events.php:563 src/Model/Event.php:84 src/Model/Event.php:111
#: src/Model/Event.php:472 src/Model/Event.php:959 src/Model/Profile.php:420
#: src/Model/Event.php:473 src/Model/Event.php:960 src/Model/Profile.php:420
#: src/Module/Contact.php:654 src/Module/Directory.php:156
#: src/Module/Notifications/Introductions.php:172
#: src/Module/Profile/Profile.php:190
@ -3634,39 +3634,39 @@ msgstr ""
msgid "last"
msgstr ""
#: src/Content/Text/BBCode.php:952 src/Content/Text/BBCode.php:1626
#: src/Content/Text/BBCode.php:1627
#: src/Content/Text/BBCode.php:953 src/Content/Text/BBCode.php:1656
#: src/Content/Text/BBCode.php:1657
msgid "Image/photo"
msgstr ""
#: src/Content/Text/BBCode.php:1084
#: src/Content/Text/BBCode.php:1083
#, php-format
msgid ""
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr ""
#: src/Content/Text/BBCode.php:1109 src/Model/Item.php:3142
#: src/Model/Item.php:3148 src/Model/Item.php:3149
#: src/Content/Text/BBCode.php:1108 src/Model/Item.php:3134
#: src/Model/Item.php:3140 src/Model/Item.php:3141
msgid "Link to source"
msgstr ""
#: src/Content/Text/BBCode.php:1544 src/Content/Text/HTML.php:951
#: src/Content/Text/BBCode.php:1574 src/Content/Text/HTML.php:951
msgid "Click to open/close"
msgstr ""
#: src/Content/Text/BBCode.php:1575
#: src/Content/Text/BBCode.php:1605
msgid "$1 wrote:"
msgstr ""
#: src/Content/Text/BBCode.php:1629 src/Content/Text/BBCode.php:1630
#: src/Content/Text/BBCode.php:1659 src/Content/Text/BBCode.php:1660
msgid "Encrypted content"
msgstr ""
#: src/Content/Text/BBCode.php:1843
#: src/Content/Text/BBCode.php:1873
msgid "Invalid source protocol"
msgstr ""
#: src/Content/Text/BBCode.php:1858
#: src/Content/Text/BBCode.php:1888
msgid "Invalid link protocol"
msgstr ""
@ -4187,137 +4187,137 @@ msgstr ""
msgid "Could not connect to database."
msgstr ""
#: src/Core/L10n.php:377 src/Model/Event.php:431
#: src/Core/L10n.php:377 src/Model/Event.php:432
#: src/Module/Settings/Display.php:178
msgid "Monday"
msgstr ""
#: src/Core/L10n.php:377 src/Model/Event.php:432
#: src/Core/L10n.php:377 src/Model/Event.php:433
msgid "Tuesday"
msgstr ""
#: src/Core/L10n.php:377 src/Model/Event.php:433
#: src/Core/L10n.php:377 src/Model/Event.php:434
msgid "Wednesday"
msgstr ""
#: src/Core/L10n.php:377 src/Model/Event.php:434
#: src/Core/L10n.php:377 src/Model/Event.php:435
msgid "Thursday"
msgstr ""
#: src/Core/L10n.php:377 src/Model/Event.php:435
#: src/Core/L10n.php:377 src/Model/Event.php:436
msgid "Friday"
msgstr ""
#: src/Core/L10n.php:377 src/Model/Event.php:436
#: src/Core/L10n.php:377 src/Model/Event.php:437
msgid "Saturday"
msgstr ""
#: src/Core/L10n.php:377 src/Model/Event.php:430
#: src/Core/L10n.php:377 src/Model/Event.php:431
#: src/Module/Settings/Display.php:178
msgid "Sunday"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:451
#: src/Core/L10n.php:381 src/Model/Event.php:452
msgid "January"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:452
#: src/Core/L10n.php:381 src/Model/Event.php:453
msgid "February"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:453
#: src/Core/L10n.php:381 src/Model/Event.php:454
msgid "March"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:454
#: src/Core/L10n.php:381 src/Model/Event.php:455
msgid "April"
msgstr ""
#: src/Core/L10n.php:381 src/Core/L10n.php:401 src/Model/Event.php:442
#: src/Core/L10n.php:381 src/Core/L10n.php:401 src/Model/Event.php:443
msgid "May"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:455
#: src/Core/L10n.php:381 src/Model/Event.php:456
msgid "June"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:456
#: src/Core/L10n.php:381 src/Model/Event.php:457
msgid "July"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:457
#: src/Core/L10n.php:381 src/Model/Event.php:458
msgid "August"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:458
#: src/Core/L10n.php:381 src/Model/Event.php:459
msgid "September"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:459
#: src/Core/L10n.php:381 src/Model/Event.php:460
msgid "October"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:460
#: src/Core/L10n.php:381 src/Model/Event.php:461
msgid "November"
msgstr ""
#: src/Core/L10n.php:381 src/Model/Event.php:461
#: src/Core/L10n.php:381 src/Model/Event.php:462
msgid "December"
msgstr ""
#: src/Core/L10n.php:397 src/Model/Event.php:423
#: src/Core/L10n.php:397 src/Model/Event.php:424
msgid "Mon"
msgstr ""
#: src/Core/L10n.php:397 src/Model/Event.php:424
#: src/Core/L10n.php:397 src/Model/Event.php:425
msgid "Tue"
msgstr ""
#: src/Core/L10n.php:397 src/Model/Event.php:425
#: src/Core/L10n.php:397 src/Model/Event.php:426
msgid "Wed"
msgstr ""
#: src/Core/L10n.php:397 src/Model/Event.php:426
#: src/Core/L10n.php:397 src/Model/Event.php:427
msgid "Thu"
msgstr ""
#: src/Core/L10n.php:397 src/Model/Event.php:427
#: src/Core/L10n.php:397 src/Model/Event.php:428
msgid "Fri"
msgstr ""
#: src/Core/L10n.php:397 src/Model/Event.php:428
#: src/Core/L10n.php:397 src/Model/Event.php:429
msgid "Sat"
msgstr ""
#: src/Core/L10n.php:397 src/Model/Event.php:422
#: src/Core/L10n.php:397 src/Model/Event.php:423
msgid "Sun"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:438
#: src/Core/L10n.php:401 src/Model/Event.php:439
msgid "Jan"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:439
#: src/Core/L10n.php:401 src/Model/Event.php:440
msgid "Feb"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:440
#: src/Core/L10n.php:401 src/Model/Event.php:441
msgid "Mar"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:441
#: src/Core/L10n.php:401 src/Model/Event.php:442
msgid "Apr"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:443
#: src/Core/L10n.php:401 src/Model/Event.php:444
msgid "Jun"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:444
#: src/Core/L10n.php:401 src/Model/Event.php:445
msgid "Jul"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:445
#: src/Core/L10n.php:401 src/Model/Event.php:446
msgid "Aug"
msgstr ""
@ -4325,15 +4325,15 @@ msgstr ""
msgid "Sep"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:447
#: src/Core/L10n.php:401 src/Model/Event.php:448
msgid "Oct"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:448
#: src/Core/L10n.php:401 src/Model/Event.php:449
msgid "Nov"
msgstr ""
#: src/Core/L10n.php:401 src/Model/Event.php:449
#: src/Core/L10n.php:401 src/Model/Event.php:450
msgid "Dec"
msgstr ""
@ -4644,128 +4644,128 @@ msgstr ""
msgid "Forum"
msgstr ""
#: src/Model/Contact.php:2307
#: src/Model/Contact.php:2294
msgid "Connect URL missing."
msgstr ""
#: src/Model/Contact.php:2316
#: src/Model/Contact.php:2303
msgid ""
"The contact could not be added. Please check the relevant network "
"credentials in your Settings -> Social Networks page."
msgstr ""
#: src/Model/Contact.php:2359
#: src/Model/Contact.php:2346
msgid ""
"This site is not configured to allow communications with other networks."
msgstr ""
#: src/Model/Contact.php:2360 src/Model/Contact.php:2373
#: src/Model/Contact.php:2347 src/Model/Contact.php:2360
msgid "No compatible communication protocols or feeds were discovered."
msgstr ""
#: src/Model/Contact.php:2371
#: src/Model/Contact.php:2358
msgid "The profile address specified does not provide adequate information."
msgstr ""
#: src/Model/Contact.php:2376
#: src/Model/Contact.php:2363
msgid "An author or name was not found."
msgstr ""
#: src/Model/Contact.php:2379
#: src/Model/Contact.php:2366
msgid "No browser URL could be matched to this address."
msgstr ""
#: src/Model/Contact.php:2382
#: src/Model/Contact.php:2369
msgid ""
"Unable to match @-style Identity Address with a known protocol or email "
"contact."
msgstr ""
#: src/Model/Contact.php:2383
#: src/Model/Contact.php:2370
msgid "Use mailto: in front of address to force email check."
msgstr ""
#: src/Model/Contact.php:2389
#: src/Model/Contact.php:2376
msgid ""
"The profile address specified belongs to a network which has been disabled "
"on this site."
msgstr ""
#: src/Model/Contact.php:2394
#: src/Model/Contact.php:2381
msgid ""
"Limited profile. This person will be unable to receive direct/personal "
"notifications from you."
msgstr ""
#: src/Model/Contact.php:2453
#: src/Model/Contact.php:2440
msgid "Unable to retrieve contact information."
msgstr ""
#: src/Model/Event.php:50 src/Model/Event.php:871
#: src/Model/Event.php:50 src/Model/Event.php:872
#: src/Module/Debug/Localtime.php:36
msgid "l F d, Y \\@ g:i A"
msgstr ""
#: src/Model/Event.php:77 src/Model/Event.php:94 src/Model/Event.php:470
#: src/Model/Event.php:941
#: src/Model/Event.php:77 src/Model/Event.php:94 src/Model/Event.php:471
#: src/Model/Event.php:942
msgid "Starts:"
msgstr ""
#: src/Model/Event.php:80 src/Model/Event.php:100 src/Model/Event.php:471
#: src/Model/Event.php:945
#: src/Model/Event.php:80 src/Model/Event.php:100 src/Model/Event.php:472
#: src/Model/Event.php:946
msgid "Finishes:"
msgstr ""
#: src/Model/Event.php:420
#: src/Model/Event.php:421
msgid "all-day"
msgstr ""
#: src/Model/Event.php:446
#: src/Model/Event.php:447
msgid "Sept"
msgstr ""
#: src/Model/Event.php:468
#: src/Model/Event.php:469
msgid "No events to display"
msgstr ""
#: src/Model/Event.php:587
#: src/Model/Event.php:588
msgid "l, F j"
msgstr ""
#: src/Model/Event.php:618
#: src/Model/Event.php:619
msgid "Edit event"
msgstr ""
#: src/Model/Event.php:619
#: src/Model/Event.php:620
msgid "Duplicate event"
msgstr ""
#: src/Model/Event.php:620
#: src/Model/Event.php:621
msgid "Delete event"
msgstr ""
#: src/Model/Event.php:872
#: src/Model/Event.php:873
msgid "D g:i A"
msgstr ""
#: src/Model/Event.php:873
#: src/Model/Event.php:874
msgid "g:i A"
msgstr ""
#: src/Model/Event.php:960 src/Model/Event.php:962
#: src/Model/Event.php:961 src/Model/Event.php:963
msgid "Show map"
msgstr ""
#: src/Model/Event.php:961
#: src/Model/Event.php:962
msgid "Hide map"
msgstr ""
#: src/Model/Event.php:1053
#: src/Model/Event.php:1054
#, php-format
msgid "%s's birthday"
msgstr ""
#: src/Model/Event.php:1054
#: src/Model/Event.php:1055
#, php-format
msgid "Happy Birthday %s"
msgstr ""
@ -4836,11 +4836,11 @@ msgstr ""
msgid "Content warning: %s"
msgstr ""
#: src/Model/Item.php:3107
#: src/Model/Item.php:3099
msgid "bytes"
msgstr ""
#: src/Model/Item.php:3136 src/Model/Item.php:3137
#: src/Model/Item.php:3128 src/Model/Item.php:3129
msgid "View on separate page"
msgstr ""
@ -7301,16 +7301,21 @@ msgstr ""
msgid "User registrations waiting for confirmation"
msgstr ""
#: src/Module/BaseApi.php:126
#: src/Module/BaseApi.php:128
#, php-format
msgid "API endpoint %s %s is not implemented"
msgstr ""
#: src/Module/BaseApi.php:127
#: src/Module/BaseApi.php:129
msgid ""
"The API endpoint is currently not implemented but might be in the future."
msgstr ""
#: src/Module/BaseApi.php:301 src/Module/BaseApi.php:317
#: src/Module/BaseApi.php:333
msgid "Too Many Requests"
msgstr ""
#: src/Module/BaseProfile.php:55 src/Module/Contact.php:947
msgid "Profile Details"
msgstr ""