Skip to content

Commit f3ee307

Browse files
taylorotwelltaylorotwell
committed
Update language files.
1 parent 7ee962b commit f3ee307

2 files changed

Lines changed: 76 additions & 12 deletions

File tree

‎app/lang/en/pagination.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
return array(
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Pagination Language Lines
8+
|--------------------------------------------------------------------------
9+
|
10+
| The following language lines are used by the paginator library to build
11+
| the simple pagination links. You are free to change them to anything
12+
| you want to customize your views to better match your application.
13+
|
14+
*/
15+
16+
'previous' => '&laquo; Previous',
17+
'next' => 'Next &raquo;',
18+
19+
);

‎app/lang/en/validation.php‎

Lines changed: 57 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,29 @@
22

33
return array(
44

5+
/*
6+
|--------------------------------------------------------------------------
7+
| Validation Language Lines
8+
|--------------------------------------------------------------------------
9+
|
10+
| The following language lines contain the default error messages used by
11+
| the validator class. Some of these rules have multiple versions such
12+
| such as the size rules. Feel free to tweak each of these messages.
13+
|
14+
*/
15+
516
"accepted" => "The :attribute must be accepted.",
617
"activeurl" => "The :attribute is not a valid URL.",
718
"after" => "The :attribute must be a date after :date.",
819
"alpha" => "The :attribute may only contain letters.",
920
"alphadash" => "The :attribute may only contain letters, numbers, and dashes.",
1021
"alphanum" => "The :attribute may only contain letters and numbers.",
1122
"before" => "The :attribute must be a date before :date.",
12-
"between.numeric" => "The :attribute must be between :min - :max.",
13-
"between.file" => "The :attribute must be between :min - :max kilobytes.",
14-
"between.string" => "The :attribute must be between :min - :max characters.",
23+
"between" => array(
24+
"numeric" => "The :attribute must be between :min - :max.",
25+
"file" => "The :attribute must be between :min - :max kilobytes.",
26+
"string" => "The :attribute must be between :min - :max characters.",
27+
),
1528
"confirmed" => "The :attribute confirmation does not match.",
1629
"different" => "The :attribute and :other must be different.",
1730
"email" => "The :attribute format is invalid.",
@@ -21,21 +34,53 @@
2134
"integer" => "The :attribute must be an integer.",
2235
"ip" => "The :attribute must be a valid IP address.",
2336
"match" => "The :attribute format is invalid.",
24-
"max.numeric" => "The :attribute must be less than :max.",
25-
"max.file" => "The :attribute must be less than :max kilobytes.",
26-
"max.string" => "The :attribute must be less than :max characters.",
37+
"max" => array(
38+
"numeric" => "The :attribute must be less than :max.",
39+
"file" => "The :attribute must be less than :max kilobytes.",
40+
"string" => "The :attribute must be less than :max characters.",
41+
),
2742
"mimes" => "The :attribute must be a file of type: :values.",
28-
"min.numeric" => "The :attribute must be at least :min.",
29-
"min.file" => "The :attribute must be at least :min kilobytes.",
30-
"min.string" => "The :attribute must be at least :min characters.",
43+
"min" => array(
44+
"numeric" => "The :attribute must be at least :min.",
45+
"file" => "The :attribute must be at least :min kilobytes.",
46+
"string" => "The :attribute must be at least :min characters.",
47+
),
3148
"notin" => "The selected :attribute is invalid.",
3249
"numeric" => "The :attribute must be a number.",
3350
"required" => "The :attribute field is required.",
3451
"same" => "The :attribute and :other must match.",
35-
"size.numeric" => "The :attribute must be :size.",
36-
"size.file" => "The :attribute must be :size kilobytes.",
37-
"size.string" => "The :attribute must be :size characters.",
52+
"size" => array(
53+
"numeric" => "The :attribute must be :size.",
54+
"file" => "The :attribute must be :size kilobytes.",
55+
"string" => "The :attribute must be :size characters.",
56+
),
3857
"unique" => "The :attribute has already been taken.",
3958
"url" => "The :attribute format is invalid.",
4059

60+
/*
61+
|--------------------------------------------------------------------------
62+
| Custom Validation Language Lines
63+
|--------------------------------------------------------------------------
64+
|
65+
| Here you may specify custom validation messages for attributes using the
66+
| convention "attribute.rule" to name the lines. This makes it quick to
67+
| specify a specific custom language line for a given attribute rule.
68+
|
69+
*/
70+
71+
'custom' => array(),
72+
73+
/*
74+
|--------------------------------------------------------------------------
75+
| Custom Validation Attributes
76+
|--------------------------------------------------------------------------
77+
|
78+
| The following language lines are used to swap attribute place-holders
79+
| with something more reader friendly such as E-Mail Address instead
80+
| of "email". This simply helps us make messages a little cleaner.
81+
|
82+
*/
83+
84+
'attributes' => array(),
85+
4186
);

0 commit comments

Comments
 (0)