From 1664095c3de5bdbc3c507af70aa6787d0cd19e9c Mon Sep 17 00:00:00 2001 From: voss Date: Mon, 28 May 2018 22:41:18 +0100 Subject: [PATCH 01/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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 9985b77a6b97f9ce1cab07981701a247a9c7b580 Mon Sep 17 00:00:00 2001 From: Evgeny Petrov Date: Sat, 2 Jun 2018 22:30:17 +0300 Subject: [PATCH 16/26] Added Russian translation for some files --- resources/lang/ru/auth.php | 19 +++++ resources/lang/ru/notification.php | 8 ++ resources/lang/ru/pagination.php | 19 +++++ resources/lang/ru/passwords.php | 22 ++++++ resources/lang/ru/profile.php | 8 ++ resources/lang/ru/timeline.php | 7 ++ resources/lang/ru/validation.php | 122 +++++++++++++++++++++++++++++ 7 files changed, 205 insertions(+) create mode 100644 resources/lang/ru/auth.php create mode 100644 resources/lang/ru/notification.php create mode 100644 resources/lang/ru/pagination.php create mode 100644 resources/lang/ru/passwords.php create mode 100644 resources/lang/ru/profile.php create mode 100644 resources/lang/ru/timeline.php create mode 100644 resources/lang/ru/validation.php diff --git a/resources/lang/ru/auth.php b/resources/lang/ru/auth.php new file mode 100644 index 000000000..7b28546e8 --- /dev/null +++ b/resources/lang/ru/auth.php @@ -0,0 +1,19 @@ + 'Учётные данные не совпадают с нашими записями.', + 'throttle' => 'Слишком много попыток входа. Пожалуйста, попробуйте снова через :seconds сек.', + +]; diff --git a/resources/lang/ru/notification.php b/resources/lang/ru/notification.php new file mode 100644 index 000000000..4cde9cd7e --- /dev/null +++ b/resources/lang/ru/notification.php @@ -0,0 +1,8 @@ + 'оценил(а) Ваше фото.', + 'startedFollowingYou' => 'теперь подписан(а) на Вас.', + +]; \ No newline at end of file diff --git a/resources/lang/ru/pagination.php b/resources/lang/ru/pagination.php new file mode 100644 index 000000000..36c5eb54f --- /dev/null +++ b/resources/lang/ru/pagination.php @@ -0,0 +1,19 @@ + '« Назад', + 'next' => 'Вперёд »', + +]; diff --git a/resources/lang/ru/passwords.php b/resources/lang/ru/passwords.php new file mode 100644 index 000000000..c6ebb269f --- /dev/null +++ b/resources/lang/ru/passwords.php @@ -0,0 +1,22 @@ + 'Пароль должен содержать не менее 6 символов и должен совпадать с подтверждением пароля.', + 'reset' => 'Ваш пароль был сброшен!', + 'sent' => 'Мы отправили ссылку для сброса пароля по e-mail!', + 'token' => 'Этот токен для сброса пароля некорректен.', + 'user' => "Мы не можем найти пользователя с таким e-mail.", + +]; diff --git a/resources/lang/ru/profile.php b/resources/lang/ru/profile.php new file mode 100644 index 000000000..ef538b8e3 --- /dev/null +++ b/resources/lang/ru/profile.php @@ -0,0 +1,8 @@ + 'У этого пользователя пока нет ни одного поста!', + 'emptyFollowers' => 'У этого пользователя пока нет подписчиков!', + 'emptyFollowing' => 'Этот пользователь пока ни на кого не подписан!', + 'savedWarning' => 'Только можете видеть то, что сохранили', +]; \ No newline at end of file diff --git a/resources/lang/ru/timeline.php b/resources/lang/ru/timeline.php new file mode 100644 index 000000000..b7ab17cd5 --- /dev/null +++ b/resources/lang/ru/timeline.php @@ -0,0 +1,7 @@ + 'Ваша лента записей пуста.' + +]; \ No newline at end of file diff --git a/resources/lang/ru/validation.php b/resources/lang/ru/validation.php new file mode 100644 index 000000000..77d230221 --- /dev/null +++ b/resources/lang/ru/validation.php @@ -0,0 +1,122 @@ + 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', + 'alpha' => 'The :attribute may only contain letters.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', + 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', + 'between' => [ + 'numeric' => 'The :attribute must be between :min and :max.', + 'file' => 'The :attribute must be between :min and :max kilobytes.', + 'string' => 'The :attribute must be between :min and :max characters.', + 'array' => 'The :attribute must have between :min and :max items.', + ], + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'date' => 'The :attribute is not a valid date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'dimensions' => 'The :attribute has invalid image dimensions.', + 'distinct' => 'The :attribute field has a duplicate value.', + 'email' => 'The :attribute must be a valid email address.', + 'exists' => 'The selected :attribute is invalid.', + 'file' => 'The :attribute must be a file.', + 'filled' => 'The :attribute field must have a value.', + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'in_array' => 'The :attribute field does not exist in :other.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'ipv4' => 'The :attribute must be a valid IPv4 address.', + 'ipv6' => 'The :attribute must be a valid IPv6 address.', + 'json' => 'The :attribute must be a valid JSON string.', + 'max' => [ + 'numeric' => 'The :attribute may not be greater than :max.', + 'file' => 'The :attribute may not be greater than :max kilobytes.', + 'string' => 'The :attribute may not be greater than :max characters.', + 'array' => 'The :attribute may not have more than :max items.', + ], + 'mimes' => 'The :attribute must be a file of type: :values.', + 'mimetypes' => 'The :attribute must be a file of type: :values.', + 'min' => [ + 'numeric' => 'The :attribute must be at least :min.', + 'file' => 'The :attribute must be at least :min kilobytes.', + 'string' => 'The :attribute must be at least :min characters.', + 'array' => 'The :attribute must have at least :min items.', + ], + 'not_in' => 'The selected :attribute is invalid.', + 'not_regex' => 'The :attribute format is invalid.', + 'numeric' => 'The :attribute must be a number.', + 'present' => 'The :attribute field must be present.', + 'regex' => 'The :attribute format is invalid.', + 'required' => 'The :attribute field is required.', + 'required_if' => 'The :attribute field is required when :other is :value.', + 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_with' => 'The :attribute field is required when :values is present.', + 'required_with_all' => 'The :attribute field is required when :values is present.', + 'required_without' => 'The :attribute field is required when :values is not present.', + 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'same' => 'The :attribute and :other must match.', + 'size' => [ + 'numeric' => 'The :attribute must be :size.', + 'file' => 'The :attribute must be :size kilobytes.', + 'string' => 'The :attribute must be :size characters.', + 'array' => 'The :attribute must contain :size items.', + ], + 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid zone.', + 'unique' => 'The :attribute has already been taken.', + 'uploaded' => 'The :attribute failed to upload.', + 'url' => 'The :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 ac944ec5650888f7686924ba0e687085b06fb059 Mon Sep 17 00:00:00 2001 From: jaranta Date: Sat, 2 Jun 2018 23:18:45 +0300 Subject: [PATCH 17/26] 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 18/26] 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 19/26] 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 20/26] 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 21/26] 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 662470c8dd68e4d4a80bcbab1ed60829bcbdf8f7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 4 Jun 2018 20:15:07 -0600 Subject: [PATCH 22/26] Relicense from MIT to AGPL --- LICENSE | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/LICENSE b/LICENSE index 2ba4e5e35..c7a8228ee 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,15 @@ -MIT License +PixelFed +Copyright (C) 2018 Daniel Supernault -Copyright (c) 2018 Daniel Supernault +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . \ No newline at end of file From c2f6ffc04300df10b8f863b7913e3ad351a17d0d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 4 Jun 2018 21:33:19 -0600 Subject: [PATCH 23/26] 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 24/26] 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 25/26] 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') From 7393b621ae2d817978aedd806f2ec076b53e4a01 Mon Sep 17 00:00:00 2001 From: bsky Date: Tue, 5 Jun 2018 13:33:38 +0900 Subject: [PATCH 26/26] Replace to perfect license --- LICENSE | 670 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 658 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index c7a8228ee..dbbe35581 100644 --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,661 @@ -PixelFed -Copyright (C) 2018 Daniel Supernault + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. + Preamble -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . \ No newline at end of file + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +.