More translation expansion

resources/assets/components/landing/Directory.vue

@@ -6,20 +6,20 @@
 					<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.navmenu.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.navmenu.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.navmenu.explore') }}</router-link>
 							</li>
 						</ul>
 					</div>
 
 					<div class="card-body">
 						<div class="py-3">
-							<p class="lead text-center">Discover accounts and people</p>
+							<p class="lead text-center">{{ $t('landing.discover.tagline') }}</p>
 						</div>
 
 						<div v-if="loading" class="d-flex justify-content-center align-items-center" style="min-height: 500px;">
@@ -43,7 +43,7 @@
 							<div class="card card-body bg-bluegray-800">
 								<div class="d-flex justify-content-center align-items-center flex-column py-5">
 									<i class="fal fa-clock fa-6x text-bluegray-500"></i>
-									<p class="lead font-weight-bold mt-3 mb-0">Nothing to show yet! Check back later.</p>
+									<p class="lead font-weight-bold mt-3 mb-0">{{ $t('landing.discover.empty') }}</p>
 								</div>
 							</div>
 						</div>

resources/assets/components/landing/Explore.vue

@@ -6,20 +6,20 @@
 					<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.navmenu.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.navmenu.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.navmenu.explore') }}</router-link>
 							</li>
 						</ul>
 					</div>
 
 					<div class="card-body">
 						<div class="py-3">
-							<p class="lead text-center">Explore trending posts</p>
+							<p class="lead text-center">{{ $t('landing.explore.tagline') }}</p>
 						</div>
 
 						<div v-if="loading" class="d-flex justify-content-center align-items-center" style="min-height: 500px;">

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">{{ $t('landing.about') }}</router-link>
+							<router-link to="/" class="nav-link">{{ $t('landing.navmenu.about') }}</router-link>
 							</li>
 							<li v-if="config.show_directory" class="nav-item">
-								<router-link to="/web/directory" class="nav-link">{{ $t('landing.directory') }}</router-link>
+								<router-link to="/web/directory" class="nav-link">{{ $t('landing.navmenu.directory') }}</router-link>
 							</li>
 							<li v-if="config.show_explore_feed" class="nav-item">
-								<router-link to="/web/explore" class="nav-link">{{ $t('landing.explore') }}</router-link>
+								<router-link to="/web/explore" class="nav-link">{{ $t('landing.navmenu.explore') }}</router-link>
 							</li>
 						</ul>
 					</div>
@@ -31,7 +31,7 @@
 						<div class="server-header">
 							<p class="server-header-domain">{{ config.domain }}</p>
 							<p class="server-header-attribution">
-							<i18n path="landing.header" tag="p">
+							<i18n path="landing.about.header" tag="p">
 							  <template v-slot:pixelfedLink>
 									<a href="https://pixelfed.org" target="_blank">Pixelfed</a>
 								</template>
@@ -43,15 +43,15 @@
 							<div class="list-group">
 								<div class="list-group-item bg-transparent">
 									<p class="stat-value">{{ formatCount(config.stats.posts_count) }}</p>
-									<p class="stat-label">Posts</p>
+									<p class="stat-label">{{ $tc('landing.about.stats.posts', config.stats.posts_count) }}</p>
 								</div>
 								<div class="list-group-item bg-transparent">
 									<p class="stat-value">{{ formatCount(config.stats.active_users) }}</p>
-									<p class="stat-label">Active Users</p>
+									<p class="stat-label">{{ $tc('landing.about.stats.activeUsers', config.stats.active_users) }}</p>
 								</div>
 								<div class="list-group-item bg-transparent">
 									<p class="stat-value">{{ formatCount(config.stats.total_users) }}</p>
-									<p class="stat-label">Total Users</p>
+									<p class="stat-label">{{ $tc('landing.about.stats.totalUsers', config.stats.total_users) }}</p>
 								</div>
 							</div>
 						</div>
@@ -93,7 +93,7 @@
 						        <button class="btn btn-link btn-block" type="button" data-toggle="collapse" data-target="#collapseOne" aria-controls="collapseOne" @click="toggleAccordion(0)">
 						        	<span class="text-white h5">
 							        	<i class="far fa-info-circle mr-2 text-muted"></i>
-							          	About
+							          	{{ $t('landing.about.details.about') }}
 						        	</span>
 						        	<i class="far" :class="[ accordionTab === 0 ? 'fa-chevron-left text-primary': 'fa-chevron-down']"></i>
 						        </button>
@@ -113,7 +113,7 @@
 						        <button class="btn btn-link btn-block text-left collapsed" type="button" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo" @click="toggleAccordion(1)">
 						        	<span class="text-white h5">
 							        	<i class="far fa-list mr-2 text-muted"></i>
-						          		Server Rules
+						          		{{ $t('landing.about.details.serverRules') }}
 						          	</span>
 						        	<i class="far" :class="[ accordionTab === 1 ? 'fa-chevron-left text-primary': 'fa-chevron-down']"></i>
 						        </button>
@@ -137,7 +137,7 @@
 						        <button class="btn btn-link btn-block text-left collapsed" type="button" data-toggle="collapse" data-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree" @click="toggleAccordion(2)">
 						        	<span class="text-white h5">
 							        	<i class="far fa-sparkles mr-2 text-muted"></i>
-						          		Supported Features
+						          		{{ $t('landing.about.details.supportedFeatures') }}
 						          	</span>
 						        	<i class="far" :class="[ accordionTab === 2 ? 'fa-chevron-left text-primary': 'fa-chevron-down']"></i>
 						        </button>
@@ -146,15 +146,15 @@
 						    <div id="collapseThree" class="collapse" aria-labelledby="headingThree" data-parent="#accordion">
 						      <div class="card-body card-features">
 						      	<div class="card-features-cloud">
-						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> Photo Posts</div>
+						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> {{ $t('landing.about.features.photoPosts' ) }}</div>
-						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> Photo Albums</div>
+						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> {{ $t('landing.about.features.photoAlbums' ) }}</div>
-						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> Photo Filters</div>
+						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> {{ $t('landing.about.features.photoFilters' ) }}</div>
-						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> Collections</div>
+						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> {{ $t('landing.about.features.collections' ) }}</div>
-						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> Comments</div>
+						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> {{ $t('landing.about.features.comments' ) }}</div>
-						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> Hashtags</div>
+						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> {{ $t('landing.about.features.hashtags' ) }}</div>
-						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> Likes</div>
+						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> {{ $t('landing.about.features.likes' ) }}</div>
-						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> Notifications</div>
+						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> {{ $t('landing.about.features.notifications' ) }}</div>
-						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> Shares</div>
+						      		<div class="badge badge-success"><i class="far fa-check-circle"></i> {{ $t('landing.about.features.shares' ) }}</div>
 						      	</div>
 
 						      	<div class="py-3">
@@ -168,22 +168,22 @@
 
 						        <div class="list-group list-group-features">
 						        	<div class="list-group-item bg-bluegray-900">
-						        		<div class="feature-label">Federation</div>
+						        		<div class="feature-label">{{ $t('landing.about.features.federation') }}</div>
 						        		<i class="far fa-lg" :class="[config.features.federation ? 'fa-check-circle' : 'fa-times-circle' ]"></i>
 						        	</div>
 
 						        	<div class="list-group-item bg-bluegray-900">
-						        		<div class="feature-label">Mobile App Support</div>
+						        		<div class="feature-label">{{ $t('landing.about.features.mobileAppSupport') }}</div>
 						        		<i class="far fa-lg" :class="[config.features.mobile_apis ? 'fa-check-circle' : 'fa-times-circle' ]"></i>
 						        	</div>
 
 						        	<div class="list-group-item bg-bluegray-900">
-						        		<div class="feature-label">Stories</div>
+						        		<div class="feature-label">{{ $t('landing.about.features.stories') }}</div>
 						        		<i class="far fa-lg" :class="[config.features.stories ? 'fa-check-circle' : 'fa-times-circle' ]"></i>
 						        	</div>
 
 						        	<div class="list-group-item bg-bluegray-900">
-						        		<div class="feature-label">Videos</div>
+						        		<div class="feature-label">{{ $t('landing.about.features.videos') }}</div>
 						        		<i class="far fa-lg" :class="[config.features.video ? 'fa-check-circle' : 'fa-times-circle' ]"></i>
 						        	</div>
 						        </div>

resources/assets/components/landing/NotFound.vue

@@ -4,10 +4,10 @@
 			<div class="d-flex flex-column align-items-center gap-3">
 				<i class="fal fa-exclamation-triangle fa-5x text-bluegray-500"></i>
 				<div class="text-center">
-					<h2>404 - Not Found</h2>
+					<h2>{{ $t('landing.notfound.header') }}</h2>
-					<p class="lead">The page you are looking for does not exist.</p>
+					<p class="lead">{{ $t('landing.notfound.description') }}</p>
 				</div>
-				<a class="btn btn-outline-light btn-lg rounded-pill px-4" href="/">Go back home</a>
+				<a class="btn btn-outline-light btn-lg rounded-pill px-4" href="/">{{ $t('landing.notfound.goback') }}</a>
 			</div>
 		</section>
 	</div>

resources/assets/components/landing/sections/footer.vue

@@ -1,19 +1,19 @@
 <template>
 	<div class="footer-component">
 		<div class="footer-component-links">
-			<a href="/site/help">Help</a>
+			<a href="/site/help">{{ $t('landing.footer.help') }}</a>
 			<div class="spacer">·</div>
-			<a href="/site/terms">Terms</a>
+			<a href="/site/terms">{{ $t('landing.footer.terms') }}</a>
 			<div class="spacer">·</div>
-			<a href="/site/privacy">Privacy</a>
+			<a href="/site/privacy">{{ $t('landing.footer.privacy') }}</a>
 			<div class="spacer">·</div>
-			<a href="https://pixelfed.org/mobile-apps" target="_blank">Mobile Apps</a>
+			<a href="https://pixelfed.org/mobile-apps" target="_blank">{{ $t('landing.footer.mobileApps') }}</a>
 		</div>
 
 		<div class="footer-component-attribution">
 			<div><span>© {{ getYear() }} {{config.domain}}</span></div>
 			<div class="spacer">·</div>
-			<div><a href="https://pixelfed.org" class="text-bluegray-500 font-weight-bold">Powered by Pixelfed</a></div>
+			<div><a href="https://pixelfed.org" class="text-bluegray-500 font-weight-bold">{{ $t('landing.footer.poweredByPixelfed') }}</a></div>
 			<div class="spacer">·</div>
 			<div><span>v{{config.version}}</span></div>
 		</div>

resources/assets/components/landing/sections/nav.vue

@@ -2,15 +2,15 @@
     <nav class="navbar navbar-expand-lg navbar-dark fixed-top">
         <div class="container" style="max-width: 600px;">
             <router-link to="/" class="navbar-brand">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Logo">
+            <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Logo">
-                <span class="mr-3">{{ name }}</span>
+            <span class="mr-3">{{ name }}</span>
             </router-link>
             <ul class="navbar-nav mr-auto">
             </ul>
             <div class="my-2 my-lg-0">
-                <a class="btn btn-outline-light btn-sm rounded-pill font-weight-bold px-4" href="/login">Login</a>
+                <a class="btn btn-outline-light btn-sm rounded-pill font-weight-bold px-4" href="/login">{{ $t('landing.auth.login') }}</a>
 
-                <a v-if="config.open_registration || config.curated_onboarding" class="ml-2 btn btn-primary btn-primary-alt btn-sm rounded-pill font-weight-bold px-4" :href="regLink">Sign up</a>
+                <a v-if="config.open_registration || config.curated_onboarding" class="ml-2 btn btn-primary btn-primary-alt btn-sm rounded-pill font-weight-bold px-4" :href="regLink">{{ $t('landing.auth.signup') }}</a>
             </div>
         </div>
     </nav>

resources/assets/js/components/NavMenu.vue

@@ -88,13 +88,13 @@
 				<div v-if="loaded && !loggedIn" class="collapse navbar-collapse">
 					<ul class="navbar-nav ml-auto">
 						<li>
-							<a class="nav-link font-weight-bold text-primary" href="/login" title="Login">
+							<a class="nav-link font-weight-bold text-primary" href="/login" title="{{ $t('navmenu.login') }}">
-								Login
+								{{ $t('navmenu.login') }}
 							</a>
 						</li>
 						<li v-if="config.open_registration">
-							<a class="nav-link font-weight-bold" href="/register" title="Register">
+							<a class="nav-link font-weight-bold" href="/register" title="{{ $t('navmenu.register') }}">
-								Register
+								{{ $t('navmenu.register') }}
 							</a>
 						</li>
 					</ul>

resources/lang/en/web.php

@@ -34,6 +34,10 @@ return [
 		'sensitiveContentWarning' => 'This post may contain sensitive content',
 	],
 
+	'login' => [
+		'header' => 'Account Login'
+	],
+
 	'site' => [
 		'terms' => 'Terms of Use',
 		'privacy' => 'Privacy Policy',
@@ -61,6 +65,8 @@ return [
 		'drive' => 'Drive',
 		'settings' => 'Settings',
 		'composePost' => 'Create New Post',
+		'login' => 'Login',
+		'register' => 'Register',
 		'logout' => 'Logout',
 
 		// Nav footer
@@ -76,10 +82,62 @@ return [
 	],
 	
 	'landing' => [
-		'about' => 'About',
+		'auth' => [
-		'directory' => 'Directory',
+			'login' => 'Login',
-		'explore' => 'Explore',
+			'signup' => 'Signup',
-		'header' => 'Decentralized photo sharing social media powered by {pixelfedLink}',
+		],
+		'navmenu' => [
+			'about' => 'About',
+			'directory' => 'Directory',
+			'explore' => 'Explore',
+		],
+		'about' => [
+			'header' => 'Decentralized photo sharing social media powered by {pixelfedLink}',
+			'stats' => [
+				'posts' => 'Posts',
+				'activeUsers' => 'Active Users',
+				'totalUsers' => 'Total Users',
+			],
+			'details' => [
+				'about' => 'About',
+				'serverRules' => 'Server Rules',
+				'supportedFeatures' => 'Supported Features'
+			],
+			'features' => [
+				'photoPosts' => 'Photo Posts',
+				'photoAlbums' => 'Photo Albums',
+				'photoFilters' => 'Photo Filters',
+				'collections' => 'Collections',
+				'comments' => 'Comments',
+				'hashtags' => 'Hashtags',
+				'likes' => 'Likes',
+				'notifications' => 'Notifications',
+				'shares' => 'Shares',
+				'federation' => 'Federation',
+				'mobileAppSupport' => 'Mobile App Support',
+				'stories' => 'Stories',
+				'videos' => 'Videos'
+			],
+		],
+		'discover' => [
+			'tagline' => 'Discover accounts and people',
+			'empty' => 'Nothing to show yet! Check back later.',
+		],
+		'explore' => [
+			'tagline' => 'Explore trending posts',
+		],
+		'notfound' => [
+			'header' => '404 - Not Found',
+			'description' => 'The page you are looking for does not exist',
+			'goback' => 'Go back home'
+		],
+		'footer' => [
+			'help' => 'Help',
+			'terms' => 'Terms',
+			'privacy' => 'Privacy',
+			'mobileApps' => 'Applications mobiles',
+			'poweredByPixelfed' => 'Powered by Pixelfed'
+		]
 	],
 
 	'uiSettings' => [

resources/lang/fr/web.php

@@ -33,6 +33,10 @@ return [
 		'sensitiveContentWarning' => 'Le contenu de ce message peut être sensible',
 	],
 
+	'login' => [
+		'header' => 'Connexion'
+	],
+
 	'site' => [
 		'terms' => 'Conditions d\'utilisation',
 		'privacy' => 'Politique de confidentialité',
@@ -60,7 +64,9 @@ return [
 		'drive' => 'Médiathèque',
 		'settings' => 'Paramètres',
 		'composePost' => 'Rédiger',
+		'login' => 'Connexion',
 		'logout' => 'Déconnexion',
+		'register' => 'Inscription',
 
 		// Nav footer
 		'about' => 'À propos',
@@ -75,10 +81,62 @@ return [
 	],
 
 	'landing' => [
-		'about' => 'À propos',
+		'auth' => [
-		'directory' => 'Bottin',
+			'login' => 'Connexion',
-		'explore' => 'Découverte',
+			'signup' => 'Inscription',
-		'header' => 'Des images partagées de manière décentralisée grâce au média social {pixelfedLink}',
+		],
+		'navmenu' => [
+			'about' => 'À propos',
+			'directory' => 'Bottin',
+			'explore' => 'Découverte',
+		],
+		'about' => [
+			'header' => 'Le partage de photos dans un média social décentralisé, propulsé par {pixelfedLink}',
+			'stats' => [
+				'posts' => 'publications',
+				'activeUsers' => 'membre actif|membres actifs',
+				'totalUsers' => 'membre au total|membres au total',
+			],
+			'details' => [
+				'about' => 'À propos de ce site',
+				'serverRules' => 'Règlements',
+				'supportedFeatures' => 'Fonctionnalités offertes'
+			],
+			'features' => [
+				'photoPosts' => 'Publication de photos',
+				'photoAlbums' => 'Albums photos',
+				'photoFilters' => 'Filtres de traitement photo',
+				'collections' => 'Collections',
+				'comments' => 'Commentaires',
+				'hashtags' => 'Mots-clés',
+				'likes' => 'Mentions J\'aime',
+				'notifications' => 'Notifications',
+				'shares' => 'Partages',
+				'federation' => 'Fédération',
+				'mobileAppSupport' => 'Application mobile',
+				'stories' => 'Story',
+				'videos' => 'Contenu vidéo',
+			],
+		],
+		'discover' => [
+			'tagline' => 'À la découverte de gens et d\'histoires',
+			'empty' => 'Rien de neuf, mais revenez jeter un coup d\'oeil plus tard!',
+		],
+		'explore' => [
+			'tagline' => 'Des publications qui font du bruit',
+		],
+		'notfound' => [
+			'header' => 'C\'est vide!',
+			'description' => 'Désolé, pas de contenu à cette addresse.',
+			'goback' => 'Retour à l\'accueil'
+		],
+		'footer' => [
+			'help' => 'Aide',
+			'terms' => 'Conditions',
+			'privacy' => 'Confidentialité',
+			'mobileApps' => 'Applications mobiles',
+			'poweredByPixelfed' => 'Propulsé par Pixelfed',
+		]
 	],
 
 	'uiSettings' => [
@@ -221,6 +279,7 @@ return [
 	'hashtags' => [
 		'emptyFeed' => 'Aucune publication associée à ce mot-clic!'
 	],
+
 	'report' => [
 		'report' => 'Signaler',
 		'selectReason' => 'Signaler en tant que',
@@ -229,8 +288,9 @@ return [
 		'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'
+		'followersCount' => 'Abonné·e|Abonné·e·s',
 	]
 ];