From 561f22cdc4a27b4aae8cf7526047fe65db8a4a27 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 8 Nov 2022 04:20:19 -0500 Subject: [PATCH 1/2] Add title to homepage verified check mark - Decrease log level for not found Memcached keys --- src/Core/Cache/Type/MemcachedCache.php | 2 +- src/Model/Profile.php | 1 + view/templates/profile/vcard.tpl | 2 +- view/theme/frio/templates/profile/vcard.tpl | 10 +++++----- view/theme/quattro/templates/profile/vcard.tpl | 2 +- view/theme/vier/templates/profile/vcard.tpl | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Core/Cache/Type/MemcachedCache.php b/src/Core/Cache/Type/MemcachedCache.php index 2d8b4e1c2..3d4627de3 100644 --- a/src/Core/Cache/Type/MemcachedCache.php +++ b/src/Core/Cache/Type/MemcachedCache.php @@ -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())); diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 367680c42..dcd39a30c 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -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, diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl index a304a9a1f..7c301db8c 100644 --- a/view/templates/profile/vcard.tpl +++ b/view/templates/profile/vcard.tpl @@ -39,7 +39,7 @@ {{if $updated}}{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}{{if $profile.homepage_verified}} ✔{{/if}}
{{/if}} + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}{{if $profile.homepage_verified}} {{/if}}
{{/if}} {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}} diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl index 35e3c8419..3a185d874 100644 --- a/view/theme/frio/templates/profile/vcard.tpl +++ b/view/theme/frio/templates/profile/vcard.tpl @@ -77,7 +77,7 @@ {{if $location}}
- + {{if $profile.address}}

{{$profile.address nofilter}}

{{/if}} {{if $profile.location}}

{{$profile.location}}

{{/if}} @@ -87,14 +87,14 @@ {{if $profile.xmpp}} {{/if}} {{if $profile.matrix}} {{/if}} @@ -107,8 +107,8 @@ {{if $homepage}}
- - {{include file="sub/punct_wrap.tpl" text=$profile.homepage}}{{if $profile.homepage_verified}} ✔{{/if}} + + {{include file="sub/punct_wrap.tpl" text=$profile.homepage}}{{if $profile.homepage_verified}} {{/if}}
{{/if}} diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl index 86d4889c8..6a874bf51 100644 --- a/view/theme/quattro/templates/profile/vcard.tpl +++ b/view/theme/quattro/templates/profile/vcard.tpl @@ -53,7 +53,7 @@ {{if $homepage}}
{{$homepage}}
-
{{$profile.homepage}}{{if $profile.homepage_verified}} ✔{{/if}}
+
{{$profile.homepage}}{{if $profile.homepage_verified}} {{/if}}
{{/if}} diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl index 0a9348015..05199f227 100644 --- a/view/theme/vier/templates/profile/vcard.tpl +++ b/view/theme/vier/templates/profile/vcard.tpl @@ -45,7 +45,7 @@ {{if $updated}}{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}{{if $profile.homepage_verified}} ✔{{/if}}
{{/if}} + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}{{if $profile.homepage_verified}} {{/if}}
{{/if}} {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}} From 327cf17b07cf16dd5cec91a9cadb1b8fac88cecd Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 8 Nov 2022 04:32:58 -0500 Subject: [PATCH 2/2] Updated main translation file after adding a string --- view/lang/C/messages.po | 66 ++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index bbf484e68..be5231868 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -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 \n" "Language-Team: LANGUAGE \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 ""