From f8f8dc696968b684a89b8eb40b7466ec4415d9c1 Mon Sep 17 00:00:00 2001
From: Jeff Poirier <jeff@horslimites.org>
Date: Mon, 1 Jul 2024 08:02:33 -0400
Subject: [PATCH] Extending transation coverage to profile and landing page

---
 public/_lang/en.json                          | Bin 6997 -> 7426 bytes
 public/_lang/fr.json                          | Bin 7374 -> 8872 bytes
 resources/assets/components/DirectMessage.vue |   2 +-
 resources/assets/components/landing/Index.vue |  12 +++--
 .../partials/profile/ProfileFollowers.vue     |   2 +-
 .../partials/profile/ProfileHoverCard.vue     |   2 +-
 .../assets/components/partials/sidebar.vue    |   8 +--
 resources/assets/js/i18n/en.json              |  21 ++++++--
 resources/assets/js/i18n/fr.json              |  44 ++++++++++++++--
 resources/lang/en/web.php                     |  22 ++++++--
 resources/lang/fr/web.php                     |  47 +++++++++++++++---
 11 files changed, 131 insertions(+), 29 deletions(-)

diff --git a/public/_lang/en.json b/public/_lang/en.json
index 9e3b67209f1ec25ea098bb62b8d3a0f08b4e37ea..84bd3913ff9b7c1a250e8dcae35eb085d1bce478 100644
GIT binary patch
delta 436
zcmah_!Ab)$5XHk*SlQyO2SJ7?J&AY{?6vAiMDPRJbTjP+V-k{-wyuldFYJ#9`yD;{
z37-53lij*4Ud(AS@4b2R=JWD>@G*|!Ie$dwxSZMYaQ~<rN2A_@vW^UZ3=L9;aE}WJ
zt!f?h_YMS=%(Fe7m*3Ip8{-C3r_3rSuG`O944X%Asf98a@S9D!gJwt>np%u0N@u9x
zFUUY=$|<lJHQo)ZN;wtqjEqyzYJtX6CM(Dj&6g;q$nLm&Dypx}apx*;y~7G5rP^^N
zgT<{9B8cG?eoISQc2Rbd-uZv(5PmDEE|Qb(tjR+xXE>oD%ytNw)}CH9RC8J1wXqI!
ScJ9#7(AYmT-)ZcMxcC7i=z_2S

delta 76
zcmZp&x@xu|fpu~#YdoKlm4cFUQEFmIs)Ao?`R3oOYK)s-u?w(qD!Jw7<m8v97EON0
YD=e6qmkv@15d(2HSMVwGF>%!b0OFAt^8f$<

diff --git a/public/_lang/fr.json b/public/_lang/fr.json
index 02598034cd4989fa9188e5df96615b9b319a2da8..580ce877c86477d0d230271abd2e11007a227376 100644
GIT binary patch
delta 1448
zcmZux-D+D$5JrjP6qlqpgoKbnw&x-gss`T$H{?PwF)qju9FkH9l+~V*G|`@&<NZ+_
z%R&!vUZA~e?+Uu^D>SdrCn=rXJyuRabs^5~&g^{iee><#`@cW`^G)y8h-g+xJ1c$=
z#Y>zR@aq@7X>V0qQUGP#J|N@K1h7SaN3_4fz?n}u0q4^A?vc{uAf6q9tv=0C8rAFw
zY&zz}X@GNq3cKkJjKlR`SB6(_zaW>2oV*Epd$3>P1nm0$_D{VpwKOG~30GM(2iyIJ
zC0bCP?E6^v8F>cWy%WxAO%|FzwjQjeAWKHYaYGQbv|dg?l>9j*Pp&UYX`Bc~RF_4i
zaHLRbQRW>5##^b;<z-(mS9Q?sGF~YbHJ*VULpek<TNa77WoB=EdVO#EyDpPt;E;kz
zTn~Z@281DxV^q>3nf0$X4tjSM8|tG1g_3nVYyP=;XG>g&LG#<adpnzuW%KXNyHEc=
zB{n`7kugwlA2D~ca2aSUuxzevJy;LE5;s;IsANVY?IrP>atYBp(2A-g>@x&22cDRY
z1S!T((f#OtreKda^st?;*TfSb=HxAiF=|nRbrGNLi_?HBLE|x>XmFwqBOai{ii?tQ
z!P@h_;~_+r4vZjMa<H0OGNfq|C+yMZFf{mA?g(_vNDeU*Ka}VkoPTd9IL5+%wN3i2
z_IV&ZSgz;9gl98?;t1w0g`x3z4lM8mU5})eEiiaDz3lZE9f%aaC*Cp-v5SgK?7KsL
zcV3$6>tA-W28D&1Y;?q;dAj>;^I>;;bpn#filRpMO3gr-1<#gboLvFh<ZS62n{jv8
zDY(_B?#X4H;<=d<iZTe7Z;vz6O<4J<G&6VXq7{o{u&gAvl*R1iJjrA!rp@9gy1per
zv%4}56)d(?#w*wYQAnz)U}R_yzUkJEm#w7ogR(-?B6u04Vewk4I(`<;MTt&@ETK@)
zZAHjAC^maUFnSC^mX$%r?)DIp{G-Q=SHUL^E*zFHlJN;y3^yhy#-ug9WA+Z%%<0+s
d=&Xy6pRU_N&f$4aInm8mE|QnO$Rn_`{15yVxPt%y

delta 100
zcmZ4Cdd_k~4CCf1Mj#Qu9LOxBWTl`K6jN$okZPHdm|T*XpSO7{TR7up4o-cx&B^>u
zjFXF$geTvT7M4iM&&kOz&&*2)X>m--&&x~AP0cGQo;-&|VRN>i0`KHM^4UyWwE$~#
BAnE`B

diff --git a/resources/assets/components/DirectMessage.vue b/resources/assets/components/DirectMessage.vue
index e91ecdfaf..0c2326c4c 100644
--- a/resources/assets/components/DirectMessage.vue
+++ b/resources/assets/components/DirectMessage.vue
@@ -227,7 +227,7 @@
 										v-html="conversationProfile.display_name"
 										@click="gotoProfile(conversationProfile)"
 										>
-									</p>
+										</p>
 
 									<p
 										class="username primary"
diff --git a/resources/assets/components/landing/Index.vue b/resources/assets/components/landing/Index.vue
index 09bf62d00..7cc8f6436 100644
--- a/resources/assets/components/landing/Index.vue
+++ b/resources/assets/components/landing/Index.vue
@@ -6,13 +6,13 @@
 					<div class="card-header bg-bluegray-800 nav-menu" style="border-top-left-radius: 10px; border-top-right-radius: 10px;">
 						<ul class="nav justify-content-around">
 						  <li class="nav-item">
-							<router-link to="/" class="nav-link">About</router-link>
+							<router-link to="/" class="nav-link">{{ $t('landing.about') }}</router-link>
 							</li>
 							<li v-if="config.show_directory" class="nav-item">
-								<router-link to="/web/directory" class="nav-link">Directory</router-link>
+								<router-link to="/web/directory" class="nav-link">{{ $t('landing.directory') }}</router-link>
 							</li>
 							<li v-if="config.show_explore_feed" class="nav-item">
-								<router-link to="/web/explore" class="nav-link">Explore</router-link>
+								<router-link to="/web/explore" class="nav-link">{{ $t('landing.explore') }}</router-link>
 							</li>
 						</ul>
 					</div>
@@ -31,7 +31,11 @@
 						<div class="server-header">
 							<p class="server-header-domain">{{ config.domain }}</p>
 							<p class="server-header-attribution">
-								Decentralized photo sharing social media powered by <a href="https://pixelfed.org" target="_blank">Pixelfed</a>
+							<i18n path="landing.header" tag="p">
+							  <template v-slot:pixelfedLink>
+									<a href="https://pixelfed.org" target="_blank">Pixelfed</a>
+								</template>
+							</i18n>	
 							</p>
 						</div>
 
diff --git a/resources/assets/components/partials/profile/ProfileFollowers.vue b/resources/assets/components/partials/profile/ProfileFollowers.vue
index 4f3df5fec..704a20896 100644
--- a/resources/assets/components/partials/profile/ProfileFollowers.vue
+++ b/resources/assets/components/partials/profile/ProfileFollowers.vue
@@ -12,7 +12,7 @@
                     </div>
     				<div class="d-flex align-items-center justify-content-center flex-column w-100 overflow-hidden">
     					<p class="small text-muted mb-0 text-uppercase font-weight-light cursor-pointer text-truncate text-center" style="width: 70%;" @click="goBack()">&commat;{{ profile.acct }}</p>
-                        <p class="lead font-weight-bold mt-n1 mb-0">{{ $t('profile.followers') }}</p>
+                        <p class="lead font-weight-bold mt-n1 mb-0">{{ $t('profile.followers.caption') }}</p>
     				</div>
                     <div>
                         <a class="btn btn-dark rounded-pill font-weight-bold spacer-btn" href="#">Back</a>
diff --git a/resources/assets/components/partials/profile/ProfileHoverCard.vue b/resources/assets/components/partials/profile/ProfileHoverCard.vue
index c1bbff7a2..a2f2b5e61 100644
--- a/resources/assets/components/partials/profile/ProfileHoverCard.vue
+++ b/resources/assets/components/partials/profile/ProfileHoverCard.vue
@@ -72,7 +72,7 @@
 
 			<p class="stats">
 				<span class="stats-following">
-					<span class="following-count">{{ formatCount(profile.following_count) }}</span> Following
+					<span class="following-count">{{ formatCount(profile.following_count) }}</span> {{ $t('profile.following.caption', profile.following_count) }}
 				</span>
 				<span class="stats-followers">
 					<span class="followers-count">{{ formatCount(profile.followers_count) }}</span> Followers
diff --git a/resources/assets/components/partials/sidebar.vue b/resources/assets/components/partials/sidebar.vue
index 06b20bf2a..3777eeb85 100644
--- a/resources/assets/components/partials/sidebar.vue
+++ b/resources/assets/components/partials/sidebar.vue
@@ -16,10 +16,10 @@
 						<p class="username primary">&commat;{{ user.username }}</p>
 						<p class="stats">
 							<span class="stats-following">
-								<span class="following-count">{{ formatCount(user.following_count) }}</span> Following
+								<span class="following-count">{{ formatCount(user.following_count) }}</span>&nbsp;{{ $tc('sidebar.followingCount', user.following_count) }}
 							</span>
 							<span class="stats-followers">
-								<span class="followers-count">{{ formatCount(user.followers_count) }}</span> Followers
+								<span class="followers-count">{{ formatCount(user.followers_count) }}</span>&nbsp;{{ $tc('sidebar.followersCount', user.followers_count) }}
 							</span>
 						</p>
 					</div>
@@ -29,10 +29,10 @@
 
 		<div class="btn-group btn-group-lg btn-block mb-4">
 			<!-- <button type="button" class="btn btn-outline-primary btn-block font-weight-bold" style="border-top-left-radius: 18px;border-bottom-left-radius:18px;font-size:18px;font-weight:300!important" @click="createNewPost()">
-				<i class="fal fa-arrow-circle-up mr-1"></i> {{ $t('navmenu.compose') }} Post
+				<i class="fal fa-arrow-circle-up mr-1"></i> {{ $t('navmenu.composePost') }}
 			</button> -->
 			<router-link to="/i/web/compose" class="btn btn-primary btn-block font-weight-bold">
-				<i class="fal fa-arrow-circle-up mr-1"></i> {{ $t('navmenu.compose') }} Post
+				<i class="fal fa-arrow-circle-up mr-1"></i> {{ $t('navmenu.composePost') }}
 			</router-link>
 			<button type="button" class="btn btn-outline-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-expanded="false">
 				<span class="sr-only">Toggle Dropdown</span>
diff --git a/resources/assets/js/i18n/en.json b/resources/assets/js/i18n/en.json
index 9e3b67209..84bd3913f 100644
--- a/resources/assets/js/i18n/en.json
+++ b/resources/assets/js/i18n/en.json
@@ -43,10 +43,11 @@
         "notifications": "Notifications",
         "groups": "Groups",
         "stories": "Stories",
+        "uiSettings": "UI Settings",
         "profile": "Profile",
         "drive": "Drive",
         "settings": "Settings",
-        "compose": "Create New",
+        "composePost": "Create New Post",
         "logout": "Logout",
         "about": "About",
         "help": "Help",
@@ -56,6 +57,12 @@
         "poweredByPixelfed": "Powered by Pixelfed",
         "backToPreviousDesign": "Go back to previous design"
     },
+    "landing": {
+        "about": "About",
+        "directory": "Directory",
+        "explore": "Explore",
+        "header": "Decentralized photo sharing social media powered by {pixelfedLink}"
+    },
     "uiSettings": {
         "title": "UI Settings",
         "theme": "Theme",
@@ -104,8 +111,12 @@
     },
     "profile": {
         "posts": "Posts",
-        "followers": "Followers",
-        "following": "Following",
+        "followers": {
+            "caption": "Follower | Followers"
+        },
+        "following": {
+            "caption": "Following"
+        },
         "admin": "Admin",
         "collections": "Collections",
         "follow": "Follow",
@@ -181,5 +192,9 @@
         "sendingReport": "Sending report",
         "thanksMsg": "Thanks for the report, people like you help keep our community safe!",
         "contactAdminMsg": "If you'd like to contact an administrator about this post or report"
+    },
+    "sidebar": {
+        "followingCount": "Following",
+        "followersCount": "Followers"
     }
 }
\ No newline at end of file
diff --git a/resources/assets/js/i18n/fr.json b/resources/assets/js/i18n/fr.json
index 02598034c..580ce877c 100644
--- a/resources/assets/js/i18n/fr.json
+++ b/resources/assets/js/i18n/fr.json
@@ -10,6 +10,7 @@
         "shared": "Partag\u00e9",
         "shares": "Partages",
         "unshare": "Ne plus partager",
+        "bookmark": "Signet",
         "cancel": "Annuler",
         "copyLink": "Copier le lien",
         "delete": "Supprimer",
@@ -19,6 +20,10 @@
         "other": "Autre",
         "readMore": "En savoir plus",
         "success": "Op\u00e9ration r\u00e9ussie",
+        "proceed": "Continuer",
+        "next": "Suivant",
+        "close": "Fermer",
+        "clickHere": "cliquez ici",
         "sensitive": "Sensible",
         "sensitiveContent": "Contenu sensible",
         "sensitiveContentWarning": "Le contenu de ce message peut \u00eatre sensible"
@@ -42,7 +47,7 @@
         "profile": "Mon profil",
         "drive": "M\u00e9diath\u00e8que",
         "settings": "Param\u00e8tres",
-        "compose": "R\u00e9daction",
+        "composePost": "R\u00e9diger",
         "logout": "D\u00e9connexion",
         "about": "\u00c0 propos",
         "help": "Aide",
@@ -52,6 +57,12 @@
         "poweredByPixelfed": "Propuls\u00e9 par Pixelfed",
         "backToPreviousDesign": "Basculer vers l'ancienne interface"
     },
+    "landing": {
+        "about": "\u00c0 propos",
+        "directory": "Bottin",
+        "explore": "D\u00e9couverte",
+        "header": "Le partage de photos, dans un m\u00e9dia social d\u00e9centralis\u00e9, propuls\u00e9 par {pixelfedLink}"
+    },
     "uiSettings": {
         "title": "Param\u00e8tres visuels",
         "theme": "Jeu de couleurs",
@@ -89,7 +100,8 @@
         "groupPost": "publication de groupe",
         "modlog": "journal de mod\u00e9ration",
         "post": "publication",
-        "story": "story"
+        "story": "story",
+        "noneFound": "Aucune notification"
     },
     "post": {
         "shareToFollowers": "Partager avec ses abonn\u00e9\u00b7e\u00b7s",
@@ -99,8 +111,12 @@
     },
     "profile": {
         "posts": "Publications",
-        "followers": "Abonn\u00e9\u00b7e\u00b7s",
-        "following": "Abonnements",
+        "followers": {
+            "caption": "Abonn\u00e9\u00b7e | Abonn\u00e9\u00b7e\u00b7s"
+        },
+        "following": {
+            "caption": "Abonnement | Abonnements"
+        },
         "admin": "Administrateur\u00b7rice",
         "collections": "Collections",
         "follow": "S'abonner",
@@ -158,9 +174,27 @@
         "add": "Ajouter une Story"
     },
     "timeline": {
-        "peopleYouMayKnow": "Connaissances potentielles"
+        "peopleYouMayKnow": "Connaissances potentielles",
+        "onboarding": {
+            "welcome": "Bienvenue",
+            "thisIsYourHomeFeed": "Voici votre fil personnel, qui offre les publications de comptes suivis, en ordre chronologique.",
+            "letUsHelpYouFind": "Laissez-nous vous pr\u00e9senter des gens qui vont vous int\u00e9resser",
+            "refreshFeed": "Mise \u00e0 jour de mon fil"
+        }
     },
     "hashtags": {
         "emptyFeed": "Aucune publication associ\u00e9e \u00e0 ce mot-clic!"
+    },
+    "report": {
+        "report": "Signaler",
+        "selectReason": "Signaler en tant que",
+        "reported": "Signal\u00e9",
+        "sendingReport": "Envoi du signalement",
+        "thanksMsg": "Merci de votre signalement; vous contribuez \u00e0 la s\u00e9curit\u00e9 de notre communaut\u00e9!",
+        "contactAdminMsg": "Si vous d\u00e9sirez discuter de ce signalement avec un\u00b7e admnistrateur\u00b7trice"
+    },
+    "sidebar": {
+        "followingCount": "Abonnement|Abonnements",
+        "followersCount": "Abonn\u00e9\u00b7e|Abonn\u00e9\u00b7e\u00b7s"
     }
 }
\ No newline at end of file
diff --git a/resources/lang/en/web.php b/resources/lang/en/web.php
index 4b1e64261..091bfa219 100644
--- a/resources/lang/en/web.php
+++ b/resources/lang/en/web.php
@@ -54,12 +54,13 @@ return [
 		'notifications' => 'Notifications',
 		'groups' => 'Groups',
 		'stories' => 'Stories',
+		'uiSettings' => 'UI Settings',
 
 		// Self links
 		'profile' => 'Profile',
 		'drive' => 'Drive',
 		'settings' => 'Settings',
-		'compose' => 'Create New',
+		'composePost' => 'Create New Post',
 		'logout' => 'Logout',
 
 		// Nav footer
@@ -73,6 +74,13 @@ return [
 		// Temporary links
 		'backToPreviousDesign' => 'Go back to previous design'
 	],
+	
+	'landing' => [
+		'about' => 'About',
+		'directory' => 'Directory',
+		'explore' => 'Explore',
+		'header' => 'Decentralized photo sharing social media powered by {pixelfedLink}',
+	],
 
 	'uiSettings' => [
 		'title' => 'UI Settings',
@@ -130,8 +138,12 @@ return [
 
 	'profile' => [
 		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
+		'followers' => [
+			'caption' => 'Follower | Followers',
+	  ],
+		'following' => [
+			'caption' => 'Following',
+    ],
 		'admin' => 'Admin',
 		'collections' => 'Collections',
 		'follow' => 'Follow',
@@ -221,4 +233,8 @@ return [
 		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
 	],
 
+	'sidebar' => [
+		'followingCount' => 'Following',
+		'followersCount' => 'Followers'
+	]
 ];
diff --git a/resources/lang/fr/web.php b/resources/lang/fr/web.php
index a2b7a24f6..d29c726b4 100644
--- a/resources/lang/fr/web.php
+++ b/resources/lang/fr/web.php
@@ -13,7 +13,7 @@ return [
 		'shared' => 'Partagé',
 		'shares' => 'Partages',
 		'unshare' => 'Ne plus partager',
-
+		'bookmark' => 'Signet',
 		'cancel' => 'Annuler',
 		'copyLink' => 'Copier le lien',
 		'delete' => 'Supprimer',
@@ -23,6 +23,10 @@ return [
 		'other' => 'Autre',
 		'readMore' => 'En savoir plus',
 		'success' => 'Opération réussie',
+		'proceed' => 'Continuer',
+		'next' => 'Suivant',
+		'close' => 'Fermer',
+		'clickHere' => 'cliquez ici',
 
 		'sensitive' => 'Sensible',
 		'sensitiveContent' => 'Contenu sensible',
@@ -55,7 +59,7 @@ return [
 		'profile' => 'Mon profil',
 		'drive' => 'Médiathèque',
 		'settings' => 'Paramètres',
-		'compose' => 'Rédaction',
+		'composePost' => 'Rédiger',
 		'logout' => 'Déconnexion',
 
 		// Nav footer
@@ -70,6 +74,13 @@ return [
 		'backToPreviousDesign' => 'Basculer vers l\'ancienne interface'
 	],
 
+	'landing' => [
+		'about' => 'À propos',
+		'directory' => 'Bottin',
+		'explore' => 'Découverte',
+		'header' => 'Des images partagées de manière décentralisée grâce au média social {pixelfedLink}',
+	],
+
 	'uiSettings' => [
 		'title' => 'Paramètres visuels',
 		'theme' => 'Jeu de couleurs',
@@ -114,7 +125,8 @@ return [
 		'modlog' => 'journal de modération',
 		'post' => 'publication',
 		'story' => 'story',
-	],
+		'noneFound' => 'Aucune notification'	
+		],
 
 	'post' => [
 		'shareToFollowers' => 'Partager avec ses abonné·e·s',
@@ -125,8 +137,12 @@ return [
 
 	'profile' => [
 		'posts' => 'Publications',
-		'followers' => 'Abonné·e·s',
-		'following' => 'Abonnements',
+		'followers' => [
+			'caption' => 'Abonné·e | Abonné·e·s',
+	  ],
+		'following' => [
+			'caption' => 'Abonnement | Abonnements',
+    ],
 		'admin' => 'Administrateur·rice',
 		'collections' => 'Collections',
 		'follow' => 'S\'abonner',
@@ -193,11 +209,28 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Connaissances potentielles'
+		'peopleYouMayKnow' => 'Connaissances potentielles',
+		'onboarding' => [
+			'welcome' => 'Bienvenue',
+			'thisIsYourHomeFeed' => 'Voici votre fil personnel, qui offre les publications de comptes suivis, en ordre chronologique.',
+			'letUsHelpYouFind' => 'Laissez-nous vous présenter des gens qui vont vous intéresser',
+			'refreshFeed' => 'Mise à jour de mon fil',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Aucune publication associée à ce mot-clic!'
 	],
-
+	'report' => [
+		'report' => 'Signaler',
+		'selectReason' => 'Signaler en tant que',
+		'reported' => 'Signalé',
+		'sendingReport' => 'Envoi du signalement',
+		'thanksMsg' => 'Merci de votre signalement; vous contribuez à la sécurité de notre communauté!', 
+		'contactAdminMsg' => 'Si vous désirez discuter de ce signalement avec un·e admnistrateur·trice',
+	],
+	'sidebar' => [
+		'followingCount' => 'Abonnement|Abonnements',
+		'followersCount' => 'Abonné·e|Abonné·e·s'
+	]
 ];