From cf79b3ab6817f1e2441b16235a486d94af356a42 Mon Sep 17 00:00:00 2001 From: Ivo Idham Perdameian Date: Sun, 6 Mar 2016 20:13:24 +0700 Subject: [PATCH 01/36] Translate for distinct, json, present, and required_unless. --- id/validation.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/id/validation.php b/id/validation.php index b4be7599995..352dacef065 100644 --- a/id/validation.php +++ b/id/validation.php @@ -34,7 +34,7 @@ 'different' => 'Isian :attribute dan :other harus berbeda.', 'digits' => 'Isian :attribute harus berupa angka :digits.', 'digits_between' => 'Isian :attribute harus antara angka :min dan :max.', - 'distinct' => 'The :attribute field has a duplicate value.', + 'distinct' => 'Bidang isian :attribute memiliki nilai yang duplikat.', 'email' => 'Isian :attribute harus berupa alamat surel yang valid.', 'exists' => 'Isian :attribute yang dipilih tidak valid.', 'filled' => 'Bidang isian :attribute wajib diisi.', @@ -42,7 +42,7 @@ 'in' => 'Isian :attribute yang dipilih tidak valid.', 'integer' => 'Isian :attribute harus merupakan bilangan bulat.', 'ip' => 'Isian :attribute harus berupa alamat IP yang valid.', - 'json' => 'The :attribute must be a valid JSON string.', + 'json' => 'Isian :attribute harus berupa JSON string yang valid.', 'max' => [ 'numeric' => 'Isian :attribute seharusnya tidak lebih dari :max.', 'file' => 'Isian :attribute seharusnya tidak lebih dari :max kilobytes.', @@ -58,11 +58,11 @@ ], 'not_in' => 'Isian :attribute yang dipilih tidak valid.', 'numeric' => 'Isian :attribute harus berupa angka.', - 'present' => 'The :attribute field must be present.', + 'present' => 'Bidang isian :attribute wajib ada.', 'regex' => 'Format isian :attribute tidak valid.', 'required' => 'Bidang isian :attribute wajib diisi.', 'required_if' => 'Bidang isian :attribute wajib diisi bila :other adalah :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_unless' => 'Bidang isian :attribute wajib diisi kecuali :other memiliki nilai :values.', 'required_with' => 'Bidang isian :attribute wajib diisi bila terdapat :values.', 'required_with_all' => 'Bidang isian :attribute wajib diisi bila terdapat :values.', 'required_without' => 'Bidang isian :attribute wajib diisi bila tidak terdapat :values.', From c8351d602c726ab114bf65bd42be4683a0f56876 Mon Sep 17 00:00:00 2001 From: Ognjen Miletic Date: Sun, 6 Mar 2016 22:15:56 +0100 Subject: [PATCH 02/36] Updated translation for Laravel 5.x --- me/auth.php | 4 +- me/pagination.php | 4 +- me/passwords.php | 10 ++-- me/validation.php | 138 ++++++++++++++++++++++++++++------------------ 4 files changed, 94 insertions(+), 62 deletions(-) diff --git a/me/auth.php b/me/auth.php index 6ef1a73308a..280fac812be 100644 --- a/me/auth.php +++ b/me/auth.php @@ -13,7 +13,7 @@ | */ - 'failed' => 'These credentials do not match our records.', - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + 'failed' => 'Neispravan username i/ili password.', + 'throttle' => 'Previše neuspješnih pokušaja. Probajte ponovo za :seconds sekundi.', ]; diff --git a/me/pagination.php b/me/pagination.php index 7263c7353e5..95777e3e29b 100644 --- a/me/pagination.php +++ b/me/pagination.php @@ -13,7 +13,7 @@ | */ - 'previous' => '« Nazad', - 'next' => 'Naprijed »', + 'previous' => '« Prethodna', + 'next' => 'Sledeća »', ]; diff --git a/me/passwords.php b/me/passwords.php index cf4ba37e687..2f0458df32a 100644 --- a/me/passwords.php +++ b/me/passwords.php @@ -13,10 +13,10 @@ | */ - 'password' => 'Lozinke moraju biti najmanje 6 karaktera.', - 'reset' => 'Password has been reset!', - 'sent' => 'Poslali smo link za resetovanje vaše lozinke!', - 'token' => 'Unešena oznaka za resetovanje lozinke nije validna.', - 'user' => 'Nijesmo uspeli pronaći korisnika sa unešenom emajl adresom.', + 'password' => 'Password mora biti dugačak najmanje 6 karaktera i biti isti kao password u polju za potvrdu.', + 'reset' => 'Vaš password je resetovan!', + 'sent' => 'Poslali smo Vam link za reset Vašeg password-a!', + 'token' => 'Token za reset ovog passworda nije validan.', + 'user' => 'Ne možemo naći korisnika sa unijetom email adresom.', ]; diff --git a/me/validation.php b/me/validation.php index 6f43a27961a..f22f90aea88 100644 --- a/me/validation.php +++ b/me/validation.php @@ -9,74 +9,77 @@ | | The following language lines contain the default error messages used by | the validator class. Some of these rules have multiple versions such - | such as the size rules. Feel free to tweak each of these messages. + | as the size rules. Feel free to tweak each of these messages here. | */ - 'accepted' => 'Polje :attribute mora biti prihvaćeno.', - 'active_url' => 'Polje :attribute nije validan URL.', - 'after' => 'Polje :attribute mora biti datum poslije :date.', - 'alpha' => 'Polje :attribute može sadržati samo slova.', - 'alpha_dash' => 'Polje :attribute može sadržati samo slova, brojeve i crtice.', - 'alpha_num' => 'Polje :attribute može sadržati samo slova i brojeve.', - 'array' => 'Polje :attribute mora sadržati određen broj stavki.', - 'before' => 'Polje :attribute mora biti datum prije :date.', - 'between' => [ + + 'accepted' => 'Polje :attribute mora biti prihvaćeno.', + 'active_url' => 'Polje :attribute nije validan URL.', + 'after' => 'Polje :attribute mora biti datum poslije :date.', + 'alpha' => 'Polje :attribute može sadržati samo slova.', + 'alpha_dash' => 'Polje :attribute može sadržati samo slova, brojeve i crtice.', + 'alpha_num' => 'Polje :attribute može sadržati samo slova i brojeve.', + 'array' => 'Polje :attribute mora sadržati određen broj stavki.', + 'before' => 'Polje :attribute mora biti datum prije :date.', + 'between' => [ 'numeric' => 'Polje :attribute mora biti između :min - :max.', 'file' => 'Fajl :attribute mora biti između :min - :max kilobajta.', 'string' => 'Polje :attribute mora sadržati između :min - :max karaktera.', - 'array' => 'Polje :attribute mora sadržati između :min - :max stavki.', + 'array' => 'Polje :attribute mora sadržati između :min - :max stavki.' ], - 'boolean' => 'The :attribute field must be true or false', - 'confirmed' => 'Potvrda polja :attribute se ne poklapa.', - 'date' => 'Polje :attribute nije važeći datum.', - 'date_format' => 'Polje :attribute nije u formatu :format.', - 'different' => 'Polja :attribute i :other moraju biti različita.', - 'digits' => 'Polje :attribute mora sadržati :digits cifara.', - 'digits_between' => 'Polje :attribute mora biti izemđu :min i :max cifri.', - 'distinct' => 'The :attribute field has a duplicate value.', - 'email' => 'Format polja :attribute nije validan.', - 'exists' => 'Odabrano polje :attribute nije validno.', + 'boolean' => 'The :attribute field must be true or false', + 'confirmed' => 'Potvrda polja :attribute se ne poklapa.', + 'date' => 'Polje :attribute nije važeći datum.', + 'date_format' => 'Polje :attribute nije u formatu :format.', + 'different' => 'Polja :attribute i :other moraju biti različita.', + 'digits' => 'Polje :attribute mora sadržati :digits cifara.', + 'digits_between' => 'Polje :attribute mora biti izemđu :min i :max cifri.', + 'distinct' => 'Polje :attribute nije jedinstveno.', + 'email' => 'Format polja :attribute nije validan.', + 'exists' => 'Odabrano polje :attribute nije validno.', 'filled' => 'Polje :attribute je obavezno.', - 'image' => 'Polje :attribute mora biti slika.', - 'in' => 'Odabrano polje :attribute nije validno.', - 'integer' => 'Polje :attribute mora biti broj.', - 'ip' => 'Polje :attribute mora biti validna IP adresa.', - 'json' => 'The :attribute must be a valid JSON string.', - 'max' => [ + 'image' => 'Polje :attribute mora biti slika.', + 'in' => 'Odabrano polje :attribute nije validno.', + 'in_array' => 'Polje :attribute ne postoji u :other.', + 'integer' => 'Polje :attribute mora biti broj.', + 'ip' => 'Polje :attribute mora biti validna IP adresa.', + 'json' => 'Polje :attribute mora biti validan JSON string.', + 'max' => [ 'numeric' => 'Polje :attribute mora biti manje od :max.', 'file' => 'Polje :attribute mora biti manje od :max kilobajta.', 'string' => 'Polje :attribute mora sadržati manje od :max karaktera.', - 'array' => 'Polje :attribute ne smije da image više od :max stavki.', + 'array' => 'Polje :attribute ne smije da image više od :max stavki.' ], - 'mimes' => 'Polje :attribute mora biti fajl tipa: :values.', - 'min' => [ + 'mimes' => 'Polje :attribute mora biti fajl tipa: :values.', + 'min' => [ 'numeric' => 'Polje :attribute mora biti najmanje :min.', 'file' => 'Fajl :attribute mora biti najmanje :min kilobajta.', 'string' => 'Polje :attribute mora sadržati najmanje :min karaktera.', - 'array' => 'Polje :attribute mora sadrzati najmanje :min stavke.', + 'array' => 'Polje :attribute mora sadrzati najmanje :min stavke.' ], - 'not_in' => 'Odabrani element polja :attribute nije validan.', - 'numeric' => 'Polje :attribute mora biti broj.', - 'present' => 'The :attribute field must be present.', - 'regex' => 'Format polja :attribute nije validan.', - 'required' => 'Polje :attribute je obavezno.', - 'required_if' => 'Polje :attribute je potrebno kada polje :other sadrži :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', - 'required_with' => 'Polje :attribute je obavezno kada polje :values je prisutan.', - 'required_with_all' => 'Polje :attribute je obavezno kada polja :values nijesu prazna.', - 'required_without' => 'Polje :attribute je potrebno kada polje :values nije prazno.', + 'not_in' => 'Odabrani element polja :attribute nije validan.', + 'numeric' => 'Polje :attribute mora biti broj.', + 'present' => 'Polje :attribute mora postojati.', + 'regex' => 'Format polja :attribute nije validan.', + 'required' => 'Polje :attribute je obavezno.', + 'required_if' => 'Polje :attribute je potrebno kada polje :other sadrži :value.', + 'required_unless' => 'Polje :attribute je obavezno osim ako :other sadrži :values.', + 'required_with' => 'Polje :attribute je obavezno kada polje :values je prisutan.', + 'required_with_all' => 'Polje :attribute je obavezno kada polja :values nijesu prazna.', + 'required_without' => 'Polje :attribute je potrebno kada polje :values nije prazno.', 'required_without_all' => 'Polje :attribute je potrebno kada nijedno od polja :values nije prisutno ili prazno.', - 'same' => 'Polja :attribute i :other se moraju poklapati.', - 'size' => [ + 'same' => 'Polja :attribute i :other se moraju poklapati.', + 'size' => [ 'numeric' => 'Polje :attribute mora biti :size.', 'file' => 'Fajl :attribute mora biti :size kilobajta.', 'string' => 'Polje :attribute mora biti :size karaktera.', - 'array' => 'Polje :attribute mora sadržati :size stavki.', + 'array' => 'Polje :attribute mora sadržati :size stavki.' ], - 'string' => 'The :attribute must be a string.', - 'timezone' => 'The :attribute must be a valid zone.', - 'unique' => 'Vrijednost za polje :attribute već postoji.', - 'url' => 'Format polja :attribute ne važi.', + 'string' => 'Polje :attribute mora biti string.', + 'timezone' => 'The :attribute must be a valid zone.', + 'unique' => 'Vrijednost za polje :attribute već postoji.', + 'url' => 'Format polja :attribute ne važi.', + 'pdv' => 'Format polja PDV nije ispravan. Format je npr: 20/31-00112-1', /* |-------------------------------------------------------------------------- @@ -84,12 +87,12 @@ |-------------------------------------------------------------------------- | | Here you may specify custom validation messages for attributes using the - | convention "attribute.rule" to name the lines. This makes it quick to + | convention 'attribute.rule' to name the lines. This makes it quick to | specify a specific custom language line for a given attribute rule. | */ - 'custom' => [ + 'custom' => [ 'attribute-name' => [ 'rule-name' => 'custom-message', ], @@ -102,12 +105,41 @@ | | 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. + | of 'email'. This simply helps us make messages a little cleaner. | */ 'attributes' => [ - // + 'name' => 'ime', + 'username' => 'username', + 'email' => 'email', + 'first_name' => 'ime', + 'last_name' => 'prezime', + 'password' => 'password', + 'password_confirmation' => 'ponovi password', + 'city' => 'grad', + 'country' => 'država', + 'address' => 'adresa', + 'phone' => 'telefona', + 'mobile' => 'mobilni', + 'age' => 'godine', + 'sex' => 'pol', + 'gender' => 'pol', + 'year' => 'godina', + 'month' => 'mjesec', + 'day' => 'dan', + 'hour' => 'sat', + 'minute' => 'minuta', + 'second' => 'sekunda', + 'title' => 'naslov', + 'body' => 'tijelo poruke', + 'description' => 'opis', + 'excerpt' => 'extracto', + 'date' => 'datum', + 'time' => 'vrijeme', + 'subject' => 'naslov', + 'message' => 'poruka', ], -]; + +]; \ No newline at end of file From d4678f17e44493a6eae4775fc1c5bba382fb87d9 Mon Sep 17 00:00:00 2001 From: Ognjen Miletic Date: Sun, 6 Mar 2016 22:18:55 +0100 Subject: [PATCH 03/36] Updated translation for Laravel 5.x --- me/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/me/validation.php b/me/validation.php index f22f90aea88..46000cf7b26 100644 --- a/me/validation.php +++ b/me/validation.php @@ -142,4 +142,4 @@ ], -]; \ No newline at end of file +]; From aca0c627a42c4915cfc8b5c857273909ae74aa0b Mon Sep 17 00:00:00 2001 From: Ognjen Miletic Date: Sun, 6 Mar 2016 22:29:59 +0100 Subject: [PATCH 04/36] pgp-cs-fixer --- me/auth.php | 2 +- me/passwords.php | 8 +++---- me/validation.php | 61 +++++++++++++++++++++++------------------------ 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/me/auth.php b/me/auth.php index 280fac812be..adbe7ec4645 100644 --- a/me/auth.php +++ b/me/auth.php @@ -13,7 +13,7 @@ | */ - 'failed' => 'Neispravan username i/ili password.', + 'failed' => 'Neispravan username i/ili password.', 'throttle' => 'Previše neuspješnih pokušaja. Probajte ponovo za :seconds sekundi.', ]; diff --git a/me/passwords.php b/me/passwords.php index 2f0458df32a..728c52daff5 100644 --- a/me/passwords.php +++ b/me/passwords.php @@ -14,9 +14,9 @@ */ 'password' => 'Password mora biti dugačak najmanje 6 karaktera i biti isti kao password u polju za potvrdu.', - 'reset' => 'Vaš password je resetovan!', - 'sent' => 'Poslali smo Vam link za reset Vašeg password-a!', - 'token' => 'Token za reset ovog passworda nije validan.', - 'user' => 'Ne možemo naći korisnika sa unijetom email adresom.', + 'reset' => 'Vaš password je resetovan!', + 'sent' => 'Poslali smo Vam link za reset Vašeg password-a!', + 'token' => 'Token za reset ovog passworda nije validan.', + 'user' => 'Ne možemo naći korisnika sa unijetom email adresom.', ]; diff --git a/me/validation.php b/me/validation.php index 46000cf7b26..0740bbae405 100644 --- a/me/validation.php +++ b/me/validation.php @@ -25,55 +25,55 @@ 'numeric' => 'Polje :attribute mora biti između :min - :max.', 'file' => 'Fajl :attribute mora biti između :min - :max kilobajta.', 'string' => 'Polje :attribute mora sadržati između :min - :max karaktera.', - 'array' => 'Polje :attribute mora sadržati između :min - :max stavki.' + 'array' => 'Polje :attribute mora sadržati između :min - :max stavki.', ], - 'boolean' => 'The :attribute field must be true or false', - 'confirmed' => 'Potvrda polja :attribute se ne poklapa.', - 'date' => 'Polje :attribute nije važeći datum.', - 'date_format' => 'Polje :attribute nije u formatu :format.', - 'different' => 'Polja :attribute i :other moraju biti različita.', - 'digits' => 'Polje :attribute mora sadržati :digits cifara.', - 'digits_between' => 'Polje :attribute mora biti izemđu :min i :max cifri.', - 'distinct' => 'Polje :attribute nije jedinstveno.', - 'email' => 'Format polja :attribute nije validan.', - 'exists' => 'Odabrano polje :attribute nije validno.', + 'boolean' => 'The :attribute field must be true or false', + 'confirmed' => 'Potvrda polja :attribute se ne poklapa.', + 'date' => 'Polje :attribute nije važeći datum.', + 'date_format' => 'Polje :attribute nije u formatu :format.', + 'different' => 'Polja :attribute i :other moraju biti različita.', + 'digits' => 'Polje :attribute mora sadržati :digits cifara.', + 'digits_between' => 'Polje :attribute mora biti izemđu :min i :max cifri.', + 'distinct' => 'Polje :attribute nije jedinstveno.', + 'email' => 'Format polja :attribute nije validan.', + 'exists' => 'Odabrano polje :attribute nije validno.', 'filled' => 'Polje :attribute je obavezno.', - 'image' => 'Polje :attribute mora biti slika.', - 'in' => 'Odabrano polje :attribute nije validno.', + 'image' => 'Polje :attribute mora biti slika.', + 'in' => 'Odabrano polje :attribute nije validno.', 'in_array' => 'Polje :attribute ne postoji u :other.', - 'integer' => 'Polje :attribute mora biti broj.', - 'ip' => 'Polje :attribute mora biti validna IP adresa.', + 'integer' => 'Polje :attribute mora biti broj.', + 'ip' => 'Polje :attribute mora biti validna IP adresa.', 'json' => 'Polje :attribute mora biti validan JSON string.', - 'max' => [ + 'max' => [ 'numeric' => 'Polje :attribute mora biti manje od :max.', 'file' => 'Polje :attribute mora biti manje od :max kilobajta.', 'string' => 'Polje :attribute mora sadržati manje od :max karaktera.', - 'array' => 'Polje :attribute ne smije da image više od :max stavki.' + 'array' => 'Polje :attribute ne smije da image više od :max stavki.', ], 'mimes' => 'Polje :attribute mora biti fajl tipa: :values.', 'min' => [ 'numeric' => 'Polje :attribute mora biti najmanje :min.', 'file' => 'Fajl :attribute mora biti najmanje :min kilobajta.', 'string' => 'Polje :attribute mora sadržati najmanje :min karaktera.', - 'array' => 'Polje :attribute mora sadrzati najmanje :min stavke.' + 'array' => 'Polje :attribute mora sadrzati najmanje :min stavke.', ], - 'not_in' => 'Odabrani element polja :attribute nije validan.', - 'numeric' => 'Polje :attribute mora biti broj.', + 'not_in' => 'Odabrani element polja :attribute nije validan.', + 'numeric' => 'Polje :attribute mora biti broj.', 'present' => 'Polje :attribute mora postojati.', - 'regex' => 'Format polja :attribute nije validan.', - 'required' => 'Polje :attribute je obavezno.', - 'required_if' => 'Polje :attribute je potrebno kada polje :other sadrži :value.', - 'required_unless' => 'Polje :attribute je obavezno osim ako :other sadrži :values.', - 'required_with' => 'Polje :attribute je obavezno kada polje :values je prisutan.', - 'required_with_all' => 'Polje :attribute je obavezno kada polja :values nijesu prazna.', - 'required_without' => 'Polje :attribute je potrebno kada polje :values nije prazno.', + 'regex' => 'Format polja :attribute nije validan.', + 'required' => 'Polje :attribute je obavezno.', + 'required_if' => 'Polje :attribute je potrebno kada polje :other sadrži :value.', + 'required_unless' => 'Polje :attribute je obavezno osim ako :other sadrži :values.', + 'required_with' => 'Polje :attribute je obavezno kada polje :values je prisutan.', + 'required_with_all' => 'Polje :attribute je obavezno kada polja :values nijesu prazna.', + 'required_without' => 'Polje :attribute je potrebno kada polje :values nije prazno.', 'required_without_all' => 'Polje :attribute je potrebno kada nijedno od polja :values nije prisutno ili prazno.', - 'same' => 'Polja :attribute i :other se moraju poklapati.', - 'size' => [ + 'same' => 'Polja :attribute i :other se moraju poklapati.', + 'size' => [ 'numeric' => 'Polje :attribute mora biti :size.', 'file' => 'Fajl :attribute mora biti :size kilobajta.', 'string' => 'Polje :attribute mora biti :size karaktera.', - 'array' => 'Polje :attribute mora sadržati :size stavki.' + 'array' => 'Polje :attribute mora sadržati :size stavki.', ], 'string' => 'Polje :attribute mora biti string.', 'timezone' => 'The :attribute must be a valid zone.', @@ -141,5 +141,4 @@ 'message' => 'poruka', ], - ]; From 69439e2fbdcd1b03c69144184e2f3c051cdf6083 Mon Sep 17 00:00:00 2001 From: caouecs Date: Mon, 7 Mar 2016 08:20:56 +0100 Subject: [PATCH 05/36] feature: validation - in_array --- ar/validation.php | 3 +++ be/validation.php | 1 + bg/validation.php | 1 + bs/validation.php | 1 + ca/validation.php | 1 + cs/validation.php | 1 + cy/validation.php | 1 + da/validation.php | 1 + de/validation.php | 1 + el/validation.php | 1 + es/validation.php | 1 + fa/validation.php | 1 + fi/validation.php | 1 + fr/validation.php | 1 + gl/validation.php | 1 + he/validation.php | 1 + hr/validation.php | 1 + hu/validation.php | 1 + id/validation.php | 1 + is/validation.php | 1 + it/validation.php | 1 + ja/validation.php | 1 + ka/validation.php | 1 + km/validation.php | 1 + ko/validation.php | 1 + lt/validation.php | 1 + me/validation.php | 1 + mk/validation.php | 1 + ms/validation.php | 1 + nb/validation.php | 1 + ne/validation.php | 1 + nl/validation.php | 1 + pl/validation.php | 1 + pt-BR/validation.php | 1 + pt/validation.php | 1 + ro/validation.php | 1 + ru/validation.php | 1 + sc/validation.php | 1 + sk/validation.php | 1 + sl/validation.php | 1 + sq/validation.php | 1 + sr/validation.php | 1 + sv/validation.php | 1 + th/validation.php | 1 + tk/validation.php | 1 + tr/validation.php | 1 + uk/validation.php | 1 + vi/validation.php | 1 + zh-CN/validation.php | 1 + zh-HK/validation.php | 1 + zh-TW/validation.php | 43 ++++++++++++++++++++++--------------------- 51 files changed, 74 insertions(+), 21 deletions(-) diff --git a/ar/validation.php b/ar/validation.php index 80c26568330..e65ebe1e5b0 100755 --- a/ar/validation.php +++ b/ar/validation.php @@ -40,7 +40,10 @@ 'filled' => 'الحقل :attribute إجباري', 'image' => 'يجب أن يكون الحقل :attribute صورةً', 'in' => 'الحقل :attribute لاغٍ', + 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'يجب أن يكون الحقل :attribute عددًا صحيحًا', + 'ip' => 'يجب أن يكون الحقل :attribute عنوان IP ذي بُنية صحيحة', 'json' => 'يجب أن يكون الحقل :attribute نصآ من نوع JSON.', 'max' => [ diff --git a/be/validation.php b/be/validation.php index b0df66e94e0..8654aeb6c23 100644 --- a/be/validation.php +++ b/be/validation.php @@ -41,6 +41,7 @@ 'exists' => 'Выбранае значэнне для :attribute некарэктна.', 'image' => 'Поле :attribute павінна быць малюнкам.', 'in' => 'Выбранае значэнне для :attribute памылкова.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Поле :attribute павінна быць цэлым лікам.', 'ip' => 'Поле :attribute дпавінна быць сапраўдным IP-адрасам.', 'json' => 'Поле :attribute павінна быць JSON радком.', diff --git a/bg/validation.php b/bg/validation.php index 99630427c40..931520f2fa5 100644 --- a/bg/validation.php +++ b/bg/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Полето :attribute е задължително.', 'image' => 'Полето :attribute трябва да бъде изображение.', 'in' => 'Избраното поле :attribute е невалидно.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Полето :attribute трябва да бъде цяло число.', 'ip' => 'Полето :attribute трябва да бъде IP адрес.', 'json' => 'Полето :attribute трябва да бъде JSON низ.', diff --git a/bs/validation.php b/bs/validation.php index 59f51467b82..d3a49bed5af 100644 --- a/bs/validation.php +++ b/bs/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Polje :attribute je obavezno.', 'image' => 'Polje :attribute mora biti slika.', 'in' => 'Odabrano polje :attribute nije validno.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Polje :attribute mora biti broj.', 'ip' => 'Polje :attribute mora biti validna IP adresa.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/ca/validation.php b/ca/validation.php index 5cac22c3278..d81ef3f9a27 100644 --- a/ca/validation.php +++ b/ca/validation.php @@ -40,6 +40,7 @@ 'filled' => 'El camp :attribute és obligatori.', 'image' => ':attribute ha de ser una imatge.', 'in' => ':attribute és invàlid', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute ha de ser un nombre enter.', 'ip' => ':attribute ha de ser una adreça IP vàlida.', 'json' => 'El camp :attribute ha de contenir una cadena JSON vàlida.', diff --git a/cs/validation.php b/cs/validation.php index eda544fccc6..85ece14a7f0 100644 --- a/cs/validation.php +++ b/cs/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute musí být vyplněno.', 'image' => ':attribute musí být obrázek.', 'in' => 'Zvolená hodnota pro :attribute není platná.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute musí být celé číslo.', 'ip' => ':attribute musí být platnou IP adresou.', 'json' => ':attribute musí být platný JSON řetězec.', diff --git a/cy/validation.php b/cy/validation.php index 4006d24cccd..a0059cee39d 100644 --- a/cy/validation.php +++ b/cy/validation.php @@ -40,6 +40,7 @@ 'exists' => 'Nid yw :attribute yn ddilys.', 'image' => 'Rhaid i :attribute fod yn lun.', 'in' => 'Nid yw :attribute yn ddilys.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Rhaid i :attribute fod yn integer.', 'ip' => 'Rhaid i :attribute fod yn gyfeiriad IP dilys.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/da/validation.php b/da/validation.php index 403ad733016..ae0b13f1a2a 100755 --- a/da/validation.php +++ b/da/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute skal udfyldes.', 'image' => ':attribute skal være et billede.', 'in' => 'Det valgte :attribute er ugyldig.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute skal være et heltal.', 'ip' => ':attribute skal være en gyldig IP adresse.', 'json' => ':attribute skal være en gyldig JSON streng.', diff --git a/de/validation.php b/de/validation.php index b3bb848c198..3c7c800f798 100755 --- a/de/validation.php +++ b/de/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute muss ausgefüllt sein.', 'image' => ':attribute muss ein Bild sein.', 'in' => 'Der gewählte Wert für :attribute ist ungültig.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute muss eine ganze Zahl sein.', 'ip' => ':attribute muss eine gültige IP-Adresse sein.', 'json' => ':attribute muss ein gültiger JSON-String sein.', diff --git a/el/validation.php b/el/validation.php index e601b3a8b21..fce243728d7 100644 --- a/el/validation.php +++ b/el/validation.php @@ -40,6 +40,7 @@ 'exists' => 'Το επιλεγμένο :attribute δεν είναι έγκυρο.', 'image' => 'Το πεδίο :attribute πρέπει να είναι εικόνα.', 'in' => 'Το επιλεγμένο :attribute δεν είναι έγκυρο.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Το πεδίο :attribute πρέπει να είναι ακέραιος.', 'ip' => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη διεύθυνση IP.', 'json' => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη συμβολοσειρά JSON.', diff --git a/es/validation.php b/es/validation.php index 5f30e12da1a..dafee43eee4 100644 --- a/es/validation.php +++ b/es/validation.php @@ -40,6 +40,7 @@ 'filled' => 'El campo :attribute es obligatorio.', 'image' => ':attribute debe ser una imagen.', 'in' => ':attribute es inválido.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute debe ser un número entero.', 'ip' => ':attribute debe ser una dirección IP válida.', 'json' => 'El campo :attribute debe tener una cadena JSON válida.', diff --git a/fa/validation.php b/fa/validation.php index d1a4fe8fc81..6bfe674267d 100644 --- a/fa/validation.php +++ b/fa/validation.php @@ -40,6 +40,7 @@ 'filled' => 'فیلد :attribute الزامی است', 'image' => ':attribute باید تصویر باشد.', 'in' => ':attribute انتخاب شده، معتبر نیست.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute باید نوع داده ای عددی (integer) باشد.', 'ip' => ':attribute باید IP آدرس معتبر باشد.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/fi/validation.php b/fi/validation.php index ec56946a513..39fc2b7571d 100644 --- a/fi/validation.php +++ b/fi/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute kenttä on pakollinen.', 'image' => ':attribute pitää olla kuva.', 'in' => 'valittu :attribute on virheellinen.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute pitää olla numero.', 'ip' => ':attribute pitää olla validi IP-osoite.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/fr/validation.php b/fr/validation.php index 6dcb46cd466..34898d42fd7 100644 --- a/fr/validation.php +++ b/fr/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Le champ :attribute est obligatoire.', 'image' => 'Le champ :attribute doit être une image.', 'in' => 'Le champ :attribute est invalide.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Le champ :attribute doit être un entier.', 'ip' => 'Le champ :attribute doit être une adresse IP valide.', 'json' => 'Le champ :attribute doit être un document JSON valide.', diff --git a/gl/validation.php b/gl/validation.php index 060d087705a..b2574c46098 100644 --- a/gl/validation.php +++ b/gl/validation.php @@ -40,6 +40,7 @@ 'filled' => 'O campo :attribute é obrigatorio.', 'image' => ':attribute debe ser unha imaxe.', 'in' => 'O :attribute seleccionado non é válido.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute debe ser un número enteiro.', 'ip' => ':attribute debe ser unha dirección IP válida.', 'json' => ':attribute debe ser unha cadea JSON válida.', diff --git a/he/validation.php b/he/validation.php index d7390b5c92e..9838fe1aa4b 100644 --- a/he/validation.php +++ b/he/validation.php @@ -40,6 +40,7 @@ 'filled' => 'שדה :attribute הוא חובה.', 'image' => 'שדה :attribute חייב להיות תמונה.', 'in' => 'בחירת ה-:attribute אינה תקפה.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'שדה :attribute חייב להיות מספר שלם.', 'ip' => 'שדה :attribute חייב להיות כתובת IP תקנית.', 'json' => 'שדה :attribute חייב להיות מחרוזת JSON תקנית.', diff --git a/hr/validation.php b/hr/validation.php index 42c5bd212f5..76888bfdf37 100644 --- a/hr/validation.php +++ b/hr/validation.php @@ -39,6 +39,7 @@ 'exists' => 'Odabrano polje :attribute nije ispravno.', 'image' => 'Polje :attribute mora biti slika.', 'in' => 'Odabrano polje :attribute nije ispravno.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Polje :attribute mora biti broj.', 'ip' => 'Polje :attribute mora biti ispravna IP adresa.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/hu/validation.php b/hu/validation.php index 2da09fcc9d4..86b6b2cb9c9 100755 --- a/hu/validation.php +++ b/hu/validation.php @@ -40,6 +40,7 @@ 'filled' => 'A(z) :attribute megadása kötelező!', 'image' => 'A(z) :attribute képfájl kell, hogy legyen!', 'in' => 'A kiválasztott :attribute érvénytelen.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'A(z) :attribute értéke szám kell, hogy legyen!', 'ip' => 'A(z) :attribute érvényes IP cím kell, hogy legyen!', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/id/validation.php b/id/validation.php index b4be7599995..45195bfdc67 100644 --- a/id/validation.php +++ b/id/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Bidang isian :attribute wajib diisi.', 'image' => 'Isian :attribute harus berupa gambar.', 'in' => 'Isian :attribute yang dipilih tidak valid.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Isian :attribute harus merupakan bilangan bulat.', 'ip' => 'Isian :attribute harus berupa alamat IP yang valid.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/is/validation.php b/is/validation.php index 48ae02644b4..5c642d84eed 100644 --- a/is/validation.php +++ b/is/validation.php @@ -40,6 +40,7 @@ 'exists' => 'Reiturinn :attribute er nú þegar til.', 'image' => 'Reiturinn :attribute verður að vera mynd.', 'in' => 'Reiturinn :attribute er ekki réttur.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Reiturinn :attribute verður að vera tala.', 'ip' => 'Reiturinn :attribute verður að vera lögleg IP-tala.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/it/validation.php b/it/validation.php index d671165f663..0364e983c08 100644 --- a/it/validation.php +++ b/it/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Il campo :attribute è richiesto.', 'image' => ":attribute deve essere un'immagine.", 'in' => ':attribute selezionato non è valido.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute deve essere un numero intero.', 'ip' => ':attribute deve essere un indirizzo IP valido.', 'json' => ':attribute deve essere una stringa JSON valida.', diff --git a/ja/validation.php b/ja/validation.php index f9ffefee39a..e20afe66810 100755 --- a/ja/validation.php +++ b/ja/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attributeは必須です。', 'image' => ':attributeには、画像を指定してください。', 'in' => '選択された:attributeは、有効ではありません。', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attributeには、整数を指定してください。', 'ip' => ':attributeには、有効なIPアドレスを指定してください。', 'json' => ':attributeには、有効なJSON文字列を指定してください。', diff --git a/ka/validation.php b/ka/validation.php index e44e3a83f93..b443c6a657e 100755 --- a/ka/validation.php +++ b/ka/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute აუცილებელია.', 'image' => ':attribute სურათი უნდა იყოს.', 'in' => 'მითითებული :attribute არასწორია.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute მთელი რიცხვი უნდა იყოს.', 'ip' => ':attribute IP მისამართი უნდა იყოს.', 'json' => ':attribute JSON ტიპის უნდა იყოს.', diff --git a/km/validation.php b/km/validation.php index dc694a0e1b2..ac5c960b05d 100644 --- a/km/validation.php +++ b/km/validation.php @@ -40,6 +40,7 @@ 'filled' => 'ទំរង់ :attribute នេះគឺទាមទារឲ្យមាន។', 'image' => ':attribute ត្រូវតៃជារូបភាព។', 'in' => 'ការជ្រើសរើស :attribute មិនត្រឹមត្រូវ។', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute ត្រូវតែជាចំនួនគត់។', 'ip' => ':attribute ត្រូវតែជា IP address​ត្រឹមត្រូវ។', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/ko/validation.php b/ko/validation.php index d494eb08042..08e96a84875 100644 --- a/ko/validation.php +++ b/ko/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute 필드는 필수입니다.', 'image' => ':attribute은(는) 반드시 이미지여야 합니다.', 'in' => '선택된 :attribute은(는) 유효하지 않습니다.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute은(는) 반드시 정수여야 합니다.', 'ip' => ':attribute은(는) 반드시 유효한 IP 주소여야 합니다.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/lt/validation.php b/lt/validation.php index 4882e73acad..9a854ead5ac 100644 --- a/lt/validation.php +++ b/lt/validation.php @@ -40,6 +40,7 @@ 'exists' => 'Pasirinkta negaliojanti :attribute reikšmė.', 'image' => 'Lauko :attribute reikšmė turi būti paveikslėlis.', 'in' => 'Pasirinkta negaliojanti :attribute reikšmė.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Lauko :attribute reikšmė turi būti veikasis skaičius.', 'ip' => 'Lauko :attribute reikšmė turi būti galiojantis IP adresas.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/me/validation.php b/me/validation.php index 6f43a27961a..565840ad3cf 100644 --- a/me/validation.php +++ b/me/validation.php @@ -39,6 +39,7 @@ 'filled' => 'Polje :attribute je obavezno.', 'image' => 'Polje :attribute mora biti slika.', 'in' => 'Odabrano polje :attribute nije validno.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Polje :attribute mora biti broj.', 'ip' => 'Polje :attribute mora biti validna IP adresa.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/mk/validation.php b/mk/validation.php index 718534d4493..50bd665fbc6 100644 --- a/mk/validation.php +++ b/mk/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Полето :attribute е задолжително.', 'image' => 'Полето :attribute мора да биде слика.', 'in' => 'Избраното поле :attribute е невалидно.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Полето :attribute мора да биде цел број.', 'ip' => 'Полето :attribute мора да биде IP адреса.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/ms/validation.php b/ms/validation.php index 5617f6ebfe1..6c3514c3b5c 100644 --- a/ms/validation.php +++ b/ms/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute field is required.', 'image' => ':attribute must be an image.', 'in' => 'The selected :attribute is invalid.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute must be an integer.', 'ip' => ':attribute must be a valid IP address.', 'json' => ':attribute must be a valid JSON string.', diff --git a/nb/validation.php b/nb/validation.php index 70fe0cfc2fe..c9bd581e7b1 100755 --- a/nb/validation.php +++ b/nb/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute må fylles ut.', 'image' => ':attribute skal være et bilde.', 'in' => 'Det valgte :attribute er ugyldig.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute skal være et heltall.', 'ip' => ':attribute skal være en gyldig IP adresse.', 'json' => ':attribute må være på JSON-format.', diff --git a/ne/validation.php b/ne/validation.php index 4defa7c1f98..0f2d6aa8ed7 100644 --- a/ne/validation.php +++ b/ne/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute दिइएको हुनुपर्छ।', 'image' => ':attribute मा फोटो हुनुपर्छ।', 'in' => 'छानिएको :attribute अमान्य छ।', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute पूर्ण संख्या हुनुपर्छ।', 'ip' => ':attribute मा दिइएको मान्य IP ठेगाना हुनुपर्छ।', 'json' => ':attribute मा दिइएको मान्य JSON string हुनुपर्छ।', diff --git a/nl/validation.php b/nl/validation.php index f35b52805c3..a58f9b6f515 100644 --- a/nl/validation.php +++ b/nl/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute is verplicht.', 'image' => ':attribute moet een afbeelding zijn.', 'in' => ':attribute is ongeldig.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute moet een getal zijn.', 'ip' => ':attribute moet een geldig IP-adres zijn.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/pl/validation.php b/pl/validation.php index f1b0ee16e9d..28d729a9cb5 100644 --- a/pl/validation.php +++ b/pl/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Pole :attribute jest wymagane.', 'image' => ':attribute musi być obrazkiem.', 'in' => 'Zaznaczony :attribute jest nieprawidłowy.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute musi być liczbą całkowitą.', 'ip' => ':attribute musi być prawidłowym adresem IP.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/pt-BR/validation.php b/pt-BR/validation.php index b7e29f81031..31bf8c37bc2 100644 --- a/pt-BR/validation.php +++ b/pt-BR/validation.php @@ -40,6 +40,7 @@ 'filled' => 'O campo :attribute é obrigatório.', 'image' => 'O campo :attribute deverá conter uma imagem.', 'in' => 'O campo :attribute não contém um valor válido.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'O campo :attribute deverá conter um número inteiro.', 'ip' => 'O campo :attribute deverá conter um IP válido.', 'json' => 'O campo :attribute deverá conter uma string JSON válida.', diff --git a/pt/validation.php b/pt/validation.php index 4ba7aee2c09..256880acc09 100644 --- a/pt/validation.php +++ b/pt/validation.php @@ -40,6 +40,7 @@ 'filled' => 'É obrigatória a indicação de um valor para o campo :attribute.', 'image' => 'O campo :attribute deverá conter uma imagem.', 'in' => 'O campo :attribute não contém um valor válido.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'O campo :attribute deverá conter um número inteiro.', 'ip' => 'O campo :attribute deverá conter um IP válido.', 'json' => 'O campo :attribute deverá conter um texto JSON válido.', diff --git a/ro/validation.php b/ro/validation.php index 8ce1ba723c8..5529550d12c 100644 --- a/ro/validation.php +++ b/ro/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Câmpul :attribute trebuie completat.', 'image' => 'Câmpul :attribute trebuie să fie o imagine.', 'in' => 'Câmpul :attribute selectat nu este valid.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Câmpul :attribute trebuie să fie un număr întreg.', 'ip' => 'Câmpul :attribute trebuie să fie o adresă IP validă.', 'json' => 'Câmpul :attribute trebuie să fie un string JSON valid.', diff --git a/ru/validation.php b/ru/validation.php index b94c78f3f3c..627e130bfd7 100644 --- a/ru/validation.php +++ b/ru/validation.php @@ -41,6 +41,7 @@ 'exists' => 'Выбранное значение для :attribute некорректно.', 'image' => 'Поле :attribute должно быть изображением.', 'in' => 'Выбранное значение для :attribute ошибочно.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Поле :attribute должно быть целым числом.', 'ip' => 'Поле :attribute должно быть действительным IP-адресом.', 'json' => 'Поле :attribute должно быть JSON строкой.', diff --git a/sc/validation.php b/sc/validation.php index 96353c0c022..e6c4731d94c 100644 --- a/sc/validation.php +++ b/sc/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute est pedidu.', 'image' => ":attribute depet èssere un'immàgine.", 'in' => ':attribute seberadu no est bàlidu.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute depet èssere intreu.', 'ip' => ":attribute depet èssere un'indiritzu IP bàlidu.", 'json' => 'The :attribute must be a valid JSON string.', diff --git a/sk/validation.php b/sk/validation.php index b6d4ddc451a..72af176e384 100644 --- a/sk/validation.php +++ b/sk/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute je požadované.', 'image' => ':attribute musí byť obrázok.', 'in' => 'označený :attribute je neplatný.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute musí byť celé číslo.', 'ip' => ':attribute musí byť platná IP adresa.', 'json' => ':attribute musí byť platný JSON reťazec.', diff --git a/sl/validation.php b/sl/validation.php index 2426c9947f6..d73b258d56a 100644 --- a/sl/validation.php +++ b/sl/validation.php @@ -39,6 +39,7 @@ 'exists' => 'izbran :attribute je neveljaven.', 'image' => ':attribute mora biti slika.', 'in' => 'izbran :attribute je neveljaven.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute mora biti število.', 'ip' => ':attribute mora biti veljaven IP naslov.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/sq/validation.php b/sq/validation.php index f0e8ff88bea..b9ff7708063 100644 --- a/sq/validation.php +++ b/sq/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Fusha :attribute është e kërkuar.', 'image' => ':attribute duhet të jetë imazh.', 'in' => ':attribute përzgjedhur është i/e pasaktë.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute duhet të jetë numër i plotë.', 'ip' => ':attribute duhet të jetë një IP adresë e saktë.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/sr/validation.php b/sr/validation.php index 4da5d1ea223..69b51cc1704 100644 --- a/sr/validation.php +++ b/sr/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Polje :attribute je obavezno.', 'image' => 'Polje :attribute mora biti slika.', 'in' => 'Odabrano polje :attribute nije validno.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Polje :attribute mora biti broj.', 'ip' => 'Polje :attribute mora biti validna IP adresa.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/sv/validation.php b/sv/validation.php index 0c5948fc23f..436e7df4200 100644 --- a/sv/validation.php +++ b/sv/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Fältet :attribute är obligatoriskt.', 'image' => ':attribute måste vara en bild.', 'in' => 'Det valda :attribute är ogiltigt.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute måste vara en siffra.', 'ip' => ':attribute måste vara en giltig IP-adress.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/th/validation.php b/th/validation.php index 4d27d1b85cc..53e0256080e 100755 --- a/th/validation.php +++ b/th/validation.php @@ -40,6 +40,7 @@ 'filled' => 'ข้อมูล :attribute จำเป็นต้องกรอก', 'image' => 'ข้อมูล :attribute ต้องเป็นรูปภาพ', 'in' => 'ข้อมูล ที่ถูกเลือกใน :attribute ไม่ถูกต้อง', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'ข้อมูล :attribute ต้องเป็นตัวเลข', 'ip' => 'ข้อมูล :attribute ต้องเป็น IP', 'json' => 'ข้อมูล :attribute ต้องเป็นอักขระ JSON ที่สมบูรณ์', diff --git a/tk/validation.php b/tk/validation.php index 8419074694f..a2157ebd4cb 100644 --- a/tk/validation.php +++ b/tk/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute meýdany zerur.', 'image' => ':attribute surat bolmalydyr.', 'in' => ':attribute mukdary ýalňyş.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute san bolmalydyr.', 'ip' => ':attribute dogry IP adres bolmalydyr.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/tr/validation.php b/tr/validation.php index dff1ca6bc02..c0f9903024a 100644 --- a/tr/validation.php +++ b/tr/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute alanı gereklidir.', 'image' => ':attribute alanı resim dosyası olmalıdır.', 'in' => ':attribute değeri geçersiz.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute tamsayı olmalıdır.', 'ip' => ':attribute geçerli bir IP adresi olmalıdır.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/uk/validation.php b/uk/validation.php index dc40f8f4056..0747f03a30f 100755 --- a/uk/validation.php +++ b/uk/validation.php @@ -40,6 +40,7 @@ 'exists' => 'Вибране для :attribute значення не коректне.', 'image' => 'Поле :attribute має містити зображення.', 'in' => 'Вибране для :attribute значення не коректне.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Поле :attribute має містити ціле число.', 'ip' => 'Поле :attribute має містити IP адресу.', 'json' => 'Дані поля :attribute мають бути в форматі JSON.', diff --git a/vi/validation.php b/vi/validation.php index dc70a0bb417..25e0b5948f3 100644 --- a/vi/validation.php +++ b/vi/validation.php @@ -40,6 +40,7 @@ 'filled' => 'Trường :attribute không được bỏ trống.', 'image' => 'Các tập tin trong trường :attribute phải là định dạng hình ảnh.', 'in' => 'Giá trị đã chọn trong trường :attribute không hợp lệ.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'Trường :attribute phải là một số nguyên.', 'ip' => 'Trường :attribute phải là một địa chỉa IP.', 'json' => 'The :attribute must be a valid JSON string.', diff --git a/zh-CN/validation.php b/zh-CN/validation.php index 03407c50119..48805177404 100644 --- a/zh-CN/validation.php +++ b/zh-CN/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute 不能为空。', 'image' => ':attribute 必须是图片。', 'in' => '已选的属性 :attribute 非法。', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute 必须是整数。', 'ip' => ':attribute 必须是有效的 IP 地址。', 'json' => ':attribute 必须是正确的 JSON 格式。', diff --git a/zh-HK/validation.php b/zh-HK/validation.php index e572dcc1f7e..f6377b0fc8f 100644 --- a/zh-HK/validation.php +++ b/zh-HK/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute 不能留空。', 'image' => ':attribute 必須是一張圖片。', 'in' => '所揀選的 :attribute 選項無效。', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute 必須是一個整數。', 'ip' => ':attribute 必須是一個有效的 IP 地址。', 'json' => ':attribute 必須是正確的 JSON 格式。', diff --git a/zh-TW/validation.php b/zh-TW/validation.php index ef3232b174f..468de7743c4 100644 --- a/zh-TW/validation.php +++ b/zh-TW/validation.php @@ -40,6 +40,7 @@ 'filled' => ':attribute 不能留空。', 'image' => ':attribute 必須是一張圖片。', 'in' => '所選擇的 :attribute 選項無效。', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute 必須是一個整數。', 'ip' => ':attribute 必須是一個有效的 IP 地址。', 'json' => ':attribute 必須是正確的 JSON 字串。', @@ -108,35 +109,35 @@ */ 'attributes' => [ - 'name' => '名稱', - 'username' => '使用者名', + 'address' => '地址', + 'age' => '年齡', + 'available' => '可用的', + 'city' => '城市', + 'content' => '內容', + 'country' => '國家', + 'date' => '日期', + 'day' => '天', + 'description' => '描述', 'email' => '郵箱', + 'excerpt' => '摘要', 'first_name' => '名', + 'gender' => '性別', + 'hour' => '時', 'last_name' => '姓', + 'minute' => '分', + 'mobile' => '手機', + 'month' => '月', + 'name' => '名稱', 'password' => '密碼', 'password_confirmation' => '確認密碼', - 'city' => '城市', - 'country' => '國家', - 'address' => '地址', 'phone' => '電話', - 'mobile' => '手機', - 'age' => '年齡', - 'sex' => '性別', - 'gender' => '性別', - 'day' => '天', - 'month' => '月', - 'year' => '年', - 'hour' => '時', - 'minute' => '分', 'second' => '秒', - 'title' => '標題', - 'content' => '內容', - 'description' => '描述', - 'excerpt' => '摘要', - 'date' => '日期', - 'time' => '時間', - 'available' => '可用的', + 'sex' => '性別', 'size' => '大小', + 'time' => '時間', + 'title' => '標題', + 'username' => '使用者名', + 'year' => '年', ], ]; From 3138be8cdfb9b2c0628a2310dfeb917b983c8f28 Mon Sep 17 00:00:00 2001 From: Fred Delrieu Date: Mon, 7 Mar 2016 08:24:46 +0100 Subject: [PATCH 06/36] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index b81c236a707..7d24f3f778a 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,10 @@ In this repository, you can find the lang files for the framework PHP, [Laravel --- +News of 7 March 2016: + +* validation: add *in_array* + News of 2 March 2016: * validation: add *distinct* From 9bbfbabacb60dc41b6f053690d53ef924adf181c Mon Sep 17 00:00:00 2001 From: Ivo Idham Perdameian Date: Mon, 7 Mar 2016 14:34:51 +0700 Subject: [PATCH 07/36] Translate for in_array --- id/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/validation.php b/id/validation.php index c629983ee0d..ce10c430b39 100644 --- a/id/validation.php +++ b/id/validation.php @@ -40,7 +40,7 @@ 'filled' => 'Bidang isian :attribute wajib diisi.', 'image' => 'Isian :attribute harus berupa gambar.', 'in' => 'Isian :attribute yang dipilih tidak valid.', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => 'Bidang isian :attribute tidak terdapat dalam :other.', 'integer' => 'Isian :attribute harus merupakan bilangan bulat.', 'ip' => 'Isian :attribute harus berupa alamat IP yang valid.', 'json' => 'Isian :attribute harus berupa JSON string yang valid.', From 0726fceb2ef0387dbe294cd9ff2668b78f370d28 Mon Sep 17 00:00:00 2001 From: Ognjen Miletic Date: Mon, 7 Mar 2016 09:42:05 +0100 Subject: [PATCH 08/36] removed pdv --- me/validation.php | 1 - 1 file changed, 1 deletion(-) diff --git a/me/validation.php b/me/validation.php index 0740bbae405..642e90b011e 100644 --- a/me/validation.php +++ b/me/validation.php @@ -79,7 +79,6 @@ 'timezone' => 'The :attribute must be a valid zone.', 'unique' => 'Vrijednost za polje :attribute već postoji.', 'url' => 'Format polja :attribute ne važi.', - 'pdv' => 'Format polja PDV nije ispravan. Format je npr: 20/31-00112-1', /* |-------------------------------------------------------------------------- From 564c365bfec0c872a5974366128c936414f6c3c6 Mon Sep 17 00:00:00 2001 From: overtrue Date: Mon, 7 Mar 2016 20:21:57 +0800 Subject: [PATCH 09/36] [zh-*] Update `in_array` rule. --- zh-CN/validation.php | 2 +- zh-HK/validation.php | 2 +- zh-TW/validation.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zh-CN/validation.php b/zh-CN/validation.php index 48805177404..b530f1ce483 100644 --- a/zh-CN/validation.php +++ b/zh-CN/validation.php @@ -40,7 +40,7 @@ 'filled' => ':attribute 不能为空。', 'image' => ':attribute 必须是图片。', 'in' => '已选的属性 :attribute 非法。', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => ':attribute 没有在 :other 中。', 'integer' => ':attribute 必须是整数。', 'ip' => ':attribute 必须是有效的 IP 地址。', 'json' => ':attribute 必须是正确的 JSON 格式。', diff --git a/zh-HK/validation.php b/zh-HK/validation.php index f6377b0fc8f..9e9a569a4b2 100644 --- a/zh-HK/validation.php +++ b/zh-HK/validation.php @@ -40,7 +40,7 @@ 'filled' => ':attribute 不能留空。', 'image' => ':attribute 必須是一張圖片。', 'in' => '所揀選的 :attribute 選項無效。', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => ':attribute 沒有在 :other 中。', 'integer' => ':attribute 必須是一個整數。', 'ip' => ':attribute 必須是一個有效的 IP 地址。', 'json' => ':attribute 必須是正確的 JSON 格式。', diff --git a/zh-TW/validation.php b/zh-TW/validation.php index 468de7743c4..7007c79ca25 100644 --- a/zh-TW/validation.php +++ b/zh-TW/validation.php @@ -40,7 +40,7 @@ 'filled' => ':attribute 不能留空。', 'image' => ':attribute 必須是一張圖片。', 'in' => '所選擇的 :attribute 選項無效。', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => ':attribute 沒有在 :other 中。', 'integer' => ':attribute 必須是一個整數。', 'ip' => ':attribute 必須是一個有效的 IP 地址。', 'json' => ':attribute 必須是正確的 JSON 字串。', From 6eb0936cbc585e181bf2751abafd4d5d0b8fdf3c Mon Sep 17 00:00:00 2001 From: Fred Delrieu Date: Mon, 7 Mar 2016 15:31:48 +0100 Subject: [PATCH 10/36] feature: (fr) validation in_array and distinct --- fr/validation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/validation.php b/fr/validation.php index 34898d42fd7..d1eae1920b1 100644 --- a/fr/validation.php +++ b/fr/validation.php @@ -34,13 +34,13 @@ 'different' => 'Les champs :attribute et :other doivent être différents.', 'digits' => 'Le champ :attribute doit avoir :digits chiffres.', 'digits_between' => 'Le champ :attribute doit avoir entre :min et :max chiffres.', - 'distinct' => 'The :attribute field has a duplicate value.', + 'distinct' => 'Le champ :attribute a une value dupliquée.', 'email' => 'Le champ :attribute doit être une adresse email valide.', 'exists' => 'Le champ :attribute sélectionné est invalide.', 'filled' => 'Le champ :attribute est obligatoire.', 'image' => 'Le champ :attribute doit être une image.', 'in' => 'Le champ :attribute est invalide.', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => 'Le champ :attribute n'existe pas dans :other.', 'integer' => 'Le champ :attribute doit être un entier.', 'ip' => 'Le champ :attribute doit être une adresse IP valide.', 'json' => 'Le champ :attribute doit être un document JSON valide.', From a8cc5f7e276122b3762a029ef47164400d0f7398 Mon Sep 17 00:00:00 2001 From: scrubmx Date: Mon, 7 Mar 2016 23:04:11 -0600 Subject: [PATCH 11/36] Update es/validation.php Provide the spanish translation for the `in_array` attribute. --- es/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/validation.php b/es/validation.php index dafee43eee4..969a15cb373 100644 --- a/es/validation.php +++ b/es/validation.php @@ -40,7 +40,7 @@ 'filled' => 'El campo :attribute es obligatorio.', 'image' => ':attribute debe ser una imagen.', 'in' => ':attribute es inválido.', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => 'El campo :attribute no existe en :other.', 'integer' => ':attribute debe ser un número entero.', 'ip' => ':attribute debe ser una dirección IP válida.', 'json' => 'El campo :attribute debe tener una cadena JSON válida.', From b178fdaab2a9b5582c279be354aae0f22f978b9f Mon Sep 17 00:00:00 2001 From: Fred Delrieu Date: Tue, 8 Mar 2016 08:14:13 +0100 Subject: [PATCH 12/36] Update validation.php --- fr/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/validation.php b/fr/validation.php index d1eae1920b1..ea73f00b595 100644 --- a/fr/validation.php +++ b/fr/validation.php @@ -40,7 +40,7 @@ 'filled' => 'Le champ :attribute est obligatoire.', 'image' => 'Le champ :attribute doit être une image.', 'in' => 'Le champ :attribute est invalide.', - 'in_array' => 'Le champ :attribute n'existe pas dans :other.', + 'in_array' => 'Le champ :attribute n\'existe pas dans :other.', 'integer' => 'Le champ :attribute doit être un entier.', 'ip' => 'Le champ :attribute doit être une adresse IP valide.', 'json' => 'Le champ :attribute doit être un document JSON valide.', From 12be747b99566d91dc48321937bdb3cdee10abe9 Mon Sep 17 00:00:00 2001 From: Tautvydas Date: Tue, 8 Mar 2016 15:27:52 +0200 Subject: [PATCH 13/36] Translate missing LT strings --- lt/validation.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lt/validation.php b/lt/validation.php index 9a854ead5ac..d4313ed20f8 100644 --- a/lt/validation.php +++ b/lt/validation.php @@ -15,7 +15,7 @@ 'accepted' => 'Laukas :attribute turi būti priimtas.', 'active_url' => 'Laukas :attribute nėra galiojantis internetinis adresas.', - 'after' => 'Laukelyje :attribute turi būti data po :date.', + 'after' => 'Lauko :attribute reikšmė turi būti po :date datos.', 'alpha' => 'Laukas :attribute gali turėti tik raides.', 'alpha_dash' => 'Laukas :attribute gali turėti tik raides, skaičius ir brūkšnelius.', 'alpha_num' => 'Laukas :attribute gali turėti tik raides ir skaičius.', @@ -34,16 +34,16 @@ 'different' => 'Laukų :attribute ir :other reikšmės turi skirtis.', 'digits' => 'Laukas :attribute turi būti sudarytas iš :digits skaitmenų.', 'digits_between' => 'Laukas :attribute tuti turėti nuo :min iki :max skaitmenų.', - 'distinct' => 'The :attribute field has a duplicate value.', + 'distinct' => 'Laukas :attribute pasikartoja.', 'email' => 'Lauko :attribute reikšmė turi būti galiojantis el. pašto adresas.', 'filled' => 'Laukas :attribute turi būti užpildytas.', 'exists' => 'Pasirinkta negaliojanti :attribute reikšmė.', 'image' => 'Lauko :attribute reikšmė turi būti paveikslėlis.', 'in' => 'Pasirinkta negaliojanti :attribute reikšmė.', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => 'Laukas :attribute neegzistuoja :other lauke.', 'integer' => 'Lauko :attribute reikšmė turi būti veikasis skaičius.', 'ip' => 'Lauko :attribute reikšmė turi būti galiojantis IP adresas.', - 'json' => 'The :attribute must be a valid JSON string.', + 'json' => 'Lauko :attribute reikšmė turi būti JSON tekstas.', 'max' => [ 'numeric' => 'Lauko :attribute reikšmė negali būti didesnė nei :max.', 'file' => 'Failo dydis lauke :attribute reikšmė negali būti didesnė nei :max kilobaitų.', @@ -59,11 +59,11 @@ ], 'not_in' => 'Pasirinkta negaliojanti reikšmė :attribute.', 'numeric' => 'Lauko :attribute reikšmė turi būti skaičius.', - 'present' => 'The :attribute field must be present.', + 'present' => 'Laukas :attribute turi egzistuoti.', 'regex' => 'Negaliojantis lauko :attribute formatas.', 'required' => 'Privaloma užpildyti lauką :attribute.', 'required_if' => 'Privaloma užpildyti lauką :attribute kai :other yra :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_unless' => 'Laukas :attribute yra privalomas, nebent :other yra tarp :values reikšmių.', 'required_with' => 'Privaloma užpildyti lauką :attribute kai pateikta :values.', 'required_with_all' => 'Privaloma užpildyti lauką :attribute kai pateikta :values.', 'required_without' => 'Privaloma užpildyti lauką :attribute kai nepateikta :values.', @@ -75,7 +75,7 @@ 'string' => 'Simbolių skaičius lauke :attribute turi būti :size.', 'array' => 'Elementų kiekis lauke :attribute turi būti :size.', ], - 'string' => 'The :attribute must be a string.', + 'string' => 'Laukas :attribute turi būti tekstinis.', 'timezone' => 'Lauko :attribute reikšmė turi būti galiojanti laiko zona.', 'unique' => 'Tokia :attribute reikšmė jau pasirinkta.', 'url' => 'Negaliojantis lauko :attribute formatas.', From 58a142068240785786fafb02dd127c40bc6bea5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20S=C3=B8rb=C3=B8?= Date: Tue, 8 Mar 2016 15:28:40 +0100 Subject: [PATCH 14/36] Added Norwegian Nynorsk --- nn/auth.php | 19 ++++++++ nn/pagination.php | 19 ++++++++ nn/passwords.php | 22 +++++++++ nn/validation.php | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 175 insertions(+) create mode 100644 nn/auth.php create mode 100755 nn/pagination.php create mode 100755 nn/passwords.php create mode 100755 nn/validation.php diff --git a/nn/auth.php b/nn/auth.php new file mode 100644 index 00000000000..b0b14646742 --- /dev/null +++ b/nn/auth.php @@ -0,0 +1,19 @@ + 'Brukarnamn og/eller passord er feil.', + 'throttle' => 'For mange innloggingsforsøk. Ver venleg og prøv på nytt om :seconds sekund.', + +]; diff --git a/nn/pagination.php b/nn/pagination.php new file mode 100755 index 00000000000..911ae417b73 --- /dev/null +++ b/nn/pagination.php @@ -0,0 +1,19 @@ + '« Førre', + 'next' => 'Neste »', + +]; diff --git a/nn/passwords.php b/nn/passwords.php new file mode 100755 index 00000000000..43eaea60c55 --- /dev/null +++ b/nn/passwords.php @@ -0,0 +1,22 @@ + 'Passordet skal ha minst seks teikn og vere lik stadfestinga.', + 'reset' => 'Passordet vart endra!', + 'sent' => 'Vi har sendt deg ei lenke du kan klikke på for å endre passordet ditt!', + 'token' => 'Koden for å nullstille passord er ikkje gyldig.', + 'user' => 'Vi finn ingen brukarar med denne e-postadressen.', + +]; diff --git a/nn/validation.php b/nn/validation.php new file mode 100755 index 00000000000..8243b14f084 --- /dev/null +++ b/nn/validation.php @@ -0,0 +1,115 @@ + ':attribute må aksepterast.', + 'active_url' => ':attribute er ikkje ein gyldig URL.', + 'after' => ':attribute må vere ein dato etter :date.', + 'alpha' => ':attribute må berre vere av bokstavar.', + 'alpha_dash' => ':attribute må berre vere av bokstavar, tal og bindestrekar.', + 'alpha_num' => ':attribute må berre vere av bokstavar og tal.', + 'array' => ':attribute må vere ei matrise.', + 'before' => ':attribute må vere ein dato før :date.', + 'between' => [ + 'numeric' => ':attribute skal vere mellom :min - :max.', + 'file' => ':attribute skal vere mellom :min - :max kilobytes.', + 'string' => ':attribute skal vere mellom :min - :max teikn.', + 'array' => ':attribute må ha mellom :min - :max element.', + ], + 'boolean' => ':attribute må vere sann eller usann.', + 'confirmed' => ':attribute er ikkje likt feltet for stadfesting.', + 'date' => ':attribute er ikkje ein gyldig dato.', + 'date_format' => ':attribute er ikkje likt formatet :format.', + 'different' => ':attribute og :other skal vere ulike.', + 'digits' => ':attribute skal ha :digits siffer.', + 'digits_between' => ':attribute skal vere mellom :min og :max siffer.', + 'distinct' => ':attribute har ein duplikatverdi.', + 'email' => ':attribute format er ugyldig.', + 'exists' => 'Det valde :attribute er ugyldig.', + 'filled' => ':attribute må fyllast ut.', + 'image' => ':attribute skal vere eit bilete.', + 'in' => 'Det valde :attribute er ugyldig.', + 'in_array' => ':attribute eksisterer ikkje i :other.', + 'integer' => ':attribute skal vere eit heiltal.', + 'ip' => ':attribute skal vere ei gyldig IP-adresse.', + 'json' => ':attribute må vere på JSON-format.', + 'max' => [ + 'numeric' => ':attribute skal vere mindre enn :max.', + 'file' => ':attribute skal vere mindre enn :max kilobytes.', + 'string' => ':attribute skal vere kortare enn :max teikn.', + 'array' => ':attribute skal ikkje ha fleire enn :max element.', + ], + 'mimes' => ':attribute skal vere ei fil av typen: :values.', + 'min' => [ + 'numeric' => ':attribute skal vere større enn :min.', + 'file' => ':attribute skal vere større enn :min kilobytes.', + 'string' => ':attribute skal vere lengre enn :min teikn.', + 'array' => ':attribute må vere minst :min element.', + ], + 'not_in' => 'Den valgte :attribute er ugyldig.', + 'numeric' => ':attribute skal vere eit tal.', + 'present' => ':attribute må vere til stades.', + 'regex' => 'Formatet på :attribute er ugyldig.', + 'required' => ':attribute må fyllast ut.', + 'required_if' => ':attribute må fyllast ut når :other er :value.', + 'required_unless' => ':attribute må vere til stades viss ikkje :other finnas hjå verdiene :values.', + 'required_with' => ':attribute må fyllast ut når :values er fylt ut.', + 'required_with_all' => ':attribute må vere til stades når :values er oppgjeve.', + 'required_without' => ':attribute må fyllast ut når :values ikkje er fylt ut.', + 'required_without_all' => ':attribute må vere til stades når inga av :values er oppgjeve.', + 'same' => ':attribute og :other må vere like.', + 'size' => [ + 'numeric' => ':attribute må vere :size.', + 'file' => ':attribute må vere :size kilobytes.', + 'string' => ':attribute må vere :size teikn lang.', + 'array' => ':attribute må innehalde :size element.', + ], + 'string' => ':attribute må vere ein tekststreng.', + 'timezone' => ':attribute må vere ei gyldig tidssone.', + 'unique' => ':attribute er allereie i bruk.', + 'url' => 'Formatet på :attribute er ugyldig.', + + /* + |-------------------------------------------------------------------------- + | 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 d71094fef720c80fb14dccc10d892212543ddd77 Mon Sep 17 00:00:00 2001 From: Otar Magaldadze Date: Tue, 8 Mar 2016 18:45:24 +0400 Subject: [PATCH 15/36] Add Georgian translation line --- ka/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/validation.php b/ka/validation.php index e44e3a83f93..efd4fcfc318 100755 --- a/ka/validation.php +++ b/ka/validation.php @@ -62,7 +62,7 @@ 'regex' => ':attribute არ ემთხვევა ფორმატს.', 'required' => ':attribute აუცილებელია.', 'required_if' => ':attribute აუცილებელია, თუ :other-ის მნიშვნელობა ემთხვევა :value-ს.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_unless' => ':attribute აუცილებელია, თუ :values არ მოიცავს :other-ს.', 'required_with' => ':attribute აუცილებელია, თუ :values მითითებულია.', 'required_with_all' => ':attribute აუცილებელია, თუ :values მითითებულია.', 'required_without' => ':attribute აუცილებელია, თუ :values არ არის მითითებული.', From 9d5afc669d3d6b0d183f6384afb0d1814e0cf3a1 Mon Sep 17 00:00:00 2001 From: Jurgen Date: Thu, 10 Mar 2016 16:09:32 +0100 Subject: [PATCH 16/36] Dutch translation for in_array --- nl/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/validation.php b/nl/validation.php index a58f9b6f515..222cf6fd9df 100644 --- a/nl/validation.php +++ b/nl/validation.php @@ -40,7 +40,7 @@ 'filled' => ':attribute is verplicht.', 'image' => ':attribute moet een afbeelding zijn.', 'in' => ':attribute is ongeldig.', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => 'Het :attribute veld bestaat niet in :other.', 'integer' => ':attribute moet een getal zijn.', 'ip' => ':attribute moet een geldig IP-adres zijn.', 'json' => 'The :attribute must be a valid JSON string.', From 4ed0951d9298f97d0a21b002779cd85e40cbe791 Mon Sep 17 00:00:00 2001 From: Jurgen Date: Thu, 10 Mar 2016 16:13:20 +0100 Subject: [PATCH 17/36] Other Dutch translations --- nl/validation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/validation.php b/nl/validation.php index a58f9b6f515..7aa8804d9d1 100644 --- a/nl/validation.php +++ b/nl/validation.php @@ -43,7 +43,7 @@ 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => ':attribute moet een getal zijn.', 'ip' => ':attribute moet een geldig IP-adres zijn.', - 'json' => 'The :attribute must be a valid JSON string.', + 'json' => ':attribute moet een geldige JSON-string zijn.', 'max' => [ 'numeric' => ':attribute mag niet hoger dan :max zijn.', 'file' => ':attribute mag niet meer dan :max kilobytes zijn.', @@ -59,7 +59,7 @@ ], 'not_in' => 'Het formaat van :attribute is ongeldig.', 'numeric' => ':attribute moet een nummer zijn.', - 'present' => 'The :attribute field must be present.', + 'present' => 'Het :attribute veld moet bestaan.', 'regex' => ':attribute formaat is ongeldig.', 'required' => ':attribute is verplicht.', 'required_if' => ':attribute is verplicht indien :other gelijk is aan :value.', From 01dc2458fe0f09a8e2f180325d161287b5f18bfc Mon Sep 17 00:00:00 2001 From: Fred Delrieu Date: Thu, 10 Mar 2016 16:27:51 +0100 Subject: [PATCH 18/36] Update validation.php --- ar/validation.php | 1 - 1 file changed, 1 deletion(-) diff --git a/ar/validation.php b/ar/validation.php index e65ebe1e5b0..1ff382a9b2a 100755 --- a/ar/validation.php +++ b/ar/validation.php @@ -41,7 +41,6 @@ 'image' => 'يجب أن يكون الحقل :attribute صورةً', 'in' => 'الحقل :attribute لاغٍ', 'in_array' => 'The :attribute field does not exist in :other.', - 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'يجب أن يكون الحقل :attribute عددًا صحيحًا', 'ip' => 'يجب أن يكون الحقل :attribute عنوان IP ذي بُنية صحيحة', From b753efd3fb3afa12c0fc3e16458f9b9edb05c5fb Mon Sep 17 00:00:00 2001 From: Fred Delrieu Date: Thu, 10 Mar 2016 16:28:13 +0100 Subject: [PATCH 19/36] Update validation.php --- ar/validation.php | 1 - 1 file changed, 1 deletion(-) diff --git a/ar/validation.php b/ar/validation.php index 1ff382a9b2a..5fa08af652f 100755 --- a/ar/validation.php +++ b/ar/validation.php @@ -42,7 +42,6 @@ 'in' => 'الحقل :attribute لاغٍ', 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'يجب أن يكون الحقل :attribute عددًا صحيحًا', - 'ip' => 'يجب أن يكون الحقل :attribute عنوان IP ذي بُنية صحيحة', 'json' => 'يجب أن يكون الحقل :attribute نصآ من نوع JSON.', 'max' => [ From a2ef4e2c0c7890a70935df0597b4073438cb02b6 Mon Sep 17 00:00:00 2001 From: Otar Magaldadze Date: Tue, 8 Mar 2016 18:45:24 +0400 Subject: [PATCH 20/36] A couple of Georgian translations --- ka/validation.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ka/validation.php b/ka/validation.php index e44e3a83f93..62f92fff4ce 100755 --- a/ka/validation.php +++ b/ka/validation.php @@ -34,7 +34,7 @@ 'different' => ':attribute და :other ერთმანეთს არ უნდა ემთხვეოდეს.', 'digits' => ':attribute :digits ციფრისგან უნდა შედგებოდეს.', 'digits_between' => ':attribute :min-დან :max ციფრამბდე უნდა შედგებოდეს.', - 'distinct' => 'The :attribute field has a duplicate value.', + 'distinct' => ':attribute ველი შეიცავს გაორებულ მნიშვნელობას.', 'email' => ':attribute სწორი ელ.ფოსტა უნდა იყოს.', 'exists' => 'ასეთი :attribute არ არსებობს.', 'filled' => ':attribute აუცილებელია.', @@ -58,11 +58,11 @@ ], 'not_in' => 'მითითებული :attribute არასწორია.', 'numeric' => ':attribute რიცხვი უნდა იყოს.', - 'present' => 'The :attribute field must be present.', + 'present' => ':attribute აუცილებელია.', 'regex' => ':attribute არ ემთხვევა ფორმატს.', 'required' => ':attribute აუცილებელია.', 'required_if' => ':attribute აუცილებელია, თუ :other-ის მნიშვნელობა ემთხვევა :value-ს.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_unless' => ':attribute აუცილებელია, თუ :values არ მოიცავს :other-ს.', 'required_with' => ':attribute აუცილებელია, თუ :values მითითებულია.', 'required_with_all' => ':attribute აუცილებელია, თუ :values მითითებულია.', 'required_without' => ':attribute აუცილებელია, თუ :values არ არის მითითებული.', From 4dc3b9a6ebb6c299748c36cba4db9408d66b1e7a Mon Sep 17 00:00:00 2001 From: Frederic Delrieu Date: Thu, 10 Mar 2016 18:11:55 +0100 Subject: [PATCH 21/36] feature: english files --- en/auth.php | 19 ++++++++ en/pagination.php | 19 ++++++++ en/passwords.php | 22 +++++++++ en/validation.php | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+) create mode 100644 en/auth.php create mode 100644 en/pagination.php create mode 100644 en/passwords.php create mode 100644 en/validation.php diff --git a/en/auth.php b/en/auth.php new file mode 100644 index 00000000000..6ef1a73308a --- /dev/null +++ b/en/auth.php @@ -0,0 +1,19 @@ + 'These credentials do not match our records.', + 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + +]; diff --git a/en/pagination.php b/en/pagination.php new file mode 100644 index 00000000000..fcab34b2531 --- /dev/null +++ b/en/pagination.php @@ -0,0 +1,19 @@ + '« Previous', + 'next' => 'Next »', + +]; diff --git a/en/passwords.php b/en/passwords.php new file mode 100644 index 00000000000..ffa19ba4070 --- /dev/null +++ b/en/passwords.php @@ -0,0 +1,22 @@ + 'Passwords must be at least six characters and match the confirmation.', + 'reset' => 'Your password has been reset!', + 'sent' => 'We have e-mailed your password reset link!', + 'token' => 'This password reset token is invalid.', + 'user' => "We can't find a user with that e-mail address.", + +]; diff --git a/en/validation.php b/en/validation.php new file mode 100644 index 00000000000..b1e612044f1 --- /dev/null +++ b/en/validation.php @@ -0,0 +1,113 @@ + 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :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.', + '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.', + 'distinct' => 'The :attribute field has a duplicate value.', + 'email' => 'The :attribute must be a valid email address.', + 'exists' => 'The selected :attribute is invalid.', + 'filled' => 'The :attribute field is required.', + '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.', + '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.', + '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.', + '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.', + '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 3d0fe8fdeb11cd21606885ed0142228075eb3c0f Mon Sep 17 00:00:00 2001 From: Frederic Delrieu Date: Thu, 10 Mar 2016 18:15:48 +0100 Subject: [PATCH 22/36] feature: todo - create file md --- README.md | 5 +- hr/validation.php | 1 + script/todo.php | 50 +++++++ sl/validation.php | 1 + todo.md | 347 ++++++++++++++++++++++++++++++++++++++++++++++ uk/validation.php | 1 + 6 files changed, 404 insertions(+), 1 deletion(-) create mode 100644 script/todo.php create mode 100644 todo.md diff --git a/README.md b/README.md index 7d24f3f778a..6f580913ff4 100644 --- a/README.md +++ b/README.md @@ -73,4 +73,7 @@ How can I fix a file ? * if installed to project local, run `vendor/bin/php-cs-fixer fix`. * add a pull request with the name of the language -The files for Laravel 4 are in `laravel4` branch, and for Laravel 5, are in `master` branch. +Status of files +--- + +* todo.md diff --git a/hr/validation.php b/hr/validation.php index 76888bfdf37..c2914578c39 100644 --- a/hr/validation.php +++ b/hr/validation.php @@ -37,6 +37,7 @@ 'distinct' => 'The :attribute field has a duplicate value.', 'email' => 'Polje :attribute mora biti ispravna e-mail adresa.', 'exists' => 'Odabrano polje :attribute nije ispravno.', + 'filled' => 'The :attribute field is required.', 'image' => 'Polje :attribute mora biti slika.', 'in' => 'Odabrano polje :attribute nije ispravno.', 'in_array' => 'The :attribute field does not exist in :other.', diff --git a/script/todo.php b/script/todo.php new file mode 100644 index 00000000000..5b0f75dd167 --- /dev/null +++ b/script/todo.php @@ -0,0 +1,50 @@ + include(__DIR__.'/../en/auth.php'), + 'pagination' => include(__DIR__.'/../en/pagination.php'), + 'passwords' => include(__DIR__.'/../en/passwords.php'), + 'validation' => include(__DIR__.'/../en/validation.php'), +]; + +$text = "# Todo list\n\n"; + +// Return diff language by language +foreach ($languages as $language) { + $text .= "\n * ".$language.":\n"; + + $current = [ + 'auth' => include(__DIR__.'/../'.$language.'/auth.php'), + 'pagination' => include(__DIR__.'/../'.$language.'/pagination.php'), + 'passwords' => include(__DIR__.'/../'.$language.'/passwords.php'), + 'validation' => include(__DIR__.'/../'.$language.'/validation.php'), + ]; + + foreach ($english as $key => $values) { + foreach ($values as $key2 => $value2) { + if ($key2 != 'custom' && $key2 != 'attributes') { + if (!isset($current[$key][$key2])) { + $text .= ' * '.$key.' : '.$key2." : needed\n"; + } elseif ($current[$key][$key2] == $english[$key][$key2]) { + $text .= ' * '.$key.' : '.$key2." : not translated\n"; + } + } + } + } +} + +$pathTodoMd = __DIR__.'/../todo.md'; + +file_put_contents($pathTodoMd, $text); diff --git a/sl/validation.php b/sl/validation.php index d73b258d56a..4f2bdfaa026 100644 --- a/sl/validation.php +++ b/sl/validation.php @@ -37,6 +37,7 @@ 'distinct' => 'The :attribute field has a duplicate value.', 'email' => ':attribute mora biti veljaven e-poštni naslov.', 'exists' => 'izbran :attribute je neveljaven.', + 'filled' => 'The :attribute field is required.', 'image' => ':attribute mora biti slika.', 'in' => 'izbran :attribute je neveljaven.', 'in_array' => 'The :attribute field does not exist in :other.', diff --git a/todo.md b/todo.md new file mode 100644 index 00000000000..baade30cada --- /dev/null +++ b/todo.md @@ -0,0 +1,347 @@ +# Todo list + + + * ar: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + + * be: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + + * bg: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * bs: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * ca: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * cs: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * cy: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + + * da: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + * validation : timezone : not translated + + * de: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + + * el: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + + * es: + + * fa: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + + * fi: + * auth : failed : not translated + * auth : throttle : not translated + * validation : array : not translated + * validation : digits_between : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : regex : not translated + * validation : required_if : not translated + * validation : required_unless : not translated + * validation : required_with : not translated + * validation : required_with_all : not translated + * validation : required_without : not translated + * validation : required_without_all : not translated + * validation : string : not translated + * validation : timezone : not translated + + * fr: + + * gl: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + + * he: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + + * hr: + * validation : distinct : not translated + * validation : filled : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + + * hu: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * id: + + * is: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : required_with : not translated + * validation : required_with_all : not translated + * validation : required_without : not translated + * validation : required_without_all : not translated + * validation : string : not translated + + * it: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * ja: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + + * ka: + * validation : in_array : not translated + + * km: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : required_with_all : not translated + * validation : string : not translated + * validation : timezone : not translated + + * ko: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + + * lt: + + * me: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + * validation : timezone : not translated + + * mk: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : required_with_all : not translated + * validation : required_without_all : not translated + * validation : string : not translated + * validation : timezone : not translated + + * ms: + * validation : distinct : not translated + * validation : exists : not translated + * validation : in : not translated + * validation : in_array : not translated + * validation : not_in : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * nb: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + + * ne: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + + * nl: + * validation : distinct : not translated + + * nn: + + * pl: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + + * pt: + * validation : in_array : not translated + + * pt-BR: + * validation : in_array : not translated + + * ro: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * ru: + * validation : in_array : not translated + + * sc: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + + * sk: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * sl: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : filled : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + * validation : timezone : not translated + + * sq: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * sr: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * sv: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * th: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * tk: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + + * tr: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + + * uk: + * validation : distinct : not translated + * validation : in_array : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : string : not translated + + * vi: + * auth : failed : not translated + * auth : throttle : not translated + * validation : distinct : not translated + * validation : in_array : not translated + * validation : json : not translated + * validation : present : not translated + * validation : required_unless : not translated + * validation : required_with_all : not translated + * validation : string : not translated + + * zh-CN: + + * zh-HK: + + * zh-TW: diff --git a/uk/validation.php b/uk/validation.php index 0747f03a30f..cb9ac49a883 100755 --- a/uk/validation.php +++ b/uk/validation.php @@ -75,6 +75,7 @@ 'string' => 'Текст в полі :attribute повинен містити :size символів.', 'array' => 'Поле :attribute повинне містити :size елементів.', ], + 'string' => 'The :attribute must be a string.', 'timezone' => 'Поле :attribute повинне містити коректну часову зону.', 'unique' => 'Таке значення поля :attribute вже існує.', 'url' => 'Формат поля :attribute неправильний.', From 840b7b163957ef8adabdcd28377ca79785e3cb28 Mon Sep 17 00:00:00 2001 From: caouecs Date: Fri, 11 Mar 2016 08:53:35 +0100 Subject: [PATCH 23/36] feature: new status with "me" validation --- me/validation.php | 30 +++++++++++++++--------------- todo.md | 8 -------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/me/validation.php b/me/validation.php index 642e90b011e..1a0ea54dba1 100644 --- a/me/validation.php +++ b/me/validation.php @@ -13,15 +13,15 @@ | */ - 'accepted' => 'Polje :attribute mora biti prihvaćeno.', - 'active_url' => 'Polje :attribute nije validan URL.', - 'after' => 'Polje :attribute mora biti datum poslije :date.', - 'alpha' => 'Polje :attribute može sadržati samo slova.', - 'alpha_dash' => 'Polje :attribute može sadržati samo slova, brojeve i crtice.', - 'alpha_num' => 'Polje :attribute može sadržati samo slova i brojeve.', - 'array' => 'Polje :attribute mora sadržati određen broj stavki.', - 'before' => 'Polje :attribute mora biti datum prije :date.', - 'between' => [ + 'accepted' => 'Polje :attribute mora biti prihvaćeno.', + 'active_url' => 'Polje :attribute nije validan URL.', + 'after' => 'Polje :attribute mora biti datum poslije :date.', + 'alpha' => 'Polje :attribute može sadržati samo slova.', + 'alpha_dash' => 'Polje :attribute može sadržati samo slova, brojeve i crtice.', + 'alpha_num' => 'Polje :attribute može sadržati samo slova i brojeve.', + 'array' => 'Polje :attribute mora sadržati određen broj stavki.', + 'before' => 'Polje :attribute mora biti datum prije :date.', + 'between' => [ 'numeric' => 'Polje :attribute mora biti između :min - :max.', 'file' => 'Fajl :attribute mora biti između :min - :max kilobajta.', 'string' => 'Polje :attribute mora sadržati između :min - :max karaktera.', @@ -50,8 +50,8 @@ 'string' => 'Polje :attribute mora sadržati manje od :max karaktera.', 'array' => 'Polje :attribute ne smije da image više od :max stavki.', ], - 'mimes' => 'Polje :attribute mora biti fajl tipa: :values.', - 'min' => [ + 'mimes' => 'Polje :attribute mora biti fajl tipa: :values.', + 'min' => [ 'numeric' => 'Polje :attribute mora biti najmanje :min.', 'file' => 'Fajl :attribute mora biti najmanje :min kilobajta.', 'string' => 'Polje :attribute mora sadržati najmanje :min karaktera.', @@ -75,10 +75,10 @@ 'string' => 'Polje :attribute mora biti :size karaktera.', 'array' => 'Polje :attribute mora sadržati :size stavki.', ], - 'string' => 'Polje :attribute mora biti string.', - 'timezone' => 'The :attribute must be a valid zone.', - 'unique' => 'Vrijednost za polje :attribute već postoji.', - 'url' => 'Format polja :attribute ne važi.', + 'string' => 'Polje :attribute mora biti string.', + 'timezone' => 'The :attribute must be a valid zone.', + 'unique' => 'Vrijednost za polje :attribute već postoji.', + 'url' => 'Format polja :attribute ne važi.', /* |-------------------------------------------------------------------------- diff --git a/todo.md b/todo.md index baade30cada..1c01e9519ca 100644 --- a/todo.md +++ b/todo.md @@ -176,14 +176,6 @@ * lt: * me: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated * validation : timezone : not translated * mk: From 936af01ddf7e23aed1cfc99ba369a92c312da8e2 Mon Sep 17 00:00:00 2001 From: Jurgen Date: Fri, 11 Mar 2016 09:22:23 +0100 Subject: [PATCH 24/36] Dutch translation for distinct Also improved some translations --- nl/validation.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nl/validation.php b/nl/validation.php index 37dab65b86f..8f77b2d949a 100644 --- a/nl/validation.php +++ b/nl/validation.php @@ -34,13 +34,13 @@ 'different' => ':attribute en :other moeten verschillend zijn.', 'digits' => ':attribute moet bestaan uit :digits cijfers.', 'digits_between' => ':attribute moet bestaan uit minimaal :min en maximaal :max cijfers.', - 'distinct' => 'The :attribute field has a duplicate value.', + 'distinct' => ':attribute heeft een dubbele waarde.', 'email' => ':attribute is geen geldig e-mailadres.', 'exists' => ':attribute bestaat niet.', 'filled' => ':attribute is verplicht.', 'image' => ':attribute moet een afbeelding zijn.', 'in' => ':attribute is ongeldig.', - 'in_array' => 'Het :attribute veld bestaat niet in :other.', + 'in_array' => ':attribute bestaat niet in :other.', 'integer' => ':attribute moet een getal zijn.', 'ip' => ':attribute moet een geldig IP-adres zijn.', 'json' => ':attribute moet een geldige JSON-string zijn.', @@ -59,7 +59,7 @@ ], 'not_in' => 'Het formaat van :attribute is ongeldig.', 'numeric' => ':attribute moet een nummer zijn.', - 'present' => 'Het :attribute veld moet bestaan.', + 'present' => ':attribute moet bestaan.', 'regex' => ':attribute formaat is ongeldig.', 'required' => ':attribute is verplicht.', 'required_if' => ':attribute is verplicht indien :other gelijk is aan :value.', @@ -75,8 +75,8 @@ 'string' => ':attribute moet :size karakters zijn.', 'array' => ':attribute moet :size items bevatten.', ], - 'string' => 'Het :attribute moet een tekenreeks zijn.', - 'timezone' => 'Het :attribute moet een geldige zone zijn.', + 'string' => ':attribute moet een tekenreeks zijn.', + 'timezone' => ':attribute moet een geldige tijdzone zijn.', 'unique' => ':attribute is al in gebruik.', 'url' => ':attribute is geen geldige URL.', From 395ce2d1d7113aa2869334720d4509d49a9ead15 Mon Sep 17 00:00:00 2001 From: Peter Angelov Date: Fri, 11 Mar 2016 20:26:54 +0100 Subject: [PATCH 25/36] Translated new validation rules --- sk/validation.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sk/validation.php b/sk/validation.php index 72af176e384..f32fcb0af1b 100644 --- a/sk/validation.php +++ b/sk/validation.php @@ -27,20 +27,20 @@ 'string' => ':attribute musí mať rozsah :min - :max znakov.', 'array' => ':attribute musí mať rozsah :min - :max prvkov.', ], - 'boolean' => 'The :attribute field must be true or false', + 'boolean' => ':attribute musí byť pravda alebo nepravda.', 'confirmed' => ':attribute konfirmácia sa nezhoduje.', 'date' => ':attribute má neplatný dátum.', 'date_format' => ':attribute sa nezhoduje s formátom :format.', 'different' => ':attribute a :other musia byť odlišné.', 'digits' => ':attribute musí mať :digits číslic.', 'digits_between' => ':attribute musí mať rozsah :min až :max číslic.', - 'distinct' => 'The :attribute field has a duplicate value.', + 'distinct' => ':attribute je duplicitný.', 'email' => ':attribute má neplatný formát.', 'exists' => 'označený :attribute je neplatný.', 'filled' => ':attribute je požadované.', 'image' => ':attribute musí byť obrázok.', 'in' => 'označený :attribute je neplatný.', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => ':attribute sa nenachádza v :other.', 'integer' => ':attribute musí byť celé číslo.', 'ip' => ':attribute musí byť platná IP adresa.', 'json' => ':attribute musí byť platný JSON reťazec.', @@ -57,13 +57,13 @@ 'string' => ':attribute musí mať aspoň :min znakov.', 'array' => ':attribute musí mať aspoň :min prvkov.', ], - 'not_in' => 'označený:attribute je neplatný.', + 'not_in' => 'označený :attribute je neplatný.', 'numeric' => ':attribute musí byť číslo.', - 'present' => 'The :attribute field must be present.', + 'present' => ':attribute musí byť odoslaný.', 'regex' => ':attribute má neplatný formát.', 'required' => ':attribute je požadované.', 'required_if' => ':attribute je požadované keď :other je :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_unless' => ':attribute je požadované, okrem prípadu keď :other je v :values.', 'required_with' => ':attribute je požadované keď :values je prítomné.', 'required_with_all' => ':attribute je požadované ak :values je nastavené.', 'required_without' => ':attribute je požadované keď :values nie je prítomné.', @@ -77,8 +77,8 @@ ], 'string' => ':attribute musí byť reťazec znakov.', 'timezone' => ':attribute musí byť platné časové pásmo.', - 'unique' => ':attribute je nedostupný.', - 'url' => ':attribute neplatný formát.', + 'unique' => ':attribute už existuje.', + 'url' => ':attribute musí mať formát URL.', /* |-------------------------------------------------------------------------- From 003d46bbf1f726af32abfb4b4c56e906006061d3 Mon Sep 17 00:00:00 2001 From: Peter Angelov Date: Fri, 11 Mar 2016 23:52:25 +0100 Subject: [PATCH 26/36] Translate to SK --- sk/auth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sk/auth.php b/sk/auth.php index 6ef1a73308a..aa0f9aca005 100644 --- a/sk/auth.php +++ b/sk/auth.php @@ -13,7 +13,7 @@ | */ - 'failed' => 'These credentials do not match our records.', - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + 'failed' => 'Prihlasovacie údaje nie sú správne.', + 'throttle' => 'Prekročený limit pokusov. Skúste znovu o :seconds sekúnd.', ]; From 3effea71e07aa2261034a2868cfb5a954d9b52f3 Mon Sep 17 00:00:00 2001 From: caouecs Date: Sat, 12 Mar 2016 09:22:45 +0100 Subject: [PATCH 27/36] feature: todo --- todo.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/todo.md b/todo.md index 1c01e9519ca..33bf8a980f8 100644 --- a/todo.md +++ b/todo.md @@ -211,7 +211,6 @@ * validation : present : not translated * nl: - * validation : distinct : not translated * nn: @@ -249,12 +248,6 @@ * validation : string : not translated * sk: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated - * validation : required_unless : not translated * sl: * auth : failed : not translated From 29b8c1328c575b1988a9b4673204e5ba5f7202fb Mon Sep 17 00:00:00 2001 From: Fred Delrieu Date: Sat, 12 Mar 2016 09:25:11 +0100 Subject: [PATCH 28/36] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6f580913ff4..a9bb5d3f607 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,10 @@ In this repository, you can find the lang files for the framework PHP, [Laravel --- +News of 12 March 2016: + +* todo list: in todo.md + News of 7 March 2016: * validation: add *in_array* From a9cd259a0cd5393bacd73d46d3b8e3e11cea1f57 Mon Sep 17 00:00:00 2001 From: caouecs Date: Sat, 12 Mar 2016 09:28:04 +0100 Subject: [PATCH 29/36] feature: todo list --- script/todo.php | 4 +- todo.md | 452 ++++++++++++++++++++++++------------------------ 2 files changed, 228 insertions(+), 228 deletions(-) diff --git a/script/todo.php b/script/todo.php index 5b0f75dd167..bc6266b7e6e 100644 --- a/script/todo.php +++ b/script/todo.php @@ -36,9 +36,9 @@ foreach ($values as $key2 => $value2) { if ($key2 != 'custom' && $key2 != 'attributes') { if (!isset($current[$key][$key2])) { - $text .= ' * '.$key.' : '.$key2." : needed\n"; + $text .= ' * '.$key.' : '.$key2." : not present\n"; } elseif ($current[$key][$key2] == $english[$key][$key2]) { - $text .= ' * '.$key.' : '.$key2." : not translated\n"; + $text .= ' * '.$key.' : '.$key2."\n"; } } } diff --git a/todo.md b/todo.md index 33bf8a980f8..61c134890e2 100644 --- a/todo.md +++ b/todo.md @@ -2,328 +2,328 @@ * ar: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated + * validation : distinct + * validation : in_array + * validation : present * be: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated + * validation : distinct + * validation : in_array + * validation : present * bg: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : present + * validation : required_unless * bs: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless * ca: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : present + * validation : required_unless * cs: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : present + * validation : required_unless * cy: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : string * da: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated - * validation : timezone : not translated + * validation : distinct + * validation : in_array + * validation : present + * validation : required_unless + * validation : string + * validation : timezone * de: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated + * validation : distinct + * validation : in_array + * validation : present * el: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated + * validation : distinct + * validation : in_array + * validation : present * es: * fa: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : string * fi: - * auth : failed : not translated - * auth : throttle : not translated - * validation : array : not translated - * validation : digits_between : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : regex : not translated - * validation : required_if : not translated - * validation : required_unless : not translated - * validation : required_with : not translated - * validation : required_with_all : not translated - * validation : required_without : not translated - * validation : required_without_all : not translated - * validation : string : not translated - * validation : timezone : not translated + * auth : failed + * auth : throttle + * validation : array + * validation : digits_between + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : regex + * validation : required_if + * validation : required_unless + * validation : required_with + * validation : required_with_all + * validation : required_without + * validation : required_without_all + * validation : string + * validation : timezone * fr: * gl: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated + * validation : distinct + * validation : in_array + * validation : present * he: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated + * validation : distinct + * validation : in_array + * validation : present * hr: - * validation : distinct : not translated - * validation : filled : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated + * validation : distinct + * validation : filled + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : string * hu: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless * id: * is: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : required_with : not translated - * validation : required_with_all : not translated - * validation : required_without : not translated - * validation : required_without_all : not translated - * validation : string : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : required_with + * validation : required_with_all + * validation : required_without + * validation : required_without_all + * validation : string * it: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : present + * validation : required_unless * ja: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated + * validation : distinct + * validation : in_array + * validation : present * ka: - * validation : in_array : not translated + * validation : in_array * km: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : required_with_all : not translated - * validation : string : not translated - * validation : timezone : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : required_with_all + * validation : string + * validation : timezone * ko: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : string * lt: * me: - * validation : timezone : not translated + * validation : timezone * mk: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : required_with_all : not translated - * validation : required_without_all : not translated - * validation : string : not translated - * validation : timezone : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : required_with_all + * validation : required_without_all + * validation : string + * validation : timezone * ms: - * validation : distinct : not translated - * validation : exists : not translated - * validation : in : not translated - * validation : in_array : not translated - * validation : not_in : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : exists + * validation : in + * validation : in_array + * validation : not_in + * validation : present + * validation : required_unless * nb: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated + * validation : distinct + * validation : in_array + * validation : present * ne: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated + * validation : distinct + * validation : in_array + * validation : present * nl: * nn: * pl: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : string * pt: - * validation : in_array : not translated + * validation : in_array * pt-BR: - * validation : in_array : not translated + * validation : in_array * ro: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : present + * validation : required_unless * ru: - * validation : in_array : not translated + * validation : in_array * sc: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : string * sk: * sl: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : filled : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated - * validation : timezone : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : filled + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : string + * validation : timezone * sq: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless * sr: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless * sv: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless * th: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : present + * validation : required_unless * tk: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : string * tr: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless * uk: - * validation : distinct : not translated - * validation : in_array : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : string : not translated + * validation : distinct + * validation : in_array + * validation : present + * validation : required_unless + * validation : string * vi: - * auth : failed : not translated - * auth : throttle : not translated - * validation : distinct : not translated - * validation : in_array : not translated - * validation : json : not translated - * validation : present : not translated - * validation : required_unless : not translated - * validation : required_with_all : not translated - * validation : string : not translated + * auth : failed + * auth : throttle + * validation : distinct + * validation : in_array + * validation : json + * validation : present + * validation : required_unless + * validation : required_with_all + * validation : string * zh-CN: From b552829f43daf658aa153e97651385b5ad3fdb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Sun, 13 Mar 2016 02:21:23 +0100 Subject: [PATCH 30/36] Fixed untranslated word in 'distinct' --- fr/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/validation.php b/fr/validation.php index ea73f00b595..f7e2efcadb0 100644 --- a/fr/validation.php +++ b/fr/validation.php @@ -34,7 +34,7 @@ 'different' => 'Les champs :attribute et :other doivent être différents.', 'digits' => 'Le champ :attribute doit avoir :digits chiffres.', 'digits_between' => 'Le champ :attribute doit avoir entre :min et :max chiffres.', - 'distinct' => 'Le champ :attribute a une value dupliquée.', + 'distinct' => 'Le champ :attribute a une valeur dupliquée.', 'email' => 'Le champ :attribute doit être une adresse email valide.', 'exists' => 'Le champ :attribute sélectionné est invalide.', 'filled' => 'Le champ :attribute est obligatoire.', From b8a835f53ab8a96d5b538141fc281ac670d0add0 Mon Sep 17 00:00:00 2001 From: Janos Muzsi Date: Sun, 13 Mar 2016 08:59:23 +0100 Subject: [PATCH 31/36] Translate missing Hungarian strings --- hu/passwords.php | 2 +- hu/validation.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hu/passwords.php b/hu/passwords.php index 84bdb1531d7..fbe5f04a3f0 100755 --- a/hu/passwords.php +++ b/hu/passwords.php @@ -14,7 +14,7 @@ */ 'password' => 'A jelszónak legalább hat karakterből kell állnia és egyeznie kell a jelszó megerősítéssel.', - 'reset' => 'Password has been reset!', + 'reset' => 'Az új jelszó beállítva!', 'sent' => 'Jelszó-emlékeztető elküldve!', 'token' => 'Ez az új jelszó generálásához tartozó token érvénytelen.', 'user' => 'Nem található felhasználó a megadott email címmel.', diff --git a/hu/validation.php b/hu/validation.php index 86b6b2cb9c9..cdc9c92ab2d 100755 --- a/hu/validation.php +++ b/hu/validation.php @@ -34,16 +34,16 @@ 'different' => 'A(z) :attribute és :other értékei különbözőek kell, hogy legyenek!', 'digits' => 'A(z) :attribute :digits számjegyűnek kell lennie!', 'digits_between' => 'A(z) :attribute értéke :min és :max közötti számjegy lehet!', - 'distinct' => 'The :attribute field has a duplicate value.', + 'distinct' => 'A(z) :attribute értékének egyedinek kell lennie!', 'email' => 'A(z) :attribute nem érvényes email formátum.', 'exists' => 'A(z) :attribute már létezik.', 'filled' => 'A(z) :attribute megadása kötelező!', 'image' => 'A(z) :attribute képfájl kell, hogy legyen!', 'in' => 'A kiválasztott :attribute érvénytelen.', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => 'A(z) :attribute értéke nem található a(z) :other értékek között.', 'integer' => 'A(z) :attribute értéke szám kell, hogy legyen!', 'ip' => 'A(z) :attribute érvényes IP cím kell, hogy legyen!', - 'json' => 'The :attribute must be a valid JSON string.', + 'json' => 'A(z) :attribute érvényes JSON szöveg kell, hogy legyen!', 'max' => [ 'numeric' => 'A(z) :attribute értéke nem lehet nagyobb, mint :max!', 'file' => 'A(z) :attribute mérete nem lehet több, mint :max kilobájt.', @@ -59,11 +59,11 @@ ], 'not_in' => 'A(z) :attribute értéke érvénytelen.', 'numeric' => 'A(z) :attribute szám kell, hogy legyen!', - 'present' => 'The :attribute field must be present.', + 'present' => 'A(z) :attribute mező nem található!', 'regex' => 'A(z) :attribute formátuma érvénytelen.', 'required' => 'A(z) :attribute megadása kötelező!', 'required_if' => 'A(z) :attribute megadása kötelező, ha a(z) :other értéke :value!', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_unless' => 'A(z) :attribute megadása kötelező, amíg a(z) :other értéke :values!', 'required_with' => 'A(z) :attribute megadása kötelező, ha a(z) :values érték létezik.', 'required_with_all' => 'A(z) :attribute megadása kötelező, ha a(z) :values értékek léteznek.', 'required_without' => 'A(z) :attribute megadása kötelező, ha a(z) :values érték nem létezik.', From 667d35d0f299e705a7597c64d1f4c68d35efae3e Mon Sep 17 00:00:00 2001 From: caouecs Date: Sun, 13 Mar 2016 21:34:12 +0100 Subject: [PATCH 32/36] feature: todo list updated --- todo.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/todo.md b/todo.md index 61c134890e2..e4db3d90bdd 100644 --- a/todo.md +++ b/todo.md @@ -117,11 +117,6 @@ * validation : string * hu: - * validation : distinct - * validation : in_array - * validation : json - * validation : present - * validation : required_unless * id: From 0aba9b16c40a74a798b752815ef234e3ff47bb6b Mon Sep 17 00:00:00 2001 From: ARCANEDEV Date: Sun, 20 Mar 2016 16:34:10 +0000 Subject: [PATCH 33/36] Updating TODO.md generator script --- {en => script/en}/auth.php | 0 {en => script/en}/pagination.php | 0 {en => script/en}/passwords.php | 0 {en => script/en}/validation.php | 0 script/todo.php | 127 ++++++++++++++++++++++--------- 5 files changed, 89 insertions(+), 38 deletions(-) rename {en => script/en}/auth.php (100%) rename {en => script/en}/pagination.php (100%) rename {en => script/en}/passwords.php (100%) rename {en => script/en}/validation.php (100%) diff --git a/en/auth.php b/script/en/auth.php similarity index 100% rename from en/auth.php rename to script/en/auth.php diff --git a/en/pagination.php b/script/en/pagination.php similarity index 100% rename from en/pagination.php rename to script/en/pagination.php diff --git a/en/passwords.php b/script/en/passwords.php similarity index 100% rename from en/passwords.php rename to script/en/passwords.php diff --git a/en/validation.php b/script/en/validation.php similarity index 100% rename from en/validation.php rename to script/en/validation.php diff --git a/script/todo.php b/script/todo.php index bc6266b7e6e..610d77c6ccb 100644 --- a/script/todo.php +++ b/script/todo.php @@ -1,50 +1,101 @@ basePath = realpath($basePath); + $this->excluded = $excluded; + $this->output = ''; + $this->load(); } -} -// Get English version -$english = [ - 'auth' => include(__DIR__.'/../en/auth.php'), - 'pagination' => include(__DIR__.'/../en/pagination.php'), - 'passwords' => include(__DIR__.'/../en/passwords.php'), - 'validation' => include(__DIR__.'/../en/validation.php'), -]; - -$text = "# Todo list\n\n"; - -// Return diff language by language -foreach ($languages as $language) { - $text .= "\n * ".$language.":\n"; - - $current = [ - 'auth' => include(__DIR__.'/../'.$language.'/auth.php'), - 'pagination' => include(__DIR__.'/../'.$language.'/pagination.php'), - 'passwords' => include(__DIR__.'/../'.$language.'/passwords.php'), - 'validation' => include(__DIR__.'/../'.$language.'/validation.php'), - ]; - - foreach ($english as $key => $values) { - foreach ($values as $key2 => $value2) { - if ($key2 != 'custom' && $key2 != 'attributes') { - if (!isset($current[$key][$key2])) { - $text .= ' * '.$key.' : '.$key2." : not present\n"; - } elseif ($current[$key][$key2] == $english[$key][$key2]) { - $text .= ' * '.$key.' : '.$key2."\n"; + public static function make($basePath, $excluded = []) + { + return new self($basePath, $excluded); + } + + /* ------------------------------------------------------------------------------------------------ + | Main Functions + | ------------------------------------------------------------------------------------------------ + */ + private function load() + { + // Get English version + $english = $this->getTranslations(__DIR__.'/en'); + $languages = $this->getLanguages(); + + $this->output = "# Todo list\n\n"; + $this->compareTranslations($english, $languages); + } + + private function getTranslations($dir) + { + return [ + 'auth' => include("$dir/auth.php"), + 'pagination' => include("$dir/pagination.php"), + 'passwords' => include("$dir/passwords.php"), + 'validation' => include("$dir/validation.php"), + ]; + } + + private function getLanguages() + { + $directories = glob("{$this->basePath}/*", GLOB_ONLYDIR); + + $languages = array_map(function ($dir) { + $name = basename($dir); + + return in_array($name, $this->excluded) ? null : $name; + }, $directories); + + return array_filter($languages); + } + + private function compareTranslations($default, $languages) + { + // Return diff language by language + foreach ($languages as $language) { + $this->output .= "\n * ".$language.":\n"; + $current = $this->getTranslations("{$this->basePath}/{$language}"); + + foreach ($default as $key => $values) { + foreach ($values as $key2 => $value2) { + if (in_array($key2, ['custom', 'attributes'])) { + continue; + } + + if (!isset($current[$key][$key2])) { + $this->output .= ' * '.$key.' : '.$key2." : not present\n"; + } elseif ($current[$key][$key2] == $default[$key][$key2]) { + $this->output .= ' * '.$key.' : '.$key2."\n"; + } } } } } -} -$pathTodoMd = __DIR__.'/../todo.md'; + public function save($path) + { + file_put_contents(realpath($path), $this->output); + } +} -file_put_contents($pathTodoMd, $text); +TodoGenerator::make(__DIR__.'/..', ['script'])->save(__DIR__.'/../todo.md'); From 647696741537a0d5e1e2a81578eeadd61743982b Mon Sep 17 00:00:00 2001 From: caouecs Date: Tue, 22 Mar 2016 22:52:18 +0100 Subject: [PATCH 34/36] review: todo script --- script/todo.php | 88 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 24 deletions(-) diff --git a/script/todo.php b/script/todo.php index 610d77c6ccb..1d901f4c488 100644 --- a/script/todo.php +++ b/script/todo.php @@ -1,40 +1,60 @@ basePath = realpath($basePath); $this->excluded = $excluded; - $this->output = ''; $this->load(); } + /** + * Returns object. + * + * @param string $basePath Base path. + * @param array $excluded Excluded directories. + * + * @return TodoGenerator + */ public static function make($basePath, $excluded = []) { return new self($basePath, $excluded); } - /* ------------------------------------------------------------------------------------------------ - | Main Functions - | ------------------------------------------------------------------------------------------------ + /** + * Compare translations and generate file. */ private function load() { @@ -46,19 +66,29 @@ private function load() $this->compareTranslations($english, $languages); } - private function getTranslations($dir) + /** + * Returns array of translations by language. + * @param string $language Language code. + * @return array + */ + private function getTranslations($language) { return [ - 'auth' => include("$dir/auth.php"), - 'pagination' => include("$dir/pagination.php"), - 'passwords' => include("$dir/passwords.php"), - 'validation' => include("$dir/validation.php"), + 'auth' => include($language.'/auth.php'), + 'pagination' => include($language.'/pagination.php'), + 'passwords' => include($language.'/passwords.php'), + 'validation' => include($language.'/validation.php'), ]; } + /** + * Returns list of languages. + * + * @return array + */ private function getLanguages() { - $directories = glob("{$this->basePath}/*", GLOB_ONLYDIR); + $directories = glob($this->basePath.'/*', GLOB_ONLYDIR); $languages = array_map(function ($dir) { $name = basename($dir); @@ -69,7 +99,12 @@ private function getLanguages() return array_filter($languages); } - private function compareTranslations($default, $languages) + /** + * Compare translations. + * @param array $default Language by default. + * @param array $languages Others languages. + */ + private function compareTranslations(array $default, array $languages) { // Return diff language by language foreach ($languages as $language) { @@ -82,7 +117,7 @@ private function compareTranslations($default, $languages) continue; } - if (!isset($current[$key][$key2])) { + if (! isset($current[$key][$key2])) { $this->output .= ' * '.$key.' : '.$key2." : not present\n"; } elseif ($current[$key][$key2] == $default[$key][$key2]) { $this->output .= ' * '.$key.' : '.$key2."\n"; @@ -92,9 +127,14 @@ private function compareTranslations($default, $languages) } } + /** + * Save todo list. + * + * @param string $path Path. + */ public function save($path) { - file_put_contents(realpath($path), $this->output); + file_put_contents($path, $this->output); } } From 46e0d0375c97afd8ba183131042ae1ef954ac83d Mon Sep 17 00:00:00 2001 From: caouecs Date: Tue, 22 Mar 2016 22:52:26 +0100 Subject: [PATCH 35/36] feature: en version --- script/en/validation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/en/validation.php b/script/en/validation.php index b1e612044f1..dd855f34480 100644 --- a/script/en/validation.php +++ b/script/en/validation.php @@ -91,7 +91,7 @@ | */ - 'custom' => [ + 'custom' => [ 'attribute-name' => [ 'rule-name' => 'custom-message', ], @@ -108,6 +108,6 @@ | */ - 'attributes' => [], + 'attributes' => [], ]; From 75377e7ac30d54149b68a9ec1d19d2eee40dc05b Mon Sep 17 00:00:00 2001 From: Fred Delrieu Date: Tue, 22 Mar 2016 17:53:23 -0400 Subject: [PATCH 36/36] Applied fixes from StyleCI --- script/todo.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/script/todo.php b/script/todo.php index 1d901f4c488..8b5f52db167 100644 --- a/script/todo.php +++ b/script/todo.php @@ -43,8 +43,8 @@ public function __construct($basePath, $excluded = []) /** * Returns object. * - * @param string $basePath Base path. - * @param array $excluded Excluded directories. + * @param string $basePath Base path. + * @param array $excluded Excluded directories. * * @return TodoGenerator */ @@ -68,7 +68,9 @@ private function load() /** * Returns array of translations by language. - * @param string $language Language code. + * + * @param string $language Language code. + * * @return array */ private function getTranslations($language) @@ -101,8 +103,9 @@ private function getLanguages() /** * Compare translations. - * @param array $default Language by default. - * @param array $languages Others languages. + * + * @param array $default Language by default. + * @param array $languages Others languages. */ private function compareTranslations(array $default, array $languages) { @@ -117,7 +120,7 @@ private function compareTranslations(array $default, array $languages) continue; } - if (! isset($current[$key][$key2])) { + if (!isset($current[$key][$key2])) { $this->output .= ' * '.$key.' : '.$key2." : not present\n"; } elseif ($current[$key][$key2] == $default[$key][$key2]) { $this->output .= ' * '.$key.' : '.$key2."\n"; @@ -130,7 +133,7 @@ private function compareTranslations(array $default, array $languages) /** * Save todo list. * - * @param string $path Path. + * @param string $path Path. */ public function save($path) {