Skip to content

Commit d667a15

Browse files
taylorotwelltaylorotwell
committed
Merge branch 'develop' into staging
2 parents 0fa3650 + 7256dc2 commit d667a15

File tree

109 files changed

+1689
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1689
-332
lines changed

‎application/config/application.php

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
|--------------------------------------------------------------------------
99
|
1010
| The URL used to access your application without a trailing slash. The URL
11-
| does not have to be set. If it isn't we'll try our best to guess the URL
11+
| does not have to be set. If it isn't, we'll try our best to guess the URL
1212
| of your application.
1313
|
1414
*/
@@ -48,7 +48,7 @@
4848
|
4949
| This key is used by the encryption and cookie classes to generate secure
5050
| encrypted strings and hashes. It is extremely important that this key
51-
| remain secret and should not be shared with anyone. Make it about 32
51+
| remains secret and it should not be shared with anyone. Make it about 32
5252
| characters of random gibberish.
5353
|
5454
*/
@@ -63,7 +63,7 @@
6363
| Laravel includes a beautiful profiler toolbar that gives you a heads
6464
| up display of the queries and logs performed by your application.
6565
| This is wonderful for development, but, of course, you should
66-
| disable the toolbar for production applications..
66+
| disable the toolbar for production applications.
6767
|
6868
*/
6969

@@ -84,7 +84,7 @@
8484

8585
/*
8686
|--------------------------------------------------------------------------
87-
| Application Language
87+
| Default Application Language
8888
|--------------------------------------------------------------------------
8989
|
9090
| The default language of your application. This language will be used by
@@ -94,12 +94,25 @@
9494

9595
'language' => 'en',
9696

97+
/*
98+
|--------------------------------------------------------------------------
99+
| Supported Languages
100+
|--------------------------------------------------------------------------
101+
|
102+
| These languages may also be supported by your application. If a request
103+
| enters your application with a URI beginning with one of these values
104+
| the default language will automatically be set to that language.
105+
|
106+
*/
107+
108+
'languages' => array(),
109+
97110
/*
98111
|--------------------------------------------------------------------------
99112
| SSL Link Generation
100113
|--------------------------------------------------------------------------
101114
|
102-
| Many sites use SSL to protect their users data. However, you may not be
115+
| Many sites use SSL to protect their users' data. However, you may not be
103116
| able to use SSL on your development machine, meaning all HTTPS will be
104117
| broken during development.
105118
|

‎application/config/cache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
| This key will be prepended to item keys stored using Memcached and APC
3030
| to prevent collisions with other applications on the server. Since the
3131
| memory based stores could be shared by other applications, we need to
32-
| be polite and use a prefix to uniquely identifier our items.
32+
| be polite and use a prefix to uniquely identify our items.
3333
|
3434
*/
3535

‎application/config/database.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
| Default Database Connection
3636
|--------------------------------------------------------------------------
3737
|
38-
| The name of your default database connection. This connection will used
38+
| The name of your default database connection. This connection will be used
3939
| as the default for all database operations unless a different name is
4040
| given when performing said operation. This connection name should be
4141
| listed in the array of connections below.
@@ -54,7 +54,7 @@
5454
| the freedom to specify as many connections as you can handle.
5555
|
5656
| All database work in Laravel is done through the PHP's PDO facilities,
57-
| so make sure you have the PDO drivers for your particlar database of
57+
| so make sure you have the PDO drivers for your particular database of
5858
| choice installed on your machine.
5959
|
6060
*/
@@ -85,6 +85,7 @@
8585
'password' => '',
8686
'charset' => 'utf8',
8787
'prefix' => '',
88+
'schema' => 'public',
8889
),
8990

9091
'sqlsrv' => array(

‎application/config/error.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
|
1010
| Here you simply specify the error levels that should be ignored by the
1111
| Laravel error handler. These levels will still be logged; however, no
12-
| information about about them will be displayed.
12+
| information about them will be displayed.
1313
|
1414
*/
1515

@@ -56,7 +56,7 @@
5656
| logging is enabled.
5757
|
5858
| You may log the error message however you like; however, a simple log
59-
| solution has been setup for you which will log all error messages to
59+
| solution has been set up for you which will log all error messages to
6060
| text files within the application storage directory.
6161
|
6262
*/

‎application/config/session.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
| Session Database
2424
|--------------------------------------------------------------------------
2525
|
26-
| The database table on which the session should be stored. It probably
26+
| The database table in which the session should be stored. It probably
2727
| goes without saying that this option only matters if you are using
2828
| the super slick database session driver.
2929
|

‎application/config/strings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
|--------------------------------------------------------------------------
99
|
1010
| This array contains the singular and plural forms of words. It's used by
11-
| the "singular" and "plural" methods on the Str class to convert a given
11+
| the "singular" and "plural" methods in the Str class to convert a given
1212
| word from singular to plural and vice versa.
1313
|
1414
| Note that the regular expressions are only for inflecting English words.

‎application/language/fr/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 pagination links. You're free to change them to anything you want.
12+
| If you come up with something more exciting, let us know.
13+
|
14+
*/
15+
16+
'previous' => '&laquo; Précédent',
17+
'next' => 'Suivant &raquo;',
18+
19+
);

‎application/language/fr/validation.php

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?php
2+
3+
return array(
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Validation Language Lines
8+
|--------------------------------------------------------------------------
9+
|
10+
| The following language lines contain the default error messages used
11+
| by the validator class. Some of the rules contain multiple versions,
12+
| such as the size (max, min, between) rules. These versions are used
13+
| for different input types such as strings and files.
14+
|
15+
| These language lines may be easily changed to provide custom error
16+
| messages in your application. Error messages for custom validation
17+
| rules may also be added to this file.
18+
|
19+
*/
20+
21+
"accepted" => "Le champ :attribute doit être accepté.",
22+
"active_url" => "Le champ :attribute n'est pas une URL valide.",
23+
"after" => "Le champ :attribute doit être une date après :date.",
24+
"alpha" => "Le champ :attribute ne doit contenir que des lettres.",
25+
"alpha_dash" => "Le champ :attribute ne doit contenir que des lettres, nombres et des tirets.",
26+
"alpha_num" => "Le champ :attribute ne doit contenir que des lettres et nombres.",
27+
"before" => "Le champ :attribute doit être une date avant :date.",
28+
"between" => array(
29+
"numeric" => "Le champ :attribute doit être entre :min - :max.",
30+
"file" => "Le champ :attribute doit être entre :min - :max kilo-octets.",
31+
"string" => "Le champ :attribute doit être entre :min - :max caractères.",
32+
),
33+
"confirmed" => "Le champ :attribute confirmation est différent.",
34+
"different" => "Les champ :attribute et :other doivent être différents.",
35+
"email" => "Le format du champ :attribute est invalide.",
36+
"exists" => "Le champ sélectionné :attribute est invalide.",
37+
"image" => "Le champ :attribute doit être une image.",
38+
"in" => "Le champ sélectionné :attribute est invalide.",
39+
"integer" => "Le champ :attribute doit être un entier.",
40+
"ip" => "Le champ :attribute doit être une adresse IP valide.",
41+
"match" => "Le format du champ :attribute est invalide.",
42+
"max" => array(
43+
"numeric" => "Le :attribute doit être plus petit que :max.",
44+
"file" => "Le :attribute doit être plus petit que :max kilo-octets.",
45+
"string" => "Le :attribute doit être plus petit que :max caractères.",
46+
),
47+
"mimes" => "Le champ :attribute doit être un fichier de type: :values.",
48+
"min" => array(
49+
"numeric" => "Le champ :attribute doit être au moins :min.",
50+
"file" => "Le champ :attribute doit être au moins :min kilo-octets.",
51+
"string" => "Le champ :attribute doit être au moins :min caractères.",
52+
),
53+
"not_in" => "Le champ sélectionné :attribute est invalide.",
54+
"numeric" => "Le champ :attribute doit être un nombre.",
55+
"required" => "Le champ :attribute est requis",
56+
"same" => "Le champ :attribute et :other doivent être identique.",
57+
"size" => array(
58+
"numeric" => "Le champ :attribute doit être :size.",
59+
"file" => "Le champ :attribute doit être de :size kilo-octets.",
60+
"string" => "Le champ :attribute doit être de :size caractères.",
61+
),
62+
"unique" => "Le champ :attribute est déjà utilisé.",
63+
"url" => "Le champ :attribute à un format invalide.",
64+
65+
/*
66+
|--------------------------------------------------------------------------
67+
| Custom Validation Language Lines
68+
|--------------------------------------------------------------------------
69+
|
70+
| Here you may specify custom validation messages for attributes using the
71+
| convention "attribute_rule" to name the lines. This helps keep your
72+
| custom validation clean and tidy.
73+
|
74+
| So, say you want to use a custom validation message when validating that
75+
| the "email" attribute is unique. Just add "email_unique" to this array
76+
| with your custom message. The Validator will handle the rest!
77+
|
78+
*/
79+
80+
'custom' => array(),
81+
82+
/*
83+
|--------------------------------------------------------------------------
84+
| Validation Attributes
85+
|--------------------------------------------------------------------------
86+
|
87+
| The following language lines are used to swap attribute place-holders
88+
| with something more reader friendly such as "E-Mail Address" instead
89+
| of "email". Your users will thank you.
90+
|
91+
| The Validator class will automatically search this array of lines it
92+
| is attempting to replace the :attribute place-holder in messages.
93+
| It's pretty slick. We think you'll like it.
94+
|
95+
*/
96+
97+
'attributes' => array(),
98+
99+
);

‎application/language/hu/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 pagination links. You're free to change them to anything you want.
12+
| If you come up with something more exciting, let us know.
13+
|
14+
*/
15+
16+
'previous' => '&laquo; Előző',
17+
'next' => 'Következő &raquo;',
18+
19+
);

‎application/language/hu/validation.php

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?php
2+
3+
return array(
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Validation Language Lines
8+
|--------------------------------------------------------------------------
9+
|
10+
| The following language lines contain the default error messages used
11+
| by the validator class. Some of the rules contain multiple versions,
12+
| such as the size (max, min, between) rules. These versions are used
13+
| for different input types such as strings and files.
14+
|
15+
| These language lines may be easily changed to provide custom error
16+
| messages in your application. Error messages for custom validation
17+
| rules may also be added to this file.
18+
|
19+
*/
20+
21+
"accepted" => "A(z) :attribute el kell legyen fogadva.",
22+
"active_url" => "A :attribute nem valós URL.",
23+
"after" => "A :attribute :date utáni dátum kell legyen.",
24+
"alpha" => "A(z) :attribute csak betűket tartalmazhat.",
25+
"alpha_dash" => "A(z) :attribute betűket, számokat és kötőjeleket tartalmazhat.",
26+
"alpha_num" => "A(z) :attribute csak betűket és számokat tartalmazhat.",
27+
"before" => "A :attribute :date előtti dátum kell legyen.",
28+
"between" => array(
29+
"numeric" => "A(z) :attribute :min - :max közötti érték kell legyen.",
30+
"file" => "A(z) :attribute :min - :max kilobyte között kell legyen.",
31+
"string" => "A(z) :attribute :min - :max karakterhossz között kell legyen",
32+
),
33+
"confirmed" => "A(z) :attribute megerősítése nem egyezett meg.",
34+
"different" => "A(z) :attribute és :other különböző kell legyen.",
35+
"email" => "A(z) :attribute formátuma nem megfelelő.",
36+
"exists" => "A(z) választott :attribute nem megfelelő.",
37+
"image" => "A(z) :attribute kép kell legyen.",
38+
"in" => "A(z) választott :attribute nem megfelelő.",
39+
"integer" => "A :attribute szám kell legyen.",
40+
"ip" => "A :attribute valós IP cím kell legyen.",
41+
"match" => "A(z) :attribute formátuma nem megfelelő.",
42+
"max" => array(
43+
"numeric" => "A :attribute kevesebb kell legyen, mint :max.",
44+
"file" => "A :attribute kevesebb kell legyen :max kilobytenál.",
45+
"string" => "A :attribute kevesebb karakterből kell álljon, mint :max.",
46+
),
47+
"mimes" => "A :attribute az alábbi tipusokból való kell legyen :values.",
48+
"min" => array(
49+
"numeric" => "A :attribute legalább :min kell legyen.",
50+
"file" => "A :attribute legalább :min kilobyte kell legyen.",
51+
"string" => "A :attribute legalább :min karakter hosszú kell legyen.",
52+
),
53+
"not_in" => "A választott :attribute nem megfelelő.",
54+
"numeric" => "A :attribute szám kell legyen.",
55+
"required" => "A(z) :attribute megadása kötelező.",
56+
"same" => "A :attribute és a :other muszáj hogy megegyezzen.",
57+
"size" => array(
58+
"numeric" => "A(z) :attribute :size kell legyen.",
59+
"file" => "A(z) :attribute :size kilobyteos kell legyen.",
60+
"string" => "A(z) :attribute :size karakteres kell legyen.",
61+
),
62+
"unique" => "A(z) :attribute már foglalt.",
63+
"url" => "A(z) :attribute formátuma nem megfelelő.",
64+
65+
/*
66+
|--------------------------------------------------------------------------
67+
| Custom Validation Language Lines
68+
|--------------------------------------------------------------------------
69+
|
70+
| Here you may specify custom validation messages for attributes using the
71+
| convention "attribute_rule" to name the lines. This helps keep your
72+
| custom validation clean and tidy.
73+
|
74+
| So, say you want to use a custom validation message when validating that
75+
| the "email" attribute is unique. Just add "email_unique" to this array
76+
| with your custom message. The Validator will handle the rest!
77+
|
78+
*/
79+
80+
'custom' => array(),
81+
82+
/*
83+
|--------------------------------------------------------------------------
84+
| Validation Attributes
85+
|--------------------------------------------------------------------------
86+
|
87+
| The following language lines are used to swap attribute place-holders
88+
| with something more reader friendly such as "E-Mail Address" instead
89+
| of "email". Your users will thank you.
90+
|
91+
| The Validator class will automatically search this array of lines it
92+
| is attempting to replace the :attribute place-holder in messages.
93+
| It's pretty slick. We think you'll like it.
94+
|
95+
*/
96+
97+
'attributes' => array(),
98+
99+
);

‎application/language/id/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 pagination links. You're free to change them to anything you want.
12+
| If you come up with something more exciting, let us know.
13+
|
14+
*/
15+
16+
'previous' => '&laquo; Sebelumnya',
17+
'next' => 'Selanjutnya &raquo;',
18+
19+
);

0 commit comments

Comments
 (0)