Merge pull request #14183 from BrookeDot/patch-2

Remove Nextcloud's Google+ link

core/img/googleplus.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><circle cx="8" cy="8" r="8" fill="#d95032"/><path fill="#fff" d="m6.018 11.95c-2.216 0-4.018-1.77-4.018-3.95 0-2.1765 1.803-3.95 4.018-3.95 0.97 0 1.905 0.344 2.636 0.968l-1.022 1.153c-0.447-0.382-1.02-0.593-1.614-0.593-1.358 0-2.462 1.085-2.462 2.42 0 1.333 1.105 2.418 2.462 2.418 1.15 0 1.9-0.55 2.145-1.538h-2.126v-1.53h3.77v0.764c0 2.29-1.522 3.83-3.79 3.831zm7.982-4.595h-1.165v-1.165h-0.932v1.165h-1.165v0.932h1.165v1.165h0.932v-1.165h1.165z"/></svg>

settings/templates/settings/personal/development.notice.php

@@ -20,20 +20,17 @@
 	<p class="social-button">
 		<?php print_unescaped(str_replace(
 			[
-				'{googleimage}',
 				'{facebookimage}',
 				'{twitterimage}',
 				'{mastodonimage}',
 				'{rssimage}',
 				'{mailimage}',
-				'{googleopen}',
 				'{facebookopen}',
 				'{twitteropen}',
 				'{mastodonopen}',
 				'{rssopen}',
 				'{newsletteropen}',
 				'{linkclose}',
-				'{googletext}',
 				'{facebooktext}',
 				'{twittertext}',
 				'{mastodontext}',
@@ -41,20 +38,17 @@
 				'{mailtext}',
 			],
 			[
-				image_path('core', 'googleplus.svg'),
 				image_path('core', 'facebook.svg'),
 				image_path('core', 'twitter.svg'),
 				image_path('core', 'mastodon.svg'),
 				image_path('core', 'rss.svg'),
 				image_path('core', 'mail.svg'),
-				'<a target="_blank" rel="noreferrer noopener" href="https://plus.google.com/+Nextcloud">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://www.facebook.com/Nextclouders/">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://twitter.com/nextclouders">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://mastodon.xyz/@nextcloud">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://nextcloud.com/news/">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://newsletter.nextcloud.com/?p=subscribe&amp;id=1">',
 				'</a>',
-				$l->t('Follow us on Google+'),
 				$l->t('Like our Facebook page'),
 				$l->t('Follow us on Twitter'),
 				$l->t('Follow us on Mastodon'),
@@ -62,12 +56,11 @@
 				$l->t('Subscribe to our newsletter'),
 
 			],
-'{googleopen}<img width="50" src="{googleimage}" title="{googletext}" alt="{googletext}">{linkclose}
-{facebookopen}<img width="50" src="{facebookimage}" title="{facebooktext}" alt="{facebooktext}">{linkclose}
+'{facebookopen}<img width="50" src="{facebookimage}" title="{facebooktext}" alt="{facebooktext}">{linkclose}
 {twitteropen}<img width="50" src="{twitterimage}" title="{twittertext}" alt="{twittertext}">{linkclose}
 {mastodonopen}<img width="50" src="{mastodonimage}" title="{mastodontext}" alt="{mastodontext}">{linkclose}
 {rssopen}<img class="img-circle" width="50" src="{rssimage}" title="{rsstext}" alt="{rsstext}">{linkclose}
 {newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}'
 		)); ?>
 	</p>
-</div>
+</div>