Merge pull request #914 from pixelfed/frontend-ui-refactor

Frontend ui refactor

package.json

@@ -49,6 +49,6 @@
     },
     "collective": {
         "type": "opencollective",
-        "url": "https://opencollective.com/pixelfed-528"
+        "url": "https://opencollective.com/pixelfed"
     }
 }

resources/assets/js/components/DiscoverComponent.vue

@@ -74,7 +74,7 @@ export default {
         el.text('Unfollow');
       }).catch(err => {
         swal(
-          'Whoops! Something went wrong...',
+          'Whoops! Something went wrong…',
           'An error occurred, please try again later.',
           'error'
         );

resources/assets/js/components/PostComponent.vue

@@ -152,7 +152,7 @@
             <form class="comment-form d-none" method="post" action="/i/comment" :data-id="statusId" data-truncate="false">
               <input type="hidden" name="_token" value="">
               <input type="hidden" name="item" :value="statusId">
-              <input class="form-control" name="comment" placeholder="Add a comment..." autocomplete="off">
+              <input class="form-control" name="comment" placeholder="Add a comment…" autocomplete="off">
               <input type="submit" value="Send" class="btn btn-primary comment-submit" />
             </form>
           </div>
@@ -172,7 +172,7 @@
       <div class="list-group-item border-0" v-for="(user, index) in likes" :key="'modal_likes_'+index">
         <div class="media">
           <a :href="user.url">
-            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
+            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + ’s avatar'" width="30px">
           </a>
           <div class="media-body">
             <p class="mb-0" style="font-size: 14px">
@@ -203,7 +203,7 @@
       <div class="list-group-item border-0" v-for="(user, index) in shares" :key="'modal_shares_'+index">
         <div class="media">
           <a :href="user.url">
-            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
+            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
           </a>
           <div class="media-body">
             <div class="d-inline-block">

resources/assets/js/components/Profile.vue

@@ -233,7 +233,7 @@
       <div class="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
         <div class="media">
           <a :href="user.url">
-            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
+            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
           </a>
           <div class="media-body">
             <p class="mb-0" style="font-size: 14px">
@@ -262,7 +262,7 @@
       <div class="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
         <div class="media">
           <a :href="user.url">
-            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
+            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
           </a>
           <div class="media-body">
             <p class="mb-0" style="font-size: 14px">

resources/assets/js/components/SearchResults.vue

@@ -2,7 +2,7 @@
 <div class="container">
 	<div v-if="loading" class="pt-5 text-center">
 		<div class="spinner-border" role="status">
-			<span class="sr-only">Loading...</span>
+			<span class="sr-only">Loading…</span>
 		</div>
 	</div>
 	<div v-if="networkError" class="pt-5 text-center">

resources/assets/js/components/Stories.vue

@@ -9,7 +9,7 @@
 			</div>
 			<div class="card-body loader text-center" style="height: 120px;">
 				<div class="spinner-border" role="status">
-					<span class="sr-only">Loading...</span>
+					<span class="sr-only">Loading…</span>
 				</div>
 			</div>
 			<div class="card-body pt-2 contents" style="max-height: 120px; overflow-y: scroll;">

resources/assets/js/components/Timeline.vue

@@ -307,7 +307,7 @@
       <div class="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
         <div class="media">
           <a :href="user.url">
-            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
+            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
           </a>
           <div class="media-body">
             <p class="mb-0" style="font-size: 14px">
@@ -336,7 +336,7 @@
       <div class="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
         <div class="media">
           <a :href="user.url">
-            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
+            <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
           </a>
           <div class="media-body">
             <p class="mb-0" style="font-size: 14px">
@@ -786,7 +786,7 @@
 					break;
 
 					case 'disable':
-						msg = 'Are you sure you want to disable ' + username + '\'s account ?';
+						msg = 'Are you sure you want to disable ' + username + '’s account ?';
 						swal({
 							title: 'Confirm',
 							text: msg,
@@ -800,7 +800,7 @@
 									item_id: status.id,
 									item_type: 'status'
 								}).then(res => {
-									swal('Success', 'Successfully disabled ' + username + '\'s account', 'success');
+									swal('Success', 'Successfully disabled ' + username + '’s account', 'success');
 								}).catch(err => {
 									swal(
 										'Error',
@@ -813,7 +813,7 @@
 					break;
 
 					case 'suspend':
-						msg = 'Are you sure you want to suspend ' + username + '\'s account ?';
+						msg = 'Are you sure you want to suspend ' + username + '’s account ?';
 						swal({
 							title: 'Confirm',
 							text: msg,
@@ -827,7 +827,7 @@
 									item_id: status.id,
 									item_type: 'status'
 								}).then(res => {
-									swal('Success', 'Successfully suspend ' + username + '\'s account', 'success');
+									swal('Success', 'Successfully suspend ' + username + '’s account', 'success');
 								}).catch(err => {
 									swal(
 										'Error',

resources/lang/cs/navmenu.php

@@ -2,6 +2,10 @@
 
 return [
 
+	'search'			=> 'Hledat',
+	'home'				=> 'Domů',
+	'local'				=> 'Místní',
+	'discover'			=> 'Objevovat',
 	'viewMyProfile'		=> 'Zobrazit můj profil',
 	'myTimeline'		=> 'Moje časová osa',
 	'publicTimeline'	=> 'Veřejná časová osa',

resources/lang/de/site.php

@@ -9,7 +9,7 @@ return [
 	'opensource'	=> 'Open Source',
 	'terms'			=> 'Nutzungshinweise',
 	'privacy'		=> 'Privacy',
-	'l10nWip'		=> 'Wir arbeiten noch an der Unterstützung weiterer Sprachen.',
+	'l10nWip'		=> 'Wir arbeiten noch an der Unterstützung weiterer Sprachen',
 	'currentLocale' => 'Aktuelle Sprache',
 	'selectLocale'  => 'Wähle eine der unterstützten Sprachen aus',
   

resources/lang/en/passwords.php

@@ -15,8 +15,8 @@ return [
 
     'password' => 'Passwords must be at least six characters and match the confirmation.',
     'reset'    => 'Your password has been reset!',
-    'sent'     => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn\'t receive this email.',
+    'sent'     => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn’t receive this email.',
     'token'    => 'This password reset token is invalid.',
-    'user'     => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn\'t receive this email.',
+    'user'     => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn’t receive this email.',
 
 ];

resources/lang/en/site.php

@@ -11,6 +11,6 @@ return [
 	'privacy'		=> 'Privacy',
 	'l10nWip'		=> 'We’re still working on localization support',
 	'currentLocale' => 'Current locale',
-	'selectLocale'  => 'Select from one of the supported languages',
+	'selectLocale'  => 'Select one of the supported languages',
 
 ];

resources/lang/eu/navmenu.php

@@ -2,6 +2,10 @@
 
 return [
 
+    'search'		 => 'Bilatu',
+	'home'			 => 'Sarrera',
+	'local'			 => 'Lokala',
+	'discover'		 => 'Esploratu',
     'viewMyProfile'  => 'Ikusi nire profila',
     'myTimeline'     => 'Nire denboralerroa',
     'publicTimeline' => 'Denboralerro publikoa',

resources/lang/id/auth.php

@@ -14,6 +14,6 @@ return [
     */
 
     'failed'   => 'Kredensial ini tidak cocok dengan data kami.',
-    'throttle' => 'Terlalu banyak percobaan login. COba lagi setelah :seconds detik.',
+    'throttle' => 'Terlalu banyak percobaan login. Coba lagi setelah :seconds detik.',
 
 ];

resources/lang/id/profile.php

@@ -4,7 +4,7 @@ return [
   'emptyFollowers'        => 'User ini belum punya pengikut!',
   'emptyFollowing'        => 'User ini belum mengikuti siapapun!',
   'emptySaved'            => 'Kamu belum membuat posting!',
-  'savedWarning'          => 'Hanya kami yang bisa melihat posting kamu sendiri',
+  'savedWarning'          => 'Hanya kamu yang bisa melihat posting kamu sendiri',
   'privateProfileWarning' => 'Akun ini Privat',
   'alreadyFollow'         => 'Sudah mengikuti :username?',
   'loginToSeeProfile'     => 'untuk melihat foro dan videonya.',

resources/lang/id/validation.php

@@ -31,7 +31,7 @@ return [
     'date'                 => ':attribute bukan berupa tanggal yang benar.',
     'date_format'          => ':attribute tidak sesuai dengan format :format.',
     'different'            => ':attribute dan :other harus berbeda.',
-    'digits'               => ':attribute haurs berisi :digits digit.',
+    'digits'               => ':attribute harus berisi :digits digit.',
     'digits_between'       => ':attribute harus antara :min dan :max digit.',
     'dimensions'           => ':attribute berisi dimensi gambar yang tidak benar.',
     'distinct'             => 'Bagian :attribute memiliki duplikasi.',
@@ -48,43 +48,43 @@ return [
     'ipv6'                 => ':attribute harus berupa alamat IPv6 yang benar.',
     'json'                 => ':attribute harus berupa string JSON yang benar.',
     'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
+        'numeric' => ':attribute tidak boleh lebih dari :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'file'    => ':attribute tidak boleh lebih dari :max kilobyte.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
+        'string'  => ':attribute tidak boleh lebih dari :max karakter.',
-        'array'   => 'The :attribute may not have more than :max items.',
+        'array'   => ':attribute tidak boleh lebih dari :max item.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'mimes'                => ':attribute harus berupa berkas: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
+    'mimetypes'            => ':attribute harus berupa berkas: :values.',
     'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
+        'numeric' => ':attribute minimal harus :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'file'    => ':attribute minimal harus :min kilobyte.',
-        'string'  => 'The :attribute must be at least :min characters.',
+        'string'  => ':attribute minimal harus :min karakter.',
-        'array'   => 'The :attribute must have at least :min items.',
+        'array'   => ':attribute minimal harus berisi :min item.',
     ],
-    'not_in'               => 'The selected :attribute is invalid.',
+    'not_in'               => ':attribute yang dipilih tidak benar.',
-    'not_regex'            => 'The :attribute format is invalid.',
+    'not_regex'            => 'Format :attribute tidak benar.',
-    'numeric'              => 'The :attribute must be a number.',
+    'numeric'              => ':attribute harus berupa angka.',
-    'present'              => 'The :attribute field must be present.',
+    'present'              => 'Bagian :attribute harus diisi.',
-    'regex'                => 'The :attribute format is invalid.',
+    'regex'                => 'Format :attribute tidak benar.',
-    'required'             => 'The :attribute field is required.',
+    'required'             => 'Bagian :attribute harus diisi.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_if'          => 'Bagian :attribute harus diisi jika :other :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
+    'required_unless'      => 'Bagian :attribute harus diisi kecuali jika :other :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with'        => 'Bagian :attribute harus diisi jika ada :values.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'Bagian :attribute harus diisi jika ada :values.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_without'     => 'Bagian :attribute harus diisi jika tidak ada :values.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'required_without_all' => 'Bagian :attribute harus diisi jika tidak ada :values.',
-    'same'                 => 'The :attribute and :other must match.',
+    'same'                 => ':attribute dan :other harus sama.',
     'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
+        'numeric' => ':attribute harus :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
+        'file'    => ':attribute harus berukuran :size kilobyte.',
-        'string'  => 'The :attribute must be :size characters.',
+        'string'  => ':attribute harus berisi :size karaker.',
-        'array'   => 'The :attribute must contain :size items.',
+        'array'   => ':attribute harus berisi :size item.',
     ],
-    'string'               => 'The :attribute must be a string.',
+    'string'               => ':attribute harus berupa string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
+    'timezone'             => ':attribute harus berupa zona yang benar.',
-    'unique'               => 'The :attribute has already been taken.',
+    'unique'               => ':attribute sudah digunakan.',
-    'uploaded'             => 'The :attribute failed to upload.',
+    'uploaded'             => ':attribute gagal diunggah.',
-    'url'                  => 'The :attribute format is invalid.',
+    'url'                  => 'Format :attribute tidak benar.',
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines

resources/lang/pl/navmenu.php

@@ -2,12 +2,16 @@
 
 return [
 
+    'search'         => 'Szukaj',
+	'home'           => 'Strona główna',
+	'local'	         => 'Lokalne',
+	'discover'       => 'Odkrywaj',
     'viewMyProfile'  => 'Pokaż mój profil',
     'myTimeline'     => 'Moja oś czasu',
     'publicTimeline' => 'Publiczna oś czasu',
     'remoteFollow'   => 'Zdalne śledzenie',
     'settings'       => 'Ustawienia',
-    'admin'          => 'Administrator',
+    'admin'          => 'Administracja',
     'logout'         => 'Wyloguj się',
     'directMessages' => 'Wiadomości bezpośrednie',
 

resources/lang/pl/notification.php

@@ -6,5 +6,6 @@ return [
   'startedFollowingYou' => 'zaczął(-ęła) Cię obserwować.',
   'commented'           => 'skomentował(a) Twój wpis',
   'mentionedYou'        => 'wspomniał(a) o Tobie.',
+  'shared'				=> 'udostępnił(a) Twój wpis.',
 
 ];

resources/lang/pl/passwords.php

@@ -15,8 +15,8 @@ return [
 
     'password' => 'Hasło musi składać się z przynajmniej 6 znaków i być równe powtórzonemu.',
     'reset'    => 'Twoje hasło zostało zresetowane!',
-    'sent'     => 'Wysłaliśmy Ci link resetujący hasło mailem!',
+    'sent'     => 'Jeżeli ten adres e-mail jest obecny w naszej bazie danych, otrzymasz wiadomość z odnośnikiem resetowania hasła w ciągu kilku minut. Jeżeli nie dostałeś(-aś) tego maila, sprawdź zawartość folderu Spam.',
     'token'    => 'This password reset token is invalid.',
-    'user'     => 'Nie znaleziono użytkownika z tym adresem e-mail.',
+    'user'     => 'Jeżeli ten adres e-mail jest obecny w naszej bazie danych, otrzymasz wiadomość z odnośnikiem resetowania hasła w ciągu kilku minut. Jeżeli nie dostałeś(-aś) tego maila, sprawdź zawartość folderu Spam.',
 
 ];

resources/lang/pl/profile.php

@@ -6,4 +6,7 @@ return [
   'emptyFollowing'        => 'Ten użytkownik nie obserwuje nikogo!',
   'emptySaved'            => 'Nie zapisałeś(-aś) jeszcze niczego!',
   'savedWarning'          => 'Tylko Ty widzisz to, co zapisałeś(-aś)',
+  'privateProfileWarning' => 'To konto jest prywatne',
+  'alreadyFollow'         => 'Już obserwujesz :username?',
+  'loginToSeeProfile'     => 'aby zobaczyć zdjęcia i filmy tego użytkownika.',
 ];

resources/lang/pl/site.php

@@ -0,0 +1,16 @@
+<?php
+
+return [
+
+	'about'			=> 'O nas',
+	'help'			=> 'Pomoc',
+	'language'		=> 'Język',
+	'fediverse'		=> 'Fediwersum',
+	'opensource'	=> 'Otwarte źródło',
+	'terms'			=> 'Zasady',
+	'privacy'		=> 'Prywatność',
+	'l10nWip'		=> 'Wciąż pracujemy nad obsługą wielu języków',
+	'currentLocale' => 'Obecny język',
+	'selectLocale'  => 'Wybierz jeden z dostępnych języków',
+
+];

resources/views/admin/settings/system.blade.php

@@ -48,7 +48,7 @@
   <div>
     <div class="card-loading text-center">
       <div class="spinner-border" role="status">
-        <span class="sr-only">Loading...</span>
+        <span class="sr-only">Loading…</span>
       </div>
     </div>
     <div class="card card-release d-none">

resources/views/site/language.blade.php

@@ -11,7 +11,7 @@
   <p class="font-weight-light">{{__('site.selectLocale')}}:</p>
   <ul class="list-group">
     @foreach(App\Util\Localization\Localization::languages() as $lang)
-    <a class="list-group-item font-weight-bold" href="/i/lang/{{$lang}}">{{locale_get_display_language($lang)}}</a>
+    <a class="list-group-item font-weight-bold" href="/i/lang/{{$lang}}">{{locale_get_display_language($lang, $lang)}}</a>
     @endforeach
   </ul>
 @endsection

resources/views/status/compose.blade.php

@@ -497,7 +497,7 @@ $('#composeMenu').on('click', function(e) {
   e.preventDefault();
   swal(
     'Experimental Feature',
-    'We\'re still working on this feature.',
+    'We’re still working on this feature.',
     'info'
   );
 });

resources/views/status/show/sidebar.blade.php

@@ -111,7 +111,7 @@
       @csrf
       <input type="hidden" name="item" value="{{$status->id}}">
 
-      <input class="form-control" name="comment" placeholder="Add a comment..." autocomplete="off">
+      <input class="form-control" name="comment" placeholder="Add a comment…" autocomplete="off">
     </form>
   </div>
 </div>