From ac944ec5650888f7686924ba0e687085b06fb059 Mon Sep 17 00:00:00 2001 From: jaranta Date: Sat, 2 Jun 2018 23:18:45 +0300 Subject: [PATCH 01/19] Add Finnish translations --- resources/lang/fi/auth.php | 19 +++++++++++++++++++ resources/lang/fi/notification.php | 8 ++++++++ resources/lang/fi/pagination.php | 19 +++++++++++++++++++ resources/lang/fi/passwords.php | 22 ++++++++++++++++++++++ resources/lang/fi/profile.php | 9 +++++++++ resources/lang/fi/timeline.php | 7 +++++++ 6 files changed, 84 insertions(+) create mode 100644 resources/lang/fi/auth.php create mode 100644 resources/lang/fi/notification.php create mode 100644 resources/lang/fi/pagination.php create mode 100644 resources/lang/fi/passwords.php create mode 100644 resources/lang/fi/profile.php create mode 100644 resources/lang/fi/timeline.php diff --git a/resources/lang/fi/auth.php b/resources/lang/fi/auth.php new file mode 100644 index 000000000..77de9921a --- /dev/null +++ b/resources/lang/fi/auth.php @@ -0,0 +1,19 @@ + 'Nämä kirjautumistiedot eivät vastaa tallennettuja', + 'throttle' => 'Liian monta kirjautumisyritystä. Yrityä uudelleen :seconds sekuntin kuluttua.', + +]; diff --git a/resources/lang/fi/notification.php b/resources/lang/fi/notification.php new file mode 100644 index 000000000..5bbae72a8 --- /dev/null +++ b/resources/lang/fi/notification.php @@ -0,0 +1,8 @@ + 'tykkäsi kuvastasi.', + 'startedFollowingYou' => 'alkoi seuraamaan sinua.', + +]; diff --git a/resources/lang/fi/pagination.php b/resources/lang/fi/pagination.php new file mode 100644 index 000000000..1650dd370 --- /dev/null +++ b/resources/lang/fi/pagination.php @@ -0,0 +1,19 @@ + '« Edellinen', + 'next' => 'Seuraava »', + +]; diff --git a/resources/lang/fi/passwords.php b/resources/lang/fi/passwords.php new file mode 100644 index 000000000..44c5a9d69 --- /dev/null +++ b/resources/lang/fi/passwords.php @@ -0,0 +1,22 @@ + 'Salasanan täytyy olla vähintään kuusi merkkiä ja vastata vahvistusta.', + 'reset' => 'Salasanasi on nollattu!', + 'sent' => 'Olemme lähettäneet salasanan nollauslinkin sähköpostitse!', + 'token' => 'Tämä salasanan nollauslinkki ei ole toimiva.', + 'user' => "Emme löydä käyttäjää tuolla sähköpostiosoitteella.", + +]; diff --git a/resources/lang/fi/profile.php b/resources/lang/fi/profile.php new file mode 100644 index 000000000..9199b77ef --- /dev/null +++ b/resources/lang/fi/profile.php @@ -0,0 +1,9 @@ + 'Tällä käyttäjällä ei ole vielä päivityksiä!', + 'emptyFollowers' => 'Tällä käyttäjällä ei ole vielä seuraajia!', + 'emptyFollowing' => 'Tämä käyttäjä ei vielä seuraa ketään!', + 'savedWarning' => 'Only you can see what you\'ve saved', + 'savedWarning' => 'Vain sinä voit nähdä, mitä olet tallentanut', +]; diff --git a/resources/lang/fi/timeline.php b/resources/lang/fi/timeline.php new file mode 100644 index 000000000..98b6fe3cd --- /dev/null +++ b/resources/lang/fi/timeline.php @@ -0,0 +1,7 @@ + 'Aikajanasi on tyhjä.' + +]; From 574e7207cb3bbfa881047a46a767fbdbc4c8c9bb Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 04:04:39 -0500 Subject: [PATCH 02/19] lowercase name in nodeinfo fix #164 --- app/Http/Controllers/FederationController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php index a5e7007ec..29711945d 100644 --- a/app/Http/Controllers/FederationController.php +++ b/app/Http/Controllers/FederationController.php @@ -94,7 +94,7 @@ class FederationController extends Controller 'outbound' => [] ], 'software' => [ - 'name' => 'PixelFed', + 'name' => 'pixelfed', 'version' => config('pixelfed.version') ], 'usage' => [ From 4c76d3dfbca3ac1ca4534a2f04e423fbe0d7f497 Mon Sep 17 00:00:00 2001 From: Isak Alexander Date: Sun, 3 Jun 2018 12:38:04 +0200 Subject: [PATCH 03/19] Fixed typos --- resources/lang/sv/validation.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/lang/sv/validation.php b/resources/lang/sv/validation.php index c98f55b4a..e7601aaf3 100644 --- a/resources/lang/sv/validation.php +++ b/resources/lang/sv/validation.php @@ -17,9 +17,9 @@ return [ 'active_url' => ':attribute är inte en giltig URL.', 'after' => ':attribute måste vara ett datum efter :date.', 'after_or_equal' => ':attribute måste vara ett datum efter eller samma som :date.', - 'alpha' => ':attribute får endast intehålla bokstäver.', - 'alpha_dash' => ':attribute får endast intehålla bokstäver, nummer, och bindestreck.', - 'alpha_num' => ':attribute får endast intehålla bokstäver och nummer.', + 'alpha' => ':attribute får endast innehålla bokstäver.', + 'alpha_dash' => ':attribute får endast innehålla bokstäver, nummer, och bindestreck.', + 'alpha_num' => ':attribute får endast innehålla bokstäver och nummer.', 'array' => ':attribute måste vara en array.', 'before' => ':attribute måste vara ett datum före :date.', 'before_or_equal' => ':attribute måste vara ett datum före eller samma som :date.', @@ -51,10 +51,10 @@ return [ 'ipv6' => ':attribute måste vara en giltig IPv6 adress.', 'json' => ':attribute måste vara en giltig JSON string.', 'max' => [ - 'numeric' => ':attribute får inte vara större than :max.', - 'file' => ':attribute får inte vara större than :max kilobyte.', - 'string' => ':attribute får inte vara större than :max tecken.', - 'array' => ':attribute får inte ha mer än :max objekt.', + 'numeric' => ':attribute får inte vara större än :max.', + 'file' => ':attribute får inte vara större än :max kilobyte.', + 'string' => ':attribute får inte vara större än :max tecken.', + 'array' => ':attribute får inte ha fler än :max objekt.', ], 'mimes' => ':attribute måste vara en fil av typ: :values.', 'mimetypes' => ':attribute måste vara en fil av typ: :values.', @@ -62,7 +62,7 @@ return [ 'numeric' => ':attribute måste vara åtminstone :min.', 'file' => ':attribute måste vara åtminstone :min kilobyte.', 'string' => ':attribute måste vara åtminstone :min tecken.', - 'array' => ':attribute måste have åtminstone :min objekt.', + 'array' => ':attribute måste innehålla åtminstone :min objekt.', ], 'not_in' => 'vald :attribute är ogiltig.', 'not_regex' => ':attribute formatet är ogiltigt.', @@ -74,7 +74,7 @@ return [ 'required_unless' => ':attribute fält krävs om inte :other är i :values.', 'required_with' => ':attribute fält krävs när :values finns.', 'required_with_all' => ':attribute fält krävs när :values finns.', - 'required_without' => ':attribute fält krvävs när :values inte finns.', + 'required_without' => ':attribute fält krävs när :values inte finns.', 'required_without_all' => ':attribute fält krävs när inga av :values finns.', 'same' => ':attribute och :other måste matcha.', 'size' => [ From a589987d6eaa338026daab1ad6edcca58a3ad100 Mon Sep 17 00:00:00 2001 From: Isak Alexander Date: Sun, 3 Jun 2018 13:10:59 +0200 Subject: [PATCH 04/19] Fixed language. --- resources/lang/sv/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/sv/auth.php b/resources/lang/sv/auth.php index 058317d63..2494b43ce 100644 --- a/resources/lang/sv/auth.php +++ b/resources/lang/sv/auth.php @@ -13,7 +13,7 @@ return [ | */ - 'failed' => 'Dessa autentiseringsuppgifter matchar inte de i vårt register.', + 'failed' => 'Dessa autentiseringsuppgifter matchar inte vårt register.', 'throttle' => 'För många inloggningsförsök. Var god försök igen om :seconds sekunder.', ]; From 875b32c5bc355203e89c6bdc97f202781ca74adc Mon Sep 17 00:00:00 2001 From: Isak Alexander Date: Sun, 3 Jun 2018 13:11:27 +0200 Subject: [PATCH 05/19] Fixed language. --- resources/lang/sv/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/sv/auth.php b/resources/lang/sv/auth.php index 058317d63..2494b43ce 100644 --- a/resources/lang/sv/auth.php +++ b/resources/lang/sv/auth.php @@ -13,7 +13,7 @@ return [ | */ - 'failed' => 'Dessa autentiseringsuppgifter matchar inte de i vårt register.', + 'failed' => 'Dessa autentiseringsuppgifter matchar inte vårt register.', 'throttle' => 'För många inloggningsförsök. Var god försök igen om :seconds sekunder.', ]; From 172c0c5d66740191e913b9df273ec466fe9061b8 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 15:04:02 +0200 Subject: [PATCH 06/19] Add border breakpoint --- resources/assets/sass/custom.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index a972f29d1..99dc7dbd4 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -173,3 +173,9 @@ body, button, input, textarea { background-size: cover; background-position: 50%; } + +@media (max-width: map-get($grid-breakpoints, "md")) { + .border-md-left-0 { + border-left:0!important + } +} From a96bf64388e6e3221801b9b9cf2b9168ccd2717a Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 15:05:23 +0200 Subject: [PATCH 07/19] Add breakpoined border to status --- resources/views/status/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 7e6ddc5dd..e9b45095a 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -8,7 +8,7 @@
-
+
From a9cc8239be3dba6ac4bae6512019e41c8eaf0503 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 18:07:18 +0200 Subject: [PATCH 08/19] Seperate info about user into new view --- .../views/profile/partial/user-info.blade.php | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 resources/views/profile/partial/user-info.blade.php diff --git a/resources/views/profile/partial/user-info.blade.php b/resources/views/profile/partial/user-info.blade.php new file mode 100644 index 000000000..23922e125 --- /dev/null +++ b/resources/views/profile/partial/user-info.blade.php @@ -0,0 +1,77 @@ +
+
+
+
+
+ +
+
+
+
+
+ {{$user->username}} + @if($owner == true) + + + + @elseif ($following == true) + + + + @elseif ($following == false) + + + + @endif + {{-- TODO: Implement action dropdown + + + + --}} +
+
+
+ {{$user->statuses()->whereNull('in_reply_to_id')->count()}} + Posts +
+ + +
+

+ {{$user->name}} + @if($user->remote_url) + REMOTE PROFILE + @endif + {{$user->bio}} +

+
+
+
+
+
From d03c762146f9c5651ecae2d21159ad8f2550af5e Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 18:19:13 +0200 Subject: [PATCH 09/19] Adapt show to new partial --- resources/views/profile/show.blade.php | 151 +++++++------------------ 1 file changed, 38 insertions(+), 113 deletions(-) diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index c2206387a..d1115ffee 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -2,134 +2,59 @@ @section('content') +@include('profile.partial.user-info') + +@if($owner == true) +
+ +
+@endif
- -
-
-
- -
-
-
-
-
- {{$user->username}} - @if($owner == true) - - - - @elseif ($following == true) - - - - @elseif ($following == false) - - - - @endif - {{-- TODO: Implement action dropdown - - - --}} -
-
-
- {{$user->statuses()->whereNull('in_reply_to_id')->count()}} - Posts -
- - -
-

- {{$user->name}} - @if($user->remote_url) - REMOTE PROFILE - @endif - {{$user->bio}} -

-
-
-
-
- @if($owner == true) -
- -
- @endif - @if($owner && request()->is('*/saved'))

{{__('profile.savedWarning')}}

@endif - @if($timeline->count() > 0) - @foreach($timeline as $status) -
- - + @endforeach @else -
-
-
-
-

{{ __('profile.emptyTimeline') }}

-
+
+
+
+
+

{{ __('profile.emptyTimeline') }}

+
@endif
-
@endsection From 412c3c81225a771cc67476a643e4f55486aad9f4 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 18:21:54 +0200 Subject: [PATCH 10/19] Adapt following to partial --- resources/views/profile/following.blade.php | 41 +-------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php index 27aae9eca..7985b7070 100644 --- a/resources/views/profile/following.blade.php +++ b/resources/views/profile/following.blade.php @@ -2,46 +2,9 @@ @section('content') +@include('profile.partial.user-info') +
- - -
@if($following->count() !== 0)
    From f09acf51b6677b7dd9301ab85b1dd850d57eb9d2 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 18:22:41 +0200 Subject: [PATCH 11/19] Adapt following to partial --- resources/views/profile/followers.blade.php | 41 +-------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php index 75ff0e939..1352f319f 100644 --- a/resources/views/profile/followers.blade.php +++ b/resources/views/profile/followers.blade.php @@ -2,46 +2,9 @@ @section('content') +@include('profile.partial.user-info') +
    - - -
    @if($followers->count() !== 0)
      From 022d23ff7978f70062dc59f7b9b2e1737f44c422 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 20:44:25 +0200 Subject: [PATCH 12/19] Restore link to user profile --- resources/views/profile/partial/user-info.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/profile/partial/user-info.blade.php b/resources/views/profile/partial/user-info.blade.php index 23922e125..13326794e 100644 --- a/resources/views/profile/partial/user-info.blade.php +++ b/resources/views/profile/partial/user-info.blade.php @@ -47,8 +47,10 @@
    From e4564828f3e07be1f16d1b2c650dc83904b8cb0a Mon Sep 17 00:00:00 2001 From: OpenAlgeria <39639882+OpenAlgeria@users.noreply.github.com> Date: Mon, 4 Jun 2018 01:10:50 +0200 Subject: [PATCH 13/19] Update French language timeline.php --- resources/lang/fr/timeline.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 resources/lang/fr/timeline.php diff --git a/resources/lang/fr/timeline.php b/resources/lang/fr/timeline.php new file mode 100644 index 000000000..90af02f24 --- /dev/null +++ b/resources/lang/fr/timeline.php @@ -0,0 +1,4 @@ + 'Votre chronologie est vide.' +]; From b6bf360d00a29a061dd5c1f5c0c2ca9a79056337 Mon Sep 17 00:00:00 2001 From: OpenAlgeria <39639882+OpenAlgeria@users.noreply.github.com> Date: Mon, 4 Jun 2018 01:13:40 +0200 Subject: [PATCH 14/19] Update French language notification.php --- resources/lang/fr/notification.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/fr/notification.php b/resources/lang/fr/notification.php index 1fab6b99d..96d3164db 100644 --- a/resources/lang/fr/notification.php +++ b/resources/lang/fr/notification.php @@ -1,4 +1,5 @@ 'a aimé votre photo.', + 'startedFollowingYou' => 'a commencé à vous suivre.', ]; From 7a57c3cd42ed64b2bd30c411b3682b62577646fb Mon Sep 17 00:00:00 2001 From: OpenAlgeria <39639882+OpenAlgeria@users.noreply.github.com> Date: Mon, 4 Jun 2018 01:18:42 +0200 Subject: [PATCH 15/19] Update French language profile.php --- resources/lang/fr/profile.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/fr/profile.php b/resources/lang/fr/profile.php index 3ca556717..02ac1ae87 100644 --- a/resources/lang/fr/profile.php +++ b/resources/lang/fr/profile.php @@ -1,4 +1,7 @@ 'Cet utilisateur n\'a pas encore de messages !', + 'emptyFollowers' => 'Cet utilisateur n`\'a pas encore d\'abonné-e-s!', + 'emptyFollowing' => 'Cet utilisateur ne suit pas encore quelqu\'un!', + 'savedWarning' => 'Vous seul pouvez voir ce que vous avez enregistré', ]; From 33ab1c987a523c497be37c2a6710948ff6f15090 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Mon, 4 Jun 2018 23:55:28 +0200 Subject: [PATCH 16/19] Add required html to improve status view --- resources/views/status/show.blade.php | 103 +++++++++++++++----------- 1 file changed, 59 insertions(+), 44 deletions(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 3060f9ce2..1459ba245 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -5,11 +5,24 @@
    +
    -
    +
    -
    -
    -

    - {{$status->profile->username}} - {!! $status->rendered ?? e($status->caption) !!} -

    -
    - @foreach($status->comments->reverse()->take(10) as $item) -

    - {{$item->profile->username}} - {!!$item->rendered!!} {{$item->created_at->diffForHumans(null, true, true ,true)}} +

    +
    +
    +

    + {{$status->profile->username}} + {!! $status->rendered ?? e($status->caption) !!}

    - @endforeach +
    + @foreach($status->comments->reverse()->take(10) as $item) +

    + {{$item->profile->username}} + {!!$item->rendered!!} {{$item->created_at->diffForHumans(null, true, true ,true)}} +

    + @endforeach +
    -
    -
    -
    - - - @if(Auth::check()) - @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true) -
    - @csrf - - - -
    - @endif - @endif - -
    +
    +
    + @csrf - -
    - +
    -