mirror of
https://github.com/CachetHQ/Cachet.git
synced 2025-01-17 05:28:18 +01:00
Pull in changes from Laravel
This commit is contained in:
Graham Campbell
parent
d5a71976d2
commit
5e3ab3b6ea
@ -104,7 +104,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'log' => env('LOGGING_MODE', 'daily'),
|
||||
'log' => env('APP_LOG', 'daily'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -206,7 +206,6 @@ return [
|
||||
'Gate' => 'Illuminate\Support\Facades\Gate',
|
||||
'Hash' => 'Illuminate\Support\Facades\Hash',
|
||||
'Input' => 'Illuminate\Support\Facades\Input',
|
||||
'Inspiring' => 'Illuminate\Foundation\Inspiring',
|
||||
'Lang' => 'Illuminate\Support\Facades\Lang',
|
||||
'Log' => 'Illuminate\Support\Facades\Log',
|
||||
'Mail' => 'Illuminate\Support\Facades\Mail',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -69,6 +69,7 @@ return [
|
||||
'regex' => ':attribute er ikke korrekt formateret.',
|
||||
'required' => ':attribute skal udfyldes.',
|
||||
'required_if' => ':attribute skal udfyldes når :other er :value.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => ':attribute skal udfyldes når :values er present.',
|
||||
'required_with_all' => ':attribute skal udfyldes når :values er present.',
|
||||
'required_without' => ':attribute skal udfyldes når :values ikke er sat.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => ':attribute Format ist ungültig.',
|
||||
'required' => ':attribute muss ausgefüllt sein.',
|
||||
'required_if' => ':attribute muss ausgefüllt sein wenn :other :value ist.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => ':attribute muss angegeben werden wenn :values ausgefüllt wurde.',
|
||||
'required_with_all' => ':attribute muss angegeben werden, wenn :values ausgefüllt wurde.',
|
||||
'required_without' => ':attribute muss angegeben werden wenn :values nicht ausgefüllt wurde.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -69,6 +69,7 @@ return [
|
||||
'regex' => 'crwdns132:0crwdne132:0',
|
||||
'required' => 'crwdns133:0crwdne133:0',
|
||||
'required_if' => 'crwdns134:0crwdne134:0',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => 'crwdns135:0crwdne135:0',
|
||||
'required_with_all' => 'crwdns136:0crwdne136:0',
|
||||
'required_without' => 'crwdns137:0crwdne137:0',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -69,6 +69,7 @@ return [
|
||||
'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.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => 'El formato del :attribute es inválido.',
|
||||
'required' => 'El campo del :attribute es requerido.',
|
||||
'required_if' => 'El campo del :attribute se requiere cuando :other es :value.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => 'El campo del :attribute se requiere cuando :values es presente.',
|
||||
'required_with_all' => 'El campo del :attribute se requiere cuando :values es presente.',
|
||||
'required_without' => 'El campo del :attribute se requiere cuando :values no es presente.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => 'Le format de :attribute est invalide.',
|
||||
'required' => 'Le champ :attribute est requis.',
|
||||
'required_if' => 'Le champ :attribute est requis lorsque :other est :value.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => 'Le champ :attribute est requis lorsque :values est présent.',
|
||||
'required_with_all' => 'Le champ :attribute est requis lorsque :values est présent.',
|
||||
'required_without' => 'Le champ :attribute est requis lorsque :values n\'est pas présent.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => 'Format :attribute tidak benar.',
|
||||
'required' => ':attribute belum diisi.',
|
||||
'required_if' => ':attribute harus diisi jika :other :value.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => ':attribute harus diisi jika ada :values.',
|
||||
'required_with_all' => ':attribute harus diisi jika ada :values.',
|
||||
'required_without' => ':attribute harus diisi jika tidak ada :values .',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -71,6 +71,7 @@ return [
|
||||
'regex' => 'Il formato del campo :attribute non è valido.',
|
||||
'required' => 'Il campo :attribute è richiesto.',
|
||||
'required_if' => 'Il campo :attribute è richiesto quando :other è :value.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => 'Il campo :attribute è richiesto quando :values è presente.',
|
||||
'required_with_all' => 'Il campo :attribute è richiesto quando :values è presente.',
|
||||
'required_without' => 'Il campo :attribute è richiesto quando :values non è presente.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => ':attribute 의 형식이 올바르지 않습니다.',
|
||||
'required' => ':attribute 필드는 필수 항목입니다.',
|
||||
'required_if' => ':attribute 필드는 :other 가 :value 일 때 필요합니다.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => ':attribute 는 :values 가 존재할 때 필요합니다.',
|
||||
'required_with_all' => ':attribute 는 :values 가 존재할 때 필요합니다.',
|
||||
'required_without' => ':attribute 는 :values 가 존재하지 않을 때 필요합니다.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => ':attribute formaat is ongeldig.',
|
||||
'required' => ':attribute formaat is verplicht.',
|
||||
'required_if' => ':attribute veld is verplicht wanneer :other gelijk is aan :value.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => ':attribute veld is verplicht wanneer :values aanwezig is.',
|
||||
'required_with_all' => ':attribute veld is verplicht wanneer :values aanwezig zijn.',
|
||||
'required_without' => ':attribute veld is verplicht wanner :values niet aanwezig is.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'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.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => 'O formato de :attribute é inválido.',
|
||||
'required' => 'O campo de :attribute é obrigatório.',
|
||||
'required_if' => 'O campo de :attribute é obrigatório quando :other é :value.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => 'O campo :attribute é obrigatório quando :values está presente.',
|
||||
'required_with_all' => 'O campo :attribute é obrigatório quando :values está presente.',
|
||||
'required_without' => 'O campo de :attribute é obrigatório quando :values não está presente.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => 'Неправильный формат :attribute.',
|
||||
'required' => 'Поле :attribute является обязательным.',
|
||||
'required_if' => 'Поле :attribute является обязательным, если :other имеет значение :value.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => 'Поле :attribute является обязательным, если заполнено :values.',
|
||||
'required_with_all' => 'Поле :attribute является обязательным, если все :values заполнены.',
|
||||
'required_without' => 'Поле :attribute является обязательным, если :values не заполнены.',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => ':attribute 格式无效。',
|
||||
'required' => ':attribute 字段必填。',
|
||||
'required_if' => ':attribute 项在 :other 是 :value 时是必须填写的。',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => '当含有 :values 时， :attribute 是必需的。',
|
||||
'required_with_all' => '当含有 :values 时， :attribute 是必需的。',
|
||||
'required_without' => '当 :values 不存在时， :attribute 是必需的。',
|
||||
|
||||
@ -13,7 +13,7 @@ return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reminder Language Lines
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
|
||||
@ -67,6 +67,7 @@ return [
|
||||
'regex' => ':attribute 格式無效。',
|
||||
'required' => ':attribute 字段必填。',
|
||||
'required_if' => ':attribute 項在 :other 是 :value 時是必須填寫的。',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => '當含有 :values 時， :attribute 是必需的。',
|
||||
'required_with_all' => '當含有 :values 時， :attribute 是必需的。',
|
||||
'required_without' => '當 :values 不存在時， :attribute 是必需的。',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user