Skip to content

Commit

Permalink
Merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Sep 26, 2012
2 parents 9e0ff85 + 4eac00a commit c2a255c
Show file tree
Hide file tree
Showing 32 changed files with 537 additions and 67 deletions.
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Pull request guidelines

[GitHub pull requests](https://help.github.com/articles/using-pull-requests) are a great way for everyone in the community to contribute to the Laravel codebase. Found a bug? Just fix it in your fork and submit a pull request. This will then be reviewed, and, if found as good, merged into the main repository.

In order to keep the codebase clean, stable and at high quality, even with so many people contributing, some guidelines are necessary for high-quality pull requests:

- **Branch:** Unless they are immediate documentation fixes relevant for old versions, pull requests should be sent to the `develop` branch only. Make sure to select that branch as target when creating the pull request (GitHub will not automatically select it.)
- **Documentation:** If you are adding a new feature or changing the API in any relevant way, this should be documented. The documentation files can be found directly in the core repository.
- **Unit tests:** To keep old bugs from re-appearing and generally hold quality at a high level, the Laravel core is thoroughly unit-tested. Thus, when you create a pull request, it is expected that you unit test any new code you add. For any bug you fix, you should also add regression tests to make sure the bug will never appear again. If you are unsure about how to write tests, the core team or other contributors will gladly help.
4 changes: 3 additions & 1 deletion application/config/strings.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@
'sheep',
'species',
'moose',
'chassis',
'traffic',
),

/*
Expand Down Expand Up @@ -185,4 +187,4 @@

),

);
);
10 changes: 5 additions & 5 deletions application/language/bg/validation.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
"alpha" => "Полето :attribute трябва да съдържа само букви.",
"alpha_dash" => "Полето :attribute трябва да съдържа само букви, цифри, долна черта и тире.",
"alpha_num" => "Полето :attribute трябва да съдържа само букви и цифри.",
"array" => "The :attribute must have selected elements.",
"array" => "Полето :attribute трябва да има избрани елементи.",
"before" => "Полето :attribute трябва да бъде дата преди :date.",
"between" => array(
"numeric" => "Полето :attribute трябва да бъде между :min и :max.",
"file" => "Полето :attribute трябва да бъде между :min и :max килобайта.",
"string" => "Полето :attribute трябва да бъде между :min и :max знака.",
),
"confirmed" => "Полето :attribute не е потвърдено.",
"count" => "The :attribute must have exactly :count selected elements.",
"countbetween" => "The :attribute must have between :min and :max selected elements.",
"countmax" => "The :attribute must have less than :max selected elements.",
"countmin" => "The :attribute must have at least :min selected elements.",
"count" => "Полето :attribute трябва да има точно :count избрани елементи.",
"countbetween" => "Полето :attribute трябва да има от :min до :max избрани елементи.",
"countmax" => "Полето :attribute трябва да има по-малко от :max избрани елементи.",
"countmin" => "Полето :attribute трябва да има минимум :min избрани елементи.",
"different" => "Полетата :attribute и :other трябва да са различни.",
"email" => "Полето :attribute е с невалиден формат.",
"exists" => "Избраната стойност на :attribute вече съществува.",
Expand Down
6 changes: 3 additions & 3 deletions application/language/de/validation.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"active_url" => ":attribute ist keine gültige URL.",
"after" => ":attribute muss ein Datum nach dem :date sein.",
"alpha" => ":attribute darf nur Buchstaben beinhalten.",
"alpha_dash" => ":attribute sollte nur aus Buchstaben, Nummern und Bindestrichen bestehen.",
"alpha_num" => ":attribute sollte nur aus Buchstaben und Nummern bestehen.",
"alpha_dash" => ":attribute darf nur aus Buchstaben, Nummern und Bindestrichen bestehen.",
"alpha_num" => ":attribute darf nur aus Buchstaben und Nummern bestehen.",
"array" => ":attribute muss ausgewählte Elemente haben.",
"before" => ":attribute muss ein Datum vor dem :date sein.",
"between" => array(
Expand Down Expand Up @@ -57,7 +57,7 @@
),
"not_in" => "Der gewählte Wert für :attribute ist ungültig.",
"numeric" => ":attribute muss eine Zahl sein.",
"required" => ":attribute muss aufgefüllt sein.",
"required" => ":attribute muss ausgefüllt sein.",
"same" => ":attribute und :other müssen übereinstimmen.",
"size" => array(
"numeric" => ":attribute muss gleich :size sein.",
Expand Down
19 changes: 19 additions & 0 deletions application/language/el/pagination.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

return array(

/*
|--------------------------------------------------------------------------
| Pagination Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are used by the paginator library to build
| the pagination links. You're free to change them to anything you want.
| If you come up with something more exciting, let us know.
|
*/

'previous' => '&laquo; Προηγούμενο',
'next' => 'Επόμενο &raquo;',

);
104 changes: 104 additions & 0 deletions application/language/el/validation.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<?php

return array(

/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used
| by the validator class. Some of the rules contain multiple versions,
| such as the size (max, min, between) rules. These versions are used
| for different input types such as strings and files.
|
| These language lines may be easily changed to provide custom error
| messages in your application. Error messages for custom validation
| rules may also be added to this file.
|
*/

"accepted" => "Το πεδίο :attribute πρέπει να εγκριθεί.",
"active_url" => "Το πεδίο :attribute δεν ειναι σωστό URL.",
"after" => "Το πεδίο :attribute πρέπει η ημερομηνία να ειναι μετά :date.",
"alpha" => "Το πεδίο :attribute μπορεί να περιλαμβάνει μόνο γράμματα.",
"alpha_dash" => "Το πεδίο :attribute μπορεί να περιλαμβάνει μόνο γράμματα, αριθμούς και παύλες.",
"alpha_num" => "Το πεδίο :attribute μπορεί να περιλαμβάνει μόνο γράμματα και αριθμούς.",
"array" => "Το πεδίο :attribute πρέπει να περιλαμβάνει επιλεγμένα αντικείμενα.",
"before" => "Το πεδίο :attribute πρέπει η ημερομηνία να ειναι πριν από :date.",
"between" => array(
"numeric" => "Το πεδίο :attribute πρέπει να έχει τιμές μεταξύ :min - :max.",
"file" => "Το πεδίο :attribute πρέπει να ειναι ανάμεσα σε :min - :max kb.",
"string" => "Το πεδίο :attribute πρέπει να περιλαμβάνει :min - :max χαρακτήρες.",
),
"confirmed" => "Το πεδίο :attribute δεν πέρασε τον έλεγχο.",
"count" => "Το πεδίο :attribute πρέπει να έχει ακριβώς :count επιλεγμένα αντικείμενα.",
"countbetween" => "Το πεδίο :attribute πρέπει να είναι ανάμεσα σε :min και :max επιλεγμένα αντικείμενα.",
"countmax" => "Το πεδίο :attribute πρέπει να έχει λιγότερα από :max επιλεγμένα αντικείμενα.",
"countmin" => "Το πεδίο :attribute πρέπει να έχει τουλάχιστον :min επιλεγμένα αντικείμενα.",
"different" => "Τα πεδία :attribute και :other πρέπει να ειναι διαφορετικά.",
"email" => "Στο πεδίο :attribute η μορφοποίηση ειναι άκυρη.",
"exists" => "Το επιλεγμένο πεδίο :attribute είναι άκυρο.",
"image" => "Το πεδίο :attribute πρέπει να είναι εικόνα.",
"in" => "Το επιλεγμένο πεδίο :attribute είναι άκυρο.",
"integer" => "Το πεδίο :attribute πρέπει να ειναι αριθμός.",
"ip" => "Το πεδίο :attribute πρέπει να ειναι μια έγκυρη διεύθυνση IP.",
"match" => "Το φορμάτ του πεδίου :attribute είναι άκυρο.",
"max" => array(
"numeric" => "Το πεδίο :attribute πρέπει να είναι μικρότερο από :max.",
"file" => "Το πεδίο :attribute πρέπει να είναι μικρότερο από :max kb.",
"string" => "Το πεδίο :attribute πρέπει να έχει λιγότερους από :max χαρακτήρες.",
),
"mimes" => "Το πεδίο :attribute πρέπει να ειναι αρχείο με τύπο: :values.",
"min" => array(
"numeric" => "Το πεδίο :attribute πρέπει να είναι τουλάχιστον :min.",
"file" => "Το πεδίο :attribute πρέπει να είναι μικρότερο από :max kb.",
"string" => "Το πεδίο :attribute πρέπει να έχει λιγότερους από :max χαρακτήρες.",
),
"not_in" => "Το επιλεγμένο πεδίο :attribute είναι άκυρο.",
"numeric" => "Το πεδίο :attribute πρέπει να είναι αριθμός.",
"required" => "Το πεδίο :attribute είναι απαραίτητο.",
"same" => "Τα πεδία :attribute και :other πρέπει να είναι ίδια.",
"size" => array(
"numeric" => "Το πεδίο :attribute πρέπει να ειναι :size.",
"file" => "Το πεδίο :attribute πρέπει να έχει μέγεθος :size kb.",
"string" => "Το πεδίο :attribute πρέπει να είναι :size χαρακτήρες.",
),
"unique" => "Το πεδίο :attribute έχει ήδη ανατεθεί.",
"url" => "Το πεδίο :attribute είναι άκυρο.",

/*
|--------------------------------------------------------------------------
| Custom Validation Language Lines
|--------------------------------------------------------------------------
|
| Here you may specify custom validation messages for attributes using the
| convention "attribute_rule" to name the lines. This helps keep your
| custom validation clean and tidy.
|
| So, say you want to use a custom validation message when validating that
| the "email" attribute is unique. Just add "email_unique" to this array
| with your custom message. The Validator will handle the rest!
|
*/

'custom' => array(),

/*
|--------------------------------------------------------------------------
| 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". Your users will thank you.
|
| The Validator class will automatically search this array of lines it
| is attempting to replace the :attribute place-holder in messages.
| It's pretty slick. We think you'll like it.
|
*/

'attributes' => array(),

);
19 changes: 19 additions & 0 deletions application/language/gr/pagination.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

return array(

/*
|--------------------------------------------------------------------------
| Pagination Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are used by the paginator library to build
| the pagination links. You're free to change them to anything you want.
| If you come up with something more exciting, let us know.
|
*/

'previous' => '&laquo; Προηγούμενο',
'next' => 'Επόμενο &raquo;',

);
104 changes: 104 additions & 0 deletions application/language/gr/validation.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<?php

return array(

/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used
| by the validator class. Some of the rules contain multiple versions,
| such as the size (max, min, between) rules. These versions are used
| for different input types such as strings and files.
|
| These language lines may be easily changed to provide custom error
| messages in your application. Error messages for custom validation
| rules may also be added to this file.
|
*/

"accepted" => "Το πεδίο :attribute πρέπει να εγκριθεί.",
"active_url" => "Το πεδίο :attribute δεν ειναι σωστό URL.",
"after" => "Το πεδίο :attribute πρέπει η ημερομηνία να ειναι μετά :date.",
"alpha" => "Το πεδίο :attribute μπορεί να περιλαμβάνει μόνο γράμματα.",
"alpha_dash" => "Το πεδίο :attribute μπορεί να περιλαμβάνει μόνο γράμματα, αριθμούς και παύλες.",
"alpha_num" => "Το πεδίο :attribute μπορεί να περιλαμβάνει μόνο γράμματα και αριθμούς.",
"array" => "Το πεδίο :attribute πρέπει να περιλαμβάνει επιλεγμένα αντικείμενα.",
"before" => "Το πεδίο :attribute πρέπει η ημερομηνία να ειναι πριν από :date.",
"between" => array(
"numeric" => "Το πεδίο :attribute πρέπει να έχει τιμές μεταξύ :min - :max.",
"file" => "Το πεδίο :attribute πρέπει να ειναι ανάμεσα σε :min - :max kb.",
"string" => "Το πεδίο :attribute πρέπει να περιλαμβάνει :min - :max χαρακτήρες.",
),
"confirmed" => "Το πεδίο :attribute δεν πέρασε τον έλεγχο.",
"count" => "Το πεδίο :attribute πρέπει να έχει ακριβώς :count επιλεγμένα αντικείμενα.",
"countbetween" => "Το πεδίο :attribute πρέπει να είναι ανάμεσα σε :min και :max επιλεγμένα αντικείμενα.",
"countmax" => "Το πεδίο :attribute πρέπει να έχει λιγότερα από :max επιλεγμένα αντικείμενα.",
"countmin" => "Το πεδίο :attribute πρέπει να έχει τουλάχιστον :min επιλεγμένα αντικείμενα.",
"different" => "Τα πεδία :attribute και :other πρέπει να ειναι διαφορετικά.",
"email" => "Στο πεδίο :attribute η μορφοποίηση ειναι άκυρη.",
"exists" => "Το επιλεγμένο πεδίο :attribute είναι άκυρο.",
"image" => "Το πεδίο :attribute πρέπει να είναι εικόνα.",
"in" => "Το επιλεγμένο πεδίο :attribute είναι άκυρο.",
"integer" => "Το πεδίο :attribute πρέπει να ειναι αριθμός.",
"ip" => "Το πεδίο :attribute πρέπει να ειναι μια έγκυρη διεύθυνση IP.",
"match" => "Το φορμάτ του πεδίου :attribute είναι άκυρο.",
"max" => array(
"numeric" => "Το πεδίο :attribute πρέπει να είναι μικρότερο από :max.",
"file" => "Το πεδίο :attribute πρέπει να είναι μικρότερο από :max kb.",
"string" => "Το πεδίο :attribute πρέπει να έχει λιγότερους από :max χαρακτήρες.",
),
"mimes" => "Το πεδίο :attribute πρέπει να ειναι αρχείο με τύπο: :values.",
"min" => array(
"numeric" => "Το πεδίο :attribute πρέπει να είναι τουλάχιστον :min.",
"file" => "Το πεδίο :attribute πρέπει να είναι μικρότερο από :max kb.",
"string" => "Το πεδίο :attribute πρέπει να έχει λιγότερους από :max χαρακτήρες.",
),
"not_in" => "Το επιλεγμένο πεδίο :attribute είναι άκυρο.",
"numeric" => "Το πεδίο :attribute πρέπει να είναι αριθμός.",
"required" => "Το πεδίο :attribute είναι απαραίτητο.",
"same" => "Τα πεδία :attribute και :other πρέπει να είναι ίδια.",
"size" => array(
"numeric" => "Το πεδίο :attribute πρέπει να ειναι :size.",
"file" => "Το πεδίο :attribute πρέπει να έχει μέγεθος :size kb.",
"string" => "Το πεδίο :attribute πρέπει να είναι :size χαρακτήρες.",
),
"unique" => "Το πεδίο :attribute έχει ήδη ανατεθεί.",
"url" => "Το πεδίο :attribute είναι άκυρο.",

/*
|--------------------------------------------------------------------------
| Custom Validation Language Lines
|--------------------------------------------------------------------------
|
| Here you may specify custom validation messages for attributes using the
| convention "attribute_rule" to name the lines. This helps keep your
| custom validation clean and tidy.
|
| So, say you want to use a custom validation message when validating that
| the "email" attribute is unique. Just add "email_unique" to this array
| with your custom message. The Validator will handle the rest!
|
*/

'custom' => array(),

/*
|--------------------------------------------------------------------------
| 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". Your users will thank you.
|
| The Validator class will automatically search this array of lines it
| is attempting to replace the :attribute place-holder in messages.
| It's pretty slick. We think you'll like it.
|
*/

'attributes' => array(),

);
Loading

0 comments on commit c2a255c

Please sign in to comment.