bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #12142 from MrPetovan/task/homepage-verified

Browse source 
Add title to homepage verified check mark
This commit is contained in:
Tobias Diekershoff 2022-11-08 11:12:17 +01:00 committed by GitHub
commit 48090d1b70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Cache/Type/MemcachedCache.php
View file

@ -127,7 +127,7 @@ class MemcachedCache extends AbstractCache implements ICanCacheInMemory
if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
return $value;
} elseif ($this->memcached->getResultCode() === Memcached::RES_NOTFOUND) {
$this->logger->notice('Try to use unknown key.', ['key' => $key]);
$this->logger->debug('Try to use unknown key.', ['key' => $key]);
return null;
} else {
throw new CachePersistenceException(sprintf('Cannot get cache entry with key %s', $key), new \MemcachedException($this->memcached->getResultMessage(), $this->memcached->getResultCode()));

1
src/Model/Profile.php
View file

@ -467,6 +467,7 @@ class Profile
'$account_type' => $account_type,
'$location' => $location,
'$homepage' => $homepage,
'$homepage_verified' => DI::l10n()->t('This website has been verified to belong to the same person.'),
'$about' => $about,
'$network' => DI::l10n()->t('Network:'),
'$contacts' => $contact_count,

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

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2022.12-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-08 02:32-0500\n"
"POT-Creation-Date: 2022-11-08 04:31-0500\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"
@ -2576,7 +2576,7 @@ msgstr ""
msgid "Location:"
msgstr ""
#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:471
#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:472
#: src/Module/Notifications/Introductions.php:201
msgid "Network:"
msgstr ""
@ -3578,121 +3578,125 @@ msgstr ""
msgid "Atom feed"
msgstr ""
#: src/Model/Profile.php:506
#: src/Model/Profile.php:470
msgid "This website has been verified to belong to the same person."
msgstr ""
#: src/Model/Profile.php:507
msgid "F d"
msgstr ""
#: src/Model/Profile.php:570 src/Model/Profile.php:659
#: src/Model/Profile.php:571 src/Model/Profile.php:660
msgid "[today]"
msgstr ""
#: src/Model/Profile.php:579
#: src/Model/Profile.php:580
msgid "Birthday Reminders"
msgstr ""
#: src/Model/Profile.php:580
#: src/Model/Profile.php:581
msgid "Birthdays this week:"
msgstr ""
#: src/Model/Profile.php:608
#: src/Model/Profile.php:609
msgid "g A l F d"
msgstr ""
#: src/Model/Profile.php:646
#: src/Model/Profile.php:647
msgid "[No description]"
msgstr ""
#: src/Model/Profile.php:672
#: src/Model/Profile.php:673
msgid "Event Reminders"
msgstr ""
#: src/Model/Profile.php:673
#: src/Model/Profile.php:674
msgid "Upcoming events the next 7 days:"
msgstr ""
#: src/Model/Profile.php:868
#: src/Model/Profile.php:869
#, php-format
msgid "OpenWebAuth: %1$s welcomes %2$s"
msgstr ""
#: src/Model/Profile.php:1008
#: src/Model/Profile.php:1009
msgid "Hometown:"
msgstr ""
#: src/Model/Profile.php:1009
#: src/Model/Profile.php:1010
msgid "Marital Status:"
msgstr ""
#: src/Model/Profile.php:1010
#: src/Model/Profile.php:1011
msgid "With:"
msgstr ""
#: src/Model/Profile.php:1011
#: src/Model/Profile.php:1012
msgid "Since:"
msgstr ""
#: src/Model/Profile.php:1012
#: src/Model/Profile.php:1013
msgid "Sexual Preference:"
msgstr ""
#: src/Model/Profile.php:1013
#: src/Model/Profile.php:1014
msgid "Political Views:"
msgstr ""
#: src/Model/Profile.php:1014
#: src/Model/Profile.php:1015
msgid "Religious Views:"
msgstr ""
#: src/Model/Profile.php:1015
#: src/Model/Profile.php:1016
msgid "Likes:"
msgstr ""
#: src/Model/Profile.php:1016
#: src/Model/Profile.php:1017
msgid "Dislikes:"
msgstr ""
#: src/Model/Profile.php:1017
#: src/Model/Profile.php:1018
msgid "Title/Description:"
msgstr ""
#: src/Model/Profile.php:1018 src/Module/Admin/Summary.php:215
#: src/Model/Profile.php:1019 src/Module/Admin/Summary.php:215
#: src/Module/Moderation/Summary.php:77
msgid "Summary"
msgstr ""
#: src/Model/Profile.php:1019
#: src/Model/Profile.php:1020
msgid "Musical interests"
msgstr ""
#: src/Model/Profile.php:1020
#: src/Model/Profile.php:1021
msgid "Books, literature"
msgstr ""
#: src/Model/Profile.php:1021
#: src/Model/Profile.php:1022
msgid "Television"
msgstr ""
#: src/Model/Profile.php:1022
#: src/Model/Profile.php:1023
msgid "Film/dance/culture/entertainment"
msgstr ""
#: src/Model/Profile.php:1023
#: src/Model/Profile.php:1024
msgid "Hobbies/Interests"
msgstr ""
#: src/Model/Profile.php:1024
#: src/Model/Profile.php:1025
msgid "Love/romance"
msgstr ""
#: src/Model/Profile.php:1025
#: src/Model/Profile.php:1026
msgid "Work/employment"
msgstr ""
#: src/Model/Profile.php:1026
#: src/Model/Profile.php:1027
msgid "School/education"
msgstr ""
#: src/Model/Profile.php:1027
#: src/Model/Profile.php:1028
msgid "Contact information and Social Networks"
msgstr ""

2
view/templates/profile/vcard.tpl
View file

@ -39,7 +39,7 @@
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</dd></dl>{{/if}}
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network" dir="auto">{{$profile.about nofilter}}</dd></dl>{{/if}}

10
view/theme/frio/templates/profile/vcard.tpl
View file

@ -77,7 +77,7 @@
{{if $location}}
<div class="location detail">
<span class="location-label icon"><i class="fa fa-map-marker"></i></span>
<span class="location-label icon"><i class="fa fa-map-marker" title="{{$location}}"></i></span>
<span class="adr">
{{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
{{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
@ -87,14 +87,14 @@
{{if $profile.xmpp}}
<div class="xmpp">
<span class="xmpp-label icon"><i class="fa fa-xmpp"></i></span>
<span class="xmpp-label icon"><i class="fa fa-xmpp" title="{{$xmpp}}"></i></span>
<span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
</div>
{{/if}}
{{if $profile.matrix}}
<div class="matrix">
<span class="matrix-label icon"><i class="fa fa-matrix-org"></i></span>
<span class="matrix-label icon"><i class="fa fa-matrix-org" title="{{$matrix}}"></i></span>
<span class="matrix-data"><a href="matrix:{{$profile.matrix}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.matrix}}</a></span>
</div>
{{/if}}
@ -107,8 +107,8 @@
{{if $homepage}}
<div class="homepage detail">
<span class="homepage-label icon"><i class="fa fa-external-link"></i></span>
<span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</span>
<span class="homepage-label icon"><i class="fa fa-external-link" title="{{$homepage}}"></i></span>
<span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</span>
</div>
{{/if}}

2
view/theme/quattro/templates/profile/vcard.tpl
View file

@ -53,7 +53,7 @@
{{if $homepage}}
<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
<dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</dd>
<dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</dd>
</dl>
{{/if}}

2
view/theme/vier/templates/profile/vcard.tpl
View file

@ -45,7 +45,7 @@
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</dd></dl>{{/if}}
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network" dir="auto">{{$profile.about nofilter}}</dd></dl>{{/if}}