From 1664095c3de5bdbc3c507af70aa6787d0cd19e9c Mon Sep 17 00:00:00 2001 From: voss Date: Mon, 28 May 2018 22:41:18 +0100 Subject: [PATCH 01/18] some translations done. --- resources/lang/da/auth.php | 19 +++++ resources/lang/da/notification.php | 7 ++ resources/lang/da/pagination.php | 19 +++++ resources/lang/da/passwords.php | 22 ++++++ resources/lang/da/profile.php | 5 ++ resources/lang/da/validation.php | 122 +++++++++++++++++++++++++++++ 6 files changed, 194 insertions(+) create mode 100644 resources/lang/da/auth.php create mode 100644 resources/lang/da/notification.php create mode 100644 resources/lang/da/pagination.php create mode 100644 resources/lang/da/passwords.php create mode 100644 resources/lang/da/profile.php create mode 100644 resources/lang/da/validation.php diff --git a/resources/lang/da/auth.php b/resources/lang/da/auth.php new file mode 100644 index 000000000..8eb3d4fc8 --- /dev/null +++ b/resources/lang/da/auth.php @@ -0,0 +1,19 @@ + 'Disse oplysninger stemmer ikke overens med vores data.', + 'throttle' => 'For mange login-forsøg. Vær venlig at prøve igen om :seconds seconds.', + +]; diff --git a/resources/lang/da/notification.php b/resources/lang/da/notification.php new file mode 100644 index 000000000..6024d9b16 --- /dev/null +++ b/resources/lang/da/notification.php @@ -0,0 +1,7 @@ + 'syntes om dit billede.', + +]; \ No newline at end of file diff --git a/resources/lang/da/pagination.php b/resources/lang/da/pagination.php new file mode 100644 index 000000000..f0fb56aea --- /dev/null +++ b/resources/lang/da/pagination.php @@ -0,0 +1,19 @@ + '« Tidligere', + 'next' => 'Næste »', + +]; diff --git a/resources/lang/da/passwords.php b/resources/lang/da/passwords.php new file mode 100644 index 000000000..a41bd59ae --- /dev/null +++ b/resources/lang/da/passwords.php @@ -0,0 +1,22 @@ + 'Adgangskode skal være mindst 6 tegn og skal matche bekræftelsen.', + 'reset' => 'Din adgangskode er blevet nulstillet!', + 'sent' => 'Vi har sendt dig en email med et link, hvor du kan nulstille din andgangskode!', + 'token' => 'Dette nulstillingslink er ikke længere gyldigt.', + 'user' => "Vi kan ikke finde en bruger med den emailadresse.", + +]; diff --git a/resources/lang/da/profile.php b/resources/lang/da/profile.php new file mode 100644 index 000000000..e19ae40ab --- /dev/null +++ b/resources/lang/da/profile.php @@ -0,0 +1,5 @@ + 'Denne bruger har ikke postet noget endnu!', +]; \ No newline at end of file diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php new file mode 100644 index 000000000..490e1c07e --- /dev/null +++ b/resources/lang/da/validation.php @@ -0,0 +1,122 @@ + ':attribute skal accepteres.', + 'active_url' => ':attribute er ikke en gyldig URL.', + 'after' => ':attribute skal være en dato efter :date.', + 'after_or_equal' => ':attribute skal være en dato ens med, eller efter :date.', + 'alpha' => ':attribute må kun indeholde bogstaver.', + 'alpha_dash' => ':attribute må kun indeholde bogstaver, tal og bindestreger.', + 'alpha_num' => ':attribute må kun indeholde bogstaver og tal.', + 'array' => ':attribute skal være en array.', + 'before' => ':attribute skal være en dato før :date.', + 'before_or_equal' => ':attribute skal være en dato før, eller det samme som :date.', + 'between' => [ + 'numeric' => ':attribute skal være mellem :min og :max.', + 'file' => ':attribute skal være mellem :min og :max kilobytes.', + 'string' => ':attribute skal være mellem :min og :max tegn.', + 'array' => ':attribute skal være mellem :min og :max elementer.', + ], + 'boolean' => ':attribute felt skal være sandt eller falsk.', + 'confirmed' => ':attribute bekræftelse matcher ikke.', + 'date' => ':attribute er ikke en gyldig dato.', + 'date_format' => ':attribute matcher ikke formatet :format.', + 'different' => ':attribute og :other skal være forskellige.', + 'digits' => ':attribute must be :digits digits.', + 'digits_between' => ':attribute must be between :min and :max digits.', + 'dimensions' => ':attribute has invalid image dimensions.', + 'distinct' => ':attribute field has a duplicate value.', + 'email' => ':attribute must be a valid email address.', + 'exists' => 'The selected :attribute is invalid.', + 'file' => ':attribute must be a file.', + 'filled' => ':attribute field must have a value.', + 'image' => ':attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'in_array' => ':attribute field does not exist in :other.', + 'integer' => ':attribute must be an integer.', + 'ip' => ':attribute must be a valid IP address.', + 'ipv4' => ':attribute must be a valid IPv4 address.', + 'ipv6' => ':attribute must be a valid IPv6 address.', + 'json' => ':attribute must be a valid JSON string.', + 'max' => [ + 'numeric' => ':attribute may not be greater than :max.', + 'file' => ':attribute may not be greater than :max kilobytes.', + 'string' => ':attribute may not be greater than :max characters.', + 'array' => ':attribute may not have more than :max items.', + ], + 'mimes' => ':attribute must be a file of type: :values.', + 'mimetypes' => ':attribute must be a file of type: :values.', + 'min' => [ + 'numeric' => ':attribute must be at least :min.', + 'file' => ':attribute must be at least :min kilobytes.', + 'string' => ':attribute must be at least :min characters.', + 'array' => ':attribute must have at least :min items.', + ], + 'not_in' => 'The selected :attribute is invalid.', + 'not_regex' => ':attribute format is invalid.', + 'numeric' => ':attribute must be a number.', + 'present' => ':attribute field must be present.', + 'regex' => ':attribute format is invalid.', + 'required' => ':attribute field is required.', + 'required_if' => ':attribute field is required when :other is :value.', + 'required_unless' => ':attribute field is required unless :other is in :values.', + 'required_with' => ':attribute field is required when :values is present.', + 'required_with_all' => ':attribute field is required when :values is present.', + 'required_without' => ':attribute field is required when :values is not present.', + 'required_without_all' => ':attribute field is required when none of :values are present.', + 'same' => ':attribute and :other must match.', + 'size' => [ + 'numeric' => ':attribute must be :size.', + 'file' => ':attribute must be :size kilobytes.', + 'string' => ':attribute must be :size characters.', + 'array' => ':attribute must contain :size items.', + ], + 'string' => ':attribute must be a string.', + 'timezone' => ':attribute must be a valid zone.', + 'unique' => ':attribute has already been taken.', + 'uploaded' => ':attribute failed to upload.', + 'url' => ':attribute format is invalid.', + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'custom-message', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as E-Mail Address instead + | of "email". This simply helps us make messages a little cleaner. + | + */ + + 'attributes' => [], + +]; From 9fbcf225b9bbb31503c45121dea78a651f20deff Mon Sep 17 00:00:00 2001 From: voss Date: Tue, 29 May 2018 21:09:59 +0100 Subject: [PATCH 02/18] Danish translations done. --- resources/lang/da/auth.php | 4 +- resources/lang/da/pagination.php | 4 +- resources/lang/da/validation.php | 98 ++++++++++++++++---------------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/resources/lang/da/auth.php b/resources/lang/da/auth.php index 8eb3d4fc8..a399897f8 100644 --- a/resources/lang/da/auth.php +++ b/resources/lang/da/auth.php @@ -13,7 +13,7 @@ return [ | */ - 'failed' => 'Disse oplysninger stemmer ikke overens med vores data.', - 'throttle' => 'For mange login-forsøg. Vær venlig at prøve igen om :seconds seconds.', + 'failed' => 'Disse oplysninger stemmer ikke overens med nogen konto.', + 'throttle' => 'For mange loginforsøg. Vær venlig at prøve igen om :seconds sekunder.', ]; diff --git a/resources/lang/da/pagination.php b/resources/lang/da/pagination.php index f0fb56aea..d21965d92 100644 --- a/resources/lang/da/pagination.php +++ b/resources/lang/da/pagination.php @@ -13,7 +13,7 @@ return [ | */ - 'previous' => '« Tidligere', - 'next' => 'Næste »', + 'previous' => '« forrige', + 'next' => 'næste »', ]; diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php index 490e1c07e..571a64a01 100644 --- a/resources/lang/da/validation.php +++ b/resources/lang/da/validation.php @@ -20,7 +20,7 @@ return [ 'alpha' => ':attribute må kun indeholde bogstaver.', 'alpha_dash' => ':attribute må kun indeholde bogstaver, tal og bindestreger.', 'alpha_num' => ':attribute må kun indeholde bogstaver og tal.', - 'array' => ':attribute skal være en array.', + 'array' => ':attribute skal være en Array.', 'before' => ':attribute skal være en dato før :date.', 'before_or_equal' => ':attribute skal være en dato før, eller det samme som :date.', 'between' => [ @@ -34,60 +34,60 @@ return [ 'date' => ':attribute er ikke en gyldig dato.', 'date_format' => ':attribute matcher ikke formatet :format.', 'different' => ':attribute og :other skal være forskellige.', - 'digits' => ':attribute must be :digits digits.', - 'digits_between' => ':attribute must be between :min and :max digits.', - 'dimensions' => ':attribute has invalid image dimensions.', - 'distinct' => ':attribute field has a duplicate value.', - 'email' => ':attribute must be a valid email address.', - 'exists' => 'The selected :attribute is invalid.', - 'file' => ':attribute must be a file.', - 'filled' => ':attribute field must have a value.', - 'image' => ':attribute must be an image.', - 'in' => 'The selected :attribute is invalid.', - 'in_array' => ':attribute field does not exist in :other.', - 'integer' => ':attribute must be an integer.', - 'ip' => ':attribute must be a valid IP address.', - 'ipv4' => ':attribute must be a valid IPv4 address.', - 'ipv6' => ':attribute must be a valid IPv6 address.', - 'json' => ':attribute must be a valid JSON string.', + 'digits' => ':attribute skal være :digits tal.', + 'digits_between' => ':attribute skal være mellem :min og :max tal.', + 'dimensions' => ':attribute har ugyldige billeddimensioner.', + 'distinct' => ':attribute-felt har en dobbeltværdi.', + 'email' => ':attribute skal være en gyldig emailadresse.', + 'exists' => 'Den valgte :attribute er ugyldig.', + 'file' => ':attribute skal være en fil.', + 'filled' => 'Feltet :attribute skal have en værdi.', + 'image' => ':attribute skal være et billede.', + 'in' => 'Den valgte :attribute er ugyldig.', + 'in_array' => ':attribute feltet findes ikke i :other.', + 'integer' => ':attribute skal være et heltal.', + 'ip' => ':attribute skal være en gyldig IP-adresse.', + 'ipv4' => ':attribute skal være en gyldig IPv4 adresse.', + 'ipv6' => ':attribute skal være en gyldig IPv6 adresse.', + 'json' => ':attribute skal være en gyldig JSON string.', 'max' => [ - 'numeric' => ':attribute may not be greater than :max.', - 'file' => ':attribute may not be greater than :max kilobytes.', - 'string' => ':attribute may not be greater than :max characters.', - 'array' => ':attribute may not have more than :max items.', + 'numeric' => ':attribute må ikke være større end :max.', + 'file' => ':attribute må ikke være større end :max kilobytes.', + 'string' => ':attribute må ikke være større end :max tegn.', + 'array' => ':attribute må ikke have mere end :max elementer.', ], - 'mimes' => ':attribute must be a file of type: :values.', - 'mimetypes' => ':attribute must be a file of type: :values.', + 'mimes' => ':attribute skal være en fil af typen: :values.', + 'mimetypes' => ':attribute skal være en fil af typen: :values.', 'min' => [ - 'numeric' => ':attribute must be at least :min.', - 'file' => ':attribute must be at least :min kilobytes.', - 'string' => ':attribute must be at least :min characters.', - 'array' => ':attribute must have at least :min items.', + 'numeric' => ':attribute skal være mindst :min.', + 'file' => ':attribute skal være mindst :min kilobytes.', + 'string' => ':attribute skal være mindst :min tegn.', + 'array' => ':attribute skal være mindst :min elementer.', ], - 'not_in' => 'The selected :attribute is invalid.', - 'not_regex' => ':attribute format is invalid.', - 'numeric' => ':attribute must be a number.', - 'present' => ':attribute field must be present.', - 'regex' => ':attribute format is invalid.', - 'required' => ':attribute field is required.', - 'required_if' => ':attribute field is required when :other is :value.', - 'required_unless' => ':attribute field is required unless :other is in :values.', - 'required_with' => ':attribute field is required when :values is present.', - 'required_with_all' => ':attribute field is required when :values is present.', - 'required_without' => ':attribute field is required when :values is not present.', - 'required_without_all' => ':attribute field is required when none of :values are present.', - 'same' => ':attribute and :other must match.', + 'not_in' => 'Den valgte :attribute er ugyldig.', + 'not_regex' => ':attribute format er ugyldigt.', + 'numeric' => ':attribute skal være et tal.', + 'present' => ':attribute feltet skal være til stede.', + 'regex' => ':attribute format er ugyldigt.', + 'required' => ':attribute felt er påkrævet.', + 'required_if' => ':attribute felt er påkrævet når :other er :value.', + 'required_unless' => ':attribute felt er påkrævet medmindre :other er i :values.', + 'required_with' => ':attribute felt er påkrævet når :values er tilstede.', + 'required_with_all' => ':attribute felt er påkrævet når :values er tilstede.', + 'required_without' => ':attribute felt er påkrævet når :values ikke er tilstede.', + 'required_without_all' => ':attribute felt er påkrævet når ingen af :values er tilstede.', + 'same' => ':attribute og :other skal være ens.', 'size' => [ - 'numeric' => ':attribute must be :size.', - 'file' => ':attribute must be :size kilobytes.', - 'string' => ':attribute must be :size characters.', - 'array' => ':attribute must contain :size items.', + 'numeric' => ':attribute skal være :size.', + 'file' => ':attribute skal være :size kilobytes.', + 'string' => ':attribute skal være :size tegn.', + 'array' => ':attribute skal indeholde :size elementer.', ], - 'string' => ':attribute must be a string.', - 'timezone' => ':attribute must be a valid zone.', - 'unique' => ':attribute has already been taken.', - 'uploaded' => ':attribute failed to upload.', - 'url' => ':attribute format is invalid.', + 'string' => ':attribute skal være en streng.', + 'timezone' => ':attribute skal være en gyldig zone.', + 'unique' => ':attribute er allerede taget.', + 'uploaded' => ':attribute kunne ikke uploades.', + 'url' => ':attribute format er ugyldigt.', /* |-------------------------------------------------------------------------- From 8148e61415cc9458914f7f8913914eb8dce7a31c Mon Sep 17 00:00:00 2001 From: voss Date: Tue, 29 May 2018 21:47:44 +0100 Subject: [PATCH 03/18] Changed Danish characters to HTML encoded versions. --- resources/lang/da/auth.php | 2 +- resources/lang/da/pagination.php | 2 +- resources/lang/da/passwords.php | 4 +- resources/lang/da/validation.php | 104 +++++++++++++++---------------- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/resources/lang/da/auth.php b/resources/lang/da/auth.php index a399897f8..4a14729fd 100644 --- a/resources/lang/da/auth.php +++ b/resources/lang/da/auth.php @@ -14,6 +14,6 @@ return [ */ 'failed' => 'Disse oplysninger stemmer ikke overens med nogen konto.', - 'throttle' => 'For mange loginforsøg. Vær venlig at prøve igen om :seconds sekunder.', + 'throttle' => 'For mange loginforsøg. Vær venlig at prøve igen om :seconds sekunder.', ]; diff --git a/resources/lang/da/pagination.php b/resources/lang/da/pagination.php index d21965d92..c4d70ab5b 100644 --- a/resources/lang/da/pagination.php +++ b/resources/lang/da/pagination.php @@ -14,6 +14,6 @@ return [ */ 'previous' => '« forrige', - 'next' => 'næste »', + 'next' => 'næste »', ]; diff --git a/resources/lang/da/passwords.php b/resources/lang/da/passwords.php index a41bd59ae..366a1643a 100644 --- a/resources/lang/da/passwords.php +++ b/resources/lang/da/passwords.php @@ -13,10 +13,10 @@ return [ | */ - 'password' => 'Adgangskode skal være mindst 6 tegn og skal matche bekræftelsen.', + 'password' => 'Adgangskode skal være mindst 6 tegn og skal matche bekræftelsen.', 'reset' => 'Din adgangskode er blevet nulstillet!', 'sent' => 'Vi har sendt dig en email med et link, hvor du kan nulstille din andgangskode!', - 'token' => 'Dette nulstillingslink er ikke længere gyldigt.', + 'token' => 'Dette nulstillingslink er ikke længere gyldigt.', 'user' => "Vi kan ikke finde en bruger med den emailadresse.", ]; diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php index 571a64a01..280a2df9a 100644 --- a/resources/lang/da/validation.php +++ b/resources/lang/da/validation.php @@ -15,76 +15,76 @@ return [ 'accepted' => ':attribute skal accepteres.', 'active_url' => ':attribute er ikke en gyldig URL.', - 'after' => ':attribute skal være en dato efter :date.', - 'after_or_equal' => ':attribute skal være en dato ens med, eller efter :date.', - 'alpha' => ':attribute må kun indeholde bogstaver.', - 'alpha_dash' => ':attribute må kun indeholde bogstaver, tal og bindestreger.', - 'alpha_num' => ':attribute må kun indeholde bogstaver og tal.', - 'array' => ':attribute skal være en Array.', - 'before' => ':attribute skal være en dato før :date.', - 'before_or_equal' => ':attribute skal være en dato før, eller det samme som :date.', + 'after' => ':attribute skal være en dato efter :date.', + 'after_or_equal' => ':attribute skal være en dato ens med, eller efter :date.', + 'alpha' => ':attribute må kun indeholde bogstaver.', + 'alpha_dash' => ':attribute må kun indeholde bogstaver, tal og bindestreger.', + 'alpha_num' => ':attribute må kun indeholde bogstaver og tal.', + 'array' => ':attribute skal være en Array.', + 'before' => ':attribute skal være en dato før :date.', + 'before_or_equal' => ':attribute skal være en dato før, eller det samme som :date.', 'between' => [ - 'numeric' => ':attribute skal være mellem :min og :max.', - 'file' => ':attribute skal være mellem :min og :max kilobytes.', - 'string' => ':attribute skal være mellem :min og :max tegn.', - 'array' => ':attribute skal være mellem :min og :max elementer.', + 'numeric' => ':attribute skal være mellem :min og :max.', + 'file' => ':attribute skal være mellem :min og :max kilobytes.', + 'string' => ':attribute skal være mellem :min og :max tegn.', + 'array' => ':attribute skal være mellem :min og :max elementer.', ], - 'boolean' => ':attribute felt skal være sandt eller falsk.', - 'confirmed' => ':attribute bekræftelse matcher ikke.', + 'boolean' => ':attribute felt skal være sandt eller falsk.', + 'confirmed' => ':attribute bekræftelse matcher ikke.', 'date' => ':attribute er ikke en gyldig dato.', 'date_format' => ':attribute matcher ikke formatet :format.', - 'different' => ':attribute og :other skal være forskellige.', - 'digits' => ':attribute skal være :digits tal.', - 'digits_between' => ':attribute skal være mellem :min og :max tal.', + 'different' => ':attribute og :other skal være forskellige.', + 'digits' => ':attribute skal være :digits tal.', + 'digits_between' => ':attribute skal være mellem :min og :max tal.', 'dimensions' => ':attribute har ugyldige billeddimensioner.', - 'distinct' => ':attribute-felt har en dobbeltværdi.', - 'email' => ':attribute skal være en gyldig emailadresse.', + 'distinct' => ':attribute-felt har en dobbeltværdi.', + 'email' => ':attribute skal være en gyldig emailadresse.', 'exists' => 'Den valgte :attribute er ugyldig.', - 'file' => ':attribute skal være en fil.', - 'filled' => 'Feltet :attribute skal have en værdi.', - 'image' => ':attribute skal være et billede.', + 'file' => ':attribute skal være en fil.', + 'filled' => 'Feltet :attribute skal have en værdi.', + 'image' => ':attribute skal være et billede.', 'in' => 'Den valgte :attribute er ugyldig.', 'in_array' => ':attribute feltet findes ikke i :other.', - 'integer' => ':attribute skal være et heltal.', - 'ip' => ':attribute skal være en gyldig IP-adresse.', - 'ipv4' => ':attribute skal være en gyldig IPv4 adresse.', - 'ipv6' => ':attribute skal være en gyldig IPv6 adresse.', - 'json' => ':attribute skal være en gyldig JSON string.', + 'integer' => ':attribute skal være et heltal.', + 'ip' => ':attribute skal være en gyldig IP-adresse.', + 'ipv4' => ':attribute skal være en gyldig IPv4 adresse.', + 'ipv6' => ':attribute skal være en gyldig IPv6 adresse.', + 'json' => ':attribute skal være en gyldig JSON string.', 'max' => [ - 'numeric' => ':attribute må ikke være større end :max.', - 'file' => ':attribute må ikke være større end :max kilobytes.', - 'string' => ':attribute må ikke være større end :max tegn.', - 'array' => ':attribute må ikke have mere end :max elementer.', + 'numeric' => ':attribute må ikke være større end :max.', + 'file' => ':attribute må ikke være større end :max kilobytes.', + 'string' => ':attribute må ikke være større end :max tegn.', + 'array' => ':attribute må ikke have mere end :max elementer.', ], - 'mimes' => ':attribute skal være en fil af typen: :values.', - 'mimetypes' => ':attribute skal være en fil af typen: :values.', + 'mimes' => ':attribute skal være en fil af typen: :values.', + 'mimetypes' => ':attribute skal være en fil af typen: :values.', 'min' => [ - 'numeric' => ':attribute skal være mindst :min.', - 'file' => ':attribute skal være mindst :min kilobytes.', - 'string' => ':attribute skal være mindst :min tegn.', - 'array' => ':attribute skal være mindst :min elementer.', + 'numeric' => ':attribute skal være mindst :min.', + 'file' => ':attribute skal være mindst :min kilobytes.', + 'string' => ':attribute skal være mindst :min tegn.', + 'array' => ':attribute skal være mindst :min elementer.', ], 'not_in' => 'Den valgte :attribute er ugyldig.', 'not_regex' => ':attribute format er ugyldigt.', - 'numeric' => ':attribute skal være et tal.', - 'present' => ':attribute feltet skal være til stede.', + 'numeric' => ':attribute skal være et tal.', + 'present' => ':attribute feltet skal være til stede.', 'regex' => ':attribute format er ugyldigt.', - 'required' => ':attribute felt er påkrævet.', - 'required_if' => ':attribute felt er påkrævet når :other er :value.', - 'required_unless' => ':attribute felt er påkrævet medmindre :other er i :values.', - 'required_with' => ':attribute felt er påkrævet når :values er tilstede.', - 'required_with_all' => ':attribute felt er påkrævet når :values er tilstede.', - 'required_without' => ':attribute felt er påkrævet når :values ikke er tilstede.', - 'required_without_all' => ':attribute felt er påkrævet når ingen af :values er tilstede.', - 'same' => ':attribute og :other skal være ens.', + 'required' => ':attribute felt er påkrævet.', + 'required_if' => ':attribute felt er påkrævet når :other er :value.', + 'required_unless' => ':attribute felt er påkrævet medmindre :other er i :values.', + 'required_with' => ':attribute felt er påkrævet når :values er tilstede.', + 'required_with_all' => ':attribute felt er påkrævet når :values er tilstede.', + 'required_without' => ':attribute felt er påkrævet når :values ikke er tilstede.', + 'required_without_all' => ':attribute felt er påkrævet når ingen af :values er tilstede.', + 'same' => ':attribute og :other skal være ens.', 'size' => [ - 'numeric' => ':attribute skal være :size.', - 'file' => ':attribute skal være :size kilobytes.', - 'string' => ':attribute skal være :size tegn.', + 'numeric' => ':attribute skal være :size.', + 'file' => ':attribute skal være :size kilobytes.', + 'string' => ':attribute skal være :size tegn.', 'array' => ':attribute skal indeholde :size elementer.', ], - 'string' => ':attribute skal være en streng.', - 'timezone' => ':attribute skal være en gyldig zone.', + 'string' => ':attribute skal være en streng.', + 'timezone' => ':attribute skal være en gyldig zone.', 'unique' => ':attribute er allerede taget.', 'uploaded' => ':attribute kunne ikke uploades.', 'url' => ':attribute format er ugyldigt.', From 9f0120443e2544d09e4ef34f7c8bb379bd32b33e Mon Sep 17 00:00:00 2001 From: Whaxion Date: Fri, 1 Jun 2018 21:42:30 +0200 Subject: [PATCH 04/18] Change id to username in users list --- resources/views/admin/users/home.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/admin/users/home.blade.php b/resources/views/admin/users/home.blade.php index e19c98ff7..76c862724 100644 --- a/resources/views/admin/users/home.blade.php +++ b/resources/views/admin/users/home.blade.php @@ -10,7 +10,7 @@ - + @@ -21,8 +21,8 @@ @foreach($users as $user) From 20a29acacfe75d35617984ac27e4f9ae5053e930 Mon Sep 17 00:00:00 2001 From: Whaxion Date: Fri, 1 Jun 2018 23:12:53 +0200 Subject: [PATCH 05/18] Take username on user and not on profile --- resources/views/admin/users/home.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/admin/users/home.blade.php b/resources/views/admin/users/home.blade.php index 76c862724..ad09937f2 100644 --- a/resources/views/admin/users/home.blade.php +++ b/resources/views/admin/users/home.blade.php @@ -22,7 +22,7 @@ @@ -48,4 +48,4 @@ }); }); -@endpush \ No newline at end of file +@endpush From 840ea0b41bd738ce98c90c956696fea3584bb0e1 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 07:22:20 +0200 Subject: [PATCH 06/18] Update app.blade.php --- resources/views/layouts/app.blade.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index e25fe9249..79cae0a5a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -19,12 +19,10 @@ @include('layouts.partial.nav') -
+
@yield('content')
-
- @include('layouts.partial.footer') -
+ @include('layouts.partial.footer') @stack('scripts') From ddbf0adb67e4f2d493dfc167b1606dd78d130884 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 07:26:24 +0200 Subject: [PATCH 07/18] Add CSS to keep footer always at the bottom --- resources/assets/sass/custom.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index e84a5dac5..15d11bb10 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -1,3 +1,15 @@ +html, body { + min-height:100vh; +} + +body { + display: flex; + flex-flow: column; +} + +#content { + margin-bottom: auto !important; +} body, button, input, textarea { font-family: -apple-system,BlinkMacSystemFont,"Segoe UI", Roboto,Helvetica,Arial,sans-serif; From da417a55454b4d25b5e3d47869571e9e4e831f81 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 07:27:55 +0200 Subject: [PATCH 08/18] Remove useless padding from footer --- resources/views/layouts/partial/footer.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/layouts/partial/footer.blade.php b/resources/views/layouts/partial/footer.blade.php index 7cc7f6551..29cd2d2d1 100644 --- a/resources/views/layouts/partial/footer.blade.php +++ b/resources/views/layouts/partial/footer.blade.php @@ -1,6 +1,6 @@ - From 41683db2b4bd8efe6c4c93e97e73989454dc35c5 Mon Sep 17 00:00:00 2001 From: Derek Schmidt Date: Fri, 1 Jun 2018 23:58:23 -0700 Subject: [PATCH 09/18] Ignore hashtags that begin with a ampersand Fixes #131 This is usually a marker of an HTML entity code. It is possible for a user to do this on purpose, but not horribly likely. i hope --- app/Util/Lexer/Hashtag.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Util/Lexer/Hashtag.php b/app/Util/Lexer/Hashtag.php index 9f19ed897..3b27f0dd7 100644 --- a/app/Util/Lexer/Hashtag.php +++ b/app/Util/Lexer/Hashtag.php @@ -7,7 +7,7 @@ class Hashtag { public static function getHashtags($status) { $hashtags = false; - preg_match_all("/(#\w+)/u", $status, $matches); + preg_match_all("/(? Date: Sat, 2 Jun 2018 10:20:46 +0200 Subject: [PATCH 10/18] Update welcome.blade.php --- resources/views/welcome.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 9a140cf63..855c3fb7a 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -8,3 +8,7 @@ @endsection + +@push('meta') + +@endpush From 4c48a942d711813b14af14286f197d6f8c0fca51 Mon Sep 17 00:00:00 2001 From: voss Date: Sat, 2 Jun 2018 17:46:12 +0100 Subject: [PATCH 11/18] fixed typo and made changes based on feedback from @zatnosk. --- resources/lang/da/passwords.php | 2 +- resources/lang/da/validation.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/da/passwords.php b/resources/lang/da/passwords.php index 366a1643a..ee117c41e 100644 --- a/resources/lang/da/passwords.php +++ b/resources/lang/da/passwords.php @@ -15,7 +15,7 @@ return [ 'password' => 'Adgangskode skal være mindst 6 tegn og skal matche bekræftelsen.', 'reset' => 'Din adgangskode er blevet nulstillet!', - 'sent' => 'Vi har sendt dig en email med et link, hvor du kan nulstille din andgangskode!', + 'sent' => 'Vi har sendt dig en email med et link, hvor du kan nulstille din adgangskode!', 'token' => 'Dette nulstillingslink er ikke længere gyldigt.', 'user' => "Vi kan ikke finde en bruger med den emailadresse.", diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php index 280a2df9a..2f2f555f2 100644 --- a/resources/lang/da/validation.php +++ b/resources/lang/da/validation.php @@ -20,7 +20,7 @@ return [ 'alpha' => ':attribute må kun indeholde bogstaver.', 'alpha_dash' => ':attribute må kun indeholde bogstaver, tal og bindestreger.', 'alpha_num' => ':attribute må kun indeholde bogstaver og tal.', - 'array' => ':attribute skal være en Array.', + 'array' => ':attribute skal være et Array.', 'before' => ':attribute skal være en dato før :date.', 'before_or_equal' => ':attribute skal være en dato før, eller det samme som :date.', 'between' => [ @@ -49,7 +49,7 @@ return [ 'ip' => ':attribute skal være en gyldig IP-adresse.', 'ipv4' => ':attribute skal være en gyldig IPv4 adresse.', 'ipv6' => ':attribute skal være en gyldig IPv6 adresse.', - 'json' => ':attribute skal være en gyldig JSON string.', + 'json' => ':attribute skal være en gyldig JSON-streng.', 'max' => [ 'numeric' => ':attribute må ikke være større end :max.', 'file' => ':attribute må ikke være større end :max kilobytes.', From 76f23cb2084fb63ad799c8b48ca16711c8b99685 Mon Sep 17 00:00:00 2001 From: hellcp Date: Sat, 2 Jun 2018 20:11:08 +0200 Subject: [PATCH 12/18] Introduce opengraph tags to the service --- .htaccess | 1 + resources/views/discover/home.blade.php | 6 +++++- resources/views/discover/tags/show.blade.php | 6 +++++- resources/views/home.blade.php | 4 ++-- resources/views/layouts/app.blade.php | 15 +++++++++++++-- resources/views/profile/followers.blade.php | 7 ++++++- resources/views/profile/following.blade.php | 7 ++++++- resources/views/profile/show.blade.php | 9 +++++++-- resources/views/site/about.blade.php | 6 +++++- resources/views/site/bannedinstances.blade.php | 6 +++++- resources/views/site/features.blade.php | 6 +++++- resources/views/site/fediverse.blade.php | 6 +++++- resources/views/site/help.blade.php | 6 +++++- resources/views/site/libraries.blade.php | 6 +++++- resources/views/site/opensource.blade.php | 6 +++++- resources/views/site/partial/template.blade.php | 4 ++-- resources/views/site/platform.blade.php | 6 +++++- resources/views/site/privacy.blade.php | 6 +++++- resources/views/site/terms.blade.php | 6 +++++- resources/views/status/show.blade.php | 9 +++++++-- resources/views/welcome.blade.php | 2 +- 21 files changed, 105 insertions(+), 25 deletions(-) create mode 100644 .htaccess diff --git a/.htaccess b/.htaccess new file mode 100644 index 000000000..14249c50b --- /dev/null +++ b/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/resources/views/discover/home.blade.php b/resources/views/discover/home.blade.php index 0bce0f326..5bd9e3c3b 100644 --- a/resources/views/discover/home.blade.php +++ b/resources/views/discover/home.blade.php @@ -41,4 +41,8 @@ -@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/discover/tags/show.blade.php b/resources/views/discover/tags/show.blade.php index bacc30178..3099b3e41 100644 --- a/resources/views/discover/tags/show.blade.php +++ b/resources/views/discover/tags/show.blade.php @@ -34,4 +34,8 @@ -@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 740323892..2f7b05cd3 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.app',['title' => 'Welcome to ' . config('app.name')]) @section('content')
@@ -29,7 +29,7 @@ @endsection @push('meta') - + @endpush diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index e25fe9249..cfc7c2a1e 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -7,10 +7,21 @@ - {{ config('app.name', 'Laravel') }} - + + + + {{ $title or config('app.name', 'Laravel') }} + + + + + @stack('meta') + + + + diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php index 58e79a3b4..e695ff686 100644 --- a/resources/views/profile/followers.blade.php +++ b/resources/views/profile/followers.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.app',['title' => $user->username . "'s followers"]) @section('content') @@ -95,3 +95,8 @@
@endsection + +@push('meta') + + +@endpush diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php index f04ca85e4..bce6b001a 100644 --- a/resources/views/profile/following.blade.php +++ b/resources/views/profile/following.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.app',['title' => $user->username . "'s follows"]) @section('content') @@ -95,3 +95,8 @@ @endsection + +@push('meta') + + +@endpush diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index bb6d57a65..4dc1b3a2c 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.app',['title' => $user->username . " on " . config('app.name')]) @section('content') @@ -120,4 +120,9 @@ -@endsection \ No newline at end of file +@endsection + +@push('meta') + + +@endpush diff --git a/resources/views/site/about.blade.php b/resources/views/site/about.blade.php index 433d3f283..a8d17eb05 100644 --- a/resources/views/site/about.blade.php +++ b/resources/views/site/about.blade.php @@ -9,4 +9,8 @@

PixelFed is a federated image sharing platform, powered by the ActivityPub protocol.

-@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/site/bannedinstances.blade.php b/resources/views/site/bannedinstances.blade.php index aca13d885..c52aa4ed7 100644 --- a/resources/views/site/bannedinstances.blade.php +++ b/resources/views/site/bannedinstances.blade.php @@ -6,4 +6,8 @@

Banned Instances

-@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/site/features.blade.php b/resources/views/site/features.blade.php index 6d7ea4cdb..d2ba7f1e1 100644 --- a/resources/views/site/features.blade.php +++ b/resources/views/site/features.blade.php @@ -6,4 +6,8 @@

Features

-@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/site/fediverse.blade.php b/resources/views/site/fediverse.blade.php index 2f7cc9ddd..436f73332 100644 --- a/resources/views/site/fediverse.blade.php +++ b/resources/views/site/fediverse.blade.php @@ -14,4 +14,8 @@
  • Pleroma - A federated twitter alternative.
    • -@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/site/help.blade.php b/resources/views/site/help.blade.php index 59a9cb2ae..3ba51f775 100644 --- a/resources/views/site/help.blade.php +++ b/resources/views/site/help.blade.php @@ -6,4 +6,8 @@

    Help

    -@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/site/libraries.blade.php b/resources/views/site/libraries.blade.php index 97ded54f6..d6156acac 100644 --- a/resources/views/site/libraries.blade.php +++ b/resources/views/site/libraries.blade.php @@ -6,4 +6,8 @@

    Libraries

    -@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/site/opensource.blade.php b/resources/views/site/opensource.blade.php index 9688a90e3..a48832dfb 100644 --- a/resources/views/site/opensource.blade.php +++ b/resources/views/site/opensource.blade.php @@ -9,4 +9,8 @@

    The software that powers this website is called PixelFed and anyone can download the source code and run their own instance!

    -@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/site/partial/template.blade.php b/resources/views/site/partial/template.blade.php index 31cd0aa95..f79c6a334 100644 --- a/resources/views/site/partial/template.blade.php +++ b/resources/views/site/partial/template.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.app',['title' => 'About ' . config('app.name')]) @section('content') @@ -22,4 +22,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/site/platform.blade.php b/resources/views/site/platform.blade.php index e8f71bb9e..5d3e7b620 100644 --- a/resources/views/site/platform.blade.php +++ b/resources/views/site/platform.blade.php @@ -6,4 +6,8 @@

    Platform/API Terms Of Use

    -@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/site/privacy.blade.php b/resources/views/site/privacy.blade.php index aa99d8e2f..576f1af20 100644 --- a/resources/views/site/privacy.blade.php +++ b/resources/views/site/privacy.blade.php @@ -77,4 +77,8 @@

    Originally adapted from the Mastodon privacy policy.

    -@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/site/terms.blade.php b/resources/views/site/terms.blade.php index 383eb331c..001642731 100644 --- a/resources/views/site/terms.blade.php +++ b/resources/views/site/terms.blade.php @@ -6,4 +6,8 @@

    Terms Of Use

    -@endsection \ No newline at end of file +@endsection + +@push('meta') + +@endpush diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 7c882def9..7fa7f5590 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.app',['title' => $user->username . " posted a photo: " . $status->likes()->count() . " likes, " . $status->comments()->count() . " comments" ]) @section('content') @@ -84,4 +84,9 @@ -@endsection \ No newline at end of file +@endsection + +@push('meta') + + +@endpush diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 855c3fb7a..15e76492f 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -10,5 +10,5 @@ @endsection @push('meta') - + @endpush From cd55dcac6b7530693b2d30e5fdaa5cab33027d5b Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 20:13:41 +0200 Subject: [PATCH 13/18] Delete .htaccess --- .htaccess | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .htaccess diff --git a/.htaccess b/.htaccess deleted file mode 100644 index 14249c50b..000000000 --- a/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all \ No newline at end of file From 8fde4618f26084802a7c870d1eca154fe4bcb2e5 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 20:27:16 +0200 Subject: [PATCH 14/18] Fix typo --- resources/views/site/platform.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/site/platform.blade.php b/resources/views/site/platform.blade.php index 5d3e7b620..1972f83e2 100644 --- a/resources/views/site/platform.blade.php +++ b/resources/views/site/platform.blade.php @@ -9,5 +9,5 @@ @endsection @push('meta') - + @endpush From f1bf40f2d56dbceec790ecb70508cc3e466dffa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= Date: Fri, 1 Jun 2018 21:04:36 +0200 Subject: [PATCH 15/18] Make navbar look better on mobile devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- resources/views/layouts/partial/nav.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index 729078be9..e4b04184c 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -20,13 +20,13 @@
  • {{ __('Login') }}
  • {{ __('Register') }}
    • @else -
  • +
    • -
  • +
    • -
  • +
  • From c2f6ffc04300df10b8f863b7913e3ad351a17d0d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 4 Jun 2018 21:33:19 -0600 Subject: [PATCH 16/18] Make #122 responsive Closes #119 --- resources/views/admin/users/home.blade.php | 55 +++++++++++----------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/resources/views/admin/users/home.blade.php b/resources/views/admin/users/home.blade.php index ad09937f2..304f05063 100644 --- a/resources/views/admin/users/home.blade.php +++ b/resources/views/admin/users/home.blade.php @@ -6,33 +6,34 @@
    - -
    • #Username Statuses Storage Role
    - - {{$user->id}} + + {{$user->profile->username}} {{$user->profile->statuses->count()}}
    - {{$user->profile->username}} + {{$user->username}} {{$user->profile->statuses->count()}}
    - - - - - - - - - - - @foreach($users as $user) - - - - - - - - @endforeach - -
    UsernameStatusesStorageRoleCreated
    - - {{$user->username}} - - {{$user->profile->statuses->count()}}

    		{!!$user->is_admin ? 'admin' : 'member'!!}{{$user->created_at->diffForHumans(null, true, true)}}
    +
    + + + + + + + + + + + + @foreach($users as $user) + + + + + + + + @endforeach + +
    UsernameStatusesStorageRoleCreated
    + + {{$user->username}} + + {{$user->profile->statuses->count()}}

    		{!!$user->is_admin ? 'admin' : 'member'!!}{{$user->created_at->diffForHumans(null, true, true)}}
    +
    {{$users->links()}}
    From a189f899e3a7edaa5f55848a07a07d867edc3c87 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 4 Jun 2018 21:52:25 -0600 Subject: [PATCH 17/18] Update compiled assets from #135 --- public/css/app.css | Bin 163931 -> 164149 bytes public/mix-manifest.json | Bin 184 -> 184 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 2e539a4e5e0347a8732bc12cd1938a44433eafb5..1d902bf2261027da1a5b3ad36e1d15911a02cbff 100644 GIT binary patch delta 95 zcmccJz_qoBtD%K)3)8}4>5P)xoa)@nJl%}c%=C;BD?5O5F<=2@rZq*myr<>Z%JK?G`*lk@XRQu9itpG#ws+dik5X+IAD*$X6^ delta 19 acmdnm#C5xYtD%K)3)8~l?bRhryLbRo6$j)1 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 7b6dca63ce077e97e893a0ff4b18c02e52c38543..d98712791c2147bab4ecc04db3d127ac88561d22 100644 GIT binary patch delta 30 lcmdnNxPx&*yhx(CVTy@aa*~0ug^5wBnQ@Y7isi&&R{)QQ2_66d delta 30 lcmdnNxPx&*yhv(Fs;Q}|xrvE!nt`Q-xq-Q%vBkt Date: Mon, 4 Jun 2018 22:09:48 -0600 Subject: [PATCH 18/18] Fix N+1 in #144 --- app/Http/Controllers/StatusController.php | 2 +- resources/views/status/show.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index d687b6bdf..27cf768f8 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -14,7 +14,7 @@ class StatusController extends Controller { $user = Profile::whereUsername($username)->firstOrFail(); $status = Status::whereProfileId($user->id) - ->withCount('likes') + ->withCount(['likes', 'comments']) ->findOrFail($id); if(!$status->media_path && $status->in_reply_to_id) { return redirect($status->url()); diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 54604a3fd..be57f0c92 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app',['title' => $user->username . " posted a photo: " . $status->likes()->count() . " likes, " . $status->comments()->count() . " comments" ]) +@extends('layouts.app',['title' => $user->username . " posted a photo: " . $status->likes_count . " likes, " . $status->comments_count . " comments" ]) @section('content')