Merge remote-tracking branch 'origin/master'

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

l10n/ca.js

@@ -2,6 +2,7 @@ OC.L10N.register(
     "social",
     {
     "Social" : "Social",
+    "Follow %s on Social" : "Seguiu %s a Social",
     "🎉 Nextcloud becomes part of the federated social networks!" : "🎉 Nextcloud esdevé part de les xarxes socials federades!",
     "** Disclaimer: this is an ALPHA version **\n\n**🎉 Nextcloud becomes part of the federated social networks!**\n\n**🙋 Find your friends:** No matter if they use Nextcloud, 🐘 Mastodon, 🇫 Friendica, and soon ✱ Diaspora, 👹 MediaGoblin and more – you can follow them!\n\n**📜 Profile info:** No need to fill out more profiles – your info from Nextcloud will be used and extended.\n\n**👐 Own your posts:** Everything you post stays on your Nextcloud!\n\n**🕸 Open standards:** We use the established ActivityPub standard!" : "** Renúncia de responsabilitat: aquesta és una versió ALPHA **\n\n**🎉 Nextcloud passa a formar part de les xarxes socials federades!**\n\n**🙋 Trobeu als vostres amics i amigues:** No importa si usen o no Nextcloud, 🐘 Mastodon, 🇫 Friendica, i aviat ✱ Diaspora, 👹 MediaGoblin i més – els podràs seguir!\n\n**📜 Informació de perfil:** No necessitareu emplenar més perfils d'usuari – la vostra informació a Nextcloud serà usada i ampliada.\n\n**👐 Conserveu les vostres publicacions:** Tot el que publiqueu restarà desat a Nextcloud!\n\n**🕸 Estàndards oberts:** Emprem l'estàndard ActivityPub!",
     ".well-known/webfinger isn't properly set up!" : ".well-known/webfinger no està ben configurat!",

l10n/ca.json

@@ -1,5 +1,6 @@
 { "translations": {
     "Social" : "Social",
+    "Follow %s on Social" : "Seguiu %s a Social",
     "🎉 Nextcloud becomes part of the federated social networks!" : "🎉 Nextcloud esdevé part de les xarxes socials federades!",
     "** Disclaimer: this is an ALPHA version **\n\n**🎉 Nextcloud becomes part of the federated social networks!**\n\n**🙋 Find your friends:** No matter if they use Nextcloud, 🐘 Mastodon, 🇫 Friendica, and soon ✱ Diaspora, 👹 MediaGoblin and more – you can follow them!\n\n**📜 Profile info:** No need to fill out more profiles – your info from Nextcloud will be used and extended.\n\n**👐 Own your posts:** Everything you post stays on your Nextcloud!\n\n**🕸 Open standards:** We use the established ActivityPub standard!" : "** Renúncia de responsabilitat: aquesta és una versió ALPHA **\n\n**🎉 Nextcloud passa a formar part de les xarxes socials federades!**\n\n**🙋 Trobeu als vostres amics i amigues:** No importa si usen o no Nextcloud, 🐘 Mastodon, 🇫 Friendica, i aviat ✱ Diaspora, 👹 MediaGoblin i més – els podràs seguir!\n\n**📜 Informació de perfil:** No necessitareu emplenar més perfils d'usuari – la vostra informació a Nextcloud serà usada i ampliada.\n\n**👐 Conserveu les vostres publicacions:** Tot el que publiqueu restarà desat a Nextcloud!\n\n**🕸 Estàndards oberts:** Emprem l'estàndard ActivityPub!",
     ".well-known/webfinger isn't properly set up!" : ".well-known/webfinger no està ben configurat!",

l10n/pt_BR.js

@@ -54,6 +54,7 @@ OC.L10N.register(
     "No global posts found" : "Nenhum post global encontrado",
     "Posts from federated instances will show up here" : "Posts de instâncias federadas serão exibidos aqui",
     "No liked posts found" : "Nenhum post curtido encontrado",
+    "You haven't tooted yet" : "Você não reiniciou ainda",
     "No posts found for this tag" : "Nenhum post encontrado para este rótulo",
     "Reply" : "Responder",
     "Boost" : "Impulsionar",

l10n/pt_BR.json

@@ -52,6 +52,7 @@
     "No global posts found" : "Nenhum post global encontrado",
     "Posts from federated instances will show up here" : "Posts de instâncias federadas serão exibidos aqui",
     "No liked posts found" : "Nenhum post curtido encontrado",
+    "You haven't tooted yet" : "Você não reiniciou ainda",
     "No posts found for this tag" : "Nenhum post encontrado para este rótulo",
     "Reply" : "Responder",
     "Boost" : "Impulsionar",

src/components/TimelineList.vue

@@ -123,8 +123,14 @@ export default {
 				return this.emptyContent[this.$route.params.type]
 			}
 			if (typeof this.emptyContent[this.$route.name] !== 'undefined') {
-				return this.$route.name === 'timeline' ? this.emptyContent['default'] : this.emptyContent[this.$route.name]
+				let content = this.emptyContent[this.$route.name]
+				// Change text on profile page when accessed by another user or a public (non-authenticated) user
+				if (this.$route.name === 'profile' && (this.serverData.public || this.$route.params.account !== this.currentUser.uid)) {
+					content.title = this.$route.params.account + ' ' + t('social', 'hasn\'t tooted yet')
+				}
+				return this.$route.name === 'timeline' ? this.emptyContent['default'] : content
 			}
+			// Fallback
 			return this.emptyContent.default
 		},
 		timeline: function() {