Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 84cdcc6

Browse files
caouecscaouecs
committed
feature: the branch master is now for Laravel5
1 parent 3138b91 commit 84cdcc6

File tree

136 files changed

+1319
-1257
lines changed

Some content is hidden

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

136 files changed

+1319
-1257
lines changed

‎Changelog.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@
135135

136136
8 July 2014
137137

138-
* Update Chinese from Taiwan for validation.boolean by [Joy](https://github.com/joychao)
139-
* Update Traditional Chinese (Hong Kong) (zh-HK) and Chinese (zh-CN) for validation.boolean and validation.exists by [Joy](https://github.com/joychao)
138+
* Update Chinese from Taiwan for validation.boolean by [Carlos](https://github.com/overtrue)
139+
* Update Traditional Chinese (Hong Kong) (zh-HK) and Chinese (zh-CN) for validation.boolean and validation.exists by [Carlos](https://github.com/overtrue)
140140

141141
27 June 2014
142142

@@ -197,9 +197,9 @@
197197

198198
07 April 2014
199199

200-
* Update Chinese (zh-CN) by [Joy](https://github.com/joychao)
201-
* Update Chinese from Hong Kong (zh-HK) by [Joy](https://github.com/joychao)
202-
* Add Chinese from Taiwan (zh-TW) by [Joy](https://github.com/joychao)
200+
* Update Chinese (zh-CN) by [Carlos](https://github.com/overtrue)
201+
* Update Chinese from Hong Kong (zh-HK) by [Carlos](https://github.com/overtrue)
202+
* Add Chinese from Taiwan (zh-TW) by [Carlos](https://github.com/overtrue)
203203
* Update Japanese (ja) for validation by [Yuya Takahashi](https://github.com/takahashiyuya)
204204

205205
04 April 2014

‎README.md‎

Lines changed: 70 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,75 @@
1-
Laravel4-lang
1+
Laravel-lang
22
=============
33

44
In this repository, you can find the lang files for the framework PHP, [Laravel 4&5](http://www.laravel.com).
55

6-
Laravel 5.0
76
---
87

9-
The files of languages have been updated for Laravel 5, in `laravel5` branch.
8+
## Update 29 March
109

11-
* array for PHP 5.4+
12-
* validation.filled, with same translation than validation.required
13-
* *reminders* file is now *languages* file
10+
The project changes its name, but not yet its Composer package's name.
11+
You must choose the number of version of this project in your composer.json.
1412

15-
In `passwords` file [#323](https://github.com/caouecs/Laravel4-lang/issues/323) :
1613

17-
"sent" => "We have e-mailed your password reset link!"
18-
"reset" => "Your password has been reset!"
14+
---
15+
16+
How add languages in my app ?
17+
---
18+
19+
### Installation by GitHub
20+
21+
* Clone the [GitHub repository](https://github.com/caouecs/laravel-lang/) : *git clone https://github.com/caouecs/Laravel-lang.git*
22+
* Or download the [zip file](https://github.com/caouecs/laravel-lang/archive/master.zip)
23+
* Choose the branch:
24+
* `laravel4` for Laravel4 project
25+
* `master` for Laravel5 project
26+
* Copy the folders of languages that you want, in *app/lang* folder of your application Laravel
27+
28+
29+
### Installation by Composer
30+
31+
* For Laravel 4 : add `"caouecs/laravel4-lang": "~1.0"` in your `composer.json` in "require" or run *composer require caouecs/laravel4-lang*
32+
* For Laravel 5 : add `"caouecs/laravel4-lang": "~2.0"` in your `composer.json` in "require"
33+
* Do "composer update"
34+
* Files of languages are in "vendor/caouecs/laravel4-lang" directory
35+
* Copy the folders of languages that you want, in *app/lang* folder of your application Laravel
36+
37+
### Installation by Command
38+
39+
If you have a Laravel5 project, you can use `laravel-lang` project of overtrue : *composer require "overtrue/laravel-lang:dev-master"*
40+
41+
### Language by default in your app
42+
43+
In the file *app/config/app.php*, change the value of *language* by the short name of your language.
44+
45+
---
46+
47+
How can I add a language in this project ?
48+
---
49+
50+
* fork this repository
51+
* create a directory with the short name of the language (ex: fr for French) from ISO-639-1 ( see [Wikipedia](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) )
52+
* copy this three files of the english version with your translate
53+
* for [Laravel](https://github.com/laravel/laravel/tree/master/app/lang/en)
54+
* add a pull request with the name of the language
55+
56+
57+
How can I fix a file ?
58+
---
59+
60+
* fork this repository
61+
* update the file
62+
* add a pull request with the name of the language
63+
64+
The files for Laravel 4 are in `laravel4` branch, and for Laravel 5, are in `master` branch.
65+
1966

2067
Laravel 4.0
2168
---
2269

2370
We need your help to finish to translate `validation.php` file with array elements.
2471

25-
You can follow translations in the issue [#73](https://github.com/caouecs/Laravel4-lang/issues/73).
72+
You can follow translations in the issue [#73](https://github.com/caouecs/laravel-lang/issues/73).
2673

2774
Laravel 4.1
2875
---
@@ -33,31 +80,31 @@ To be ready for the new version of Laravel, we need your help. In `reminders.php
3380

3481
"sent" => "Password reminder sent!",
3582

36-
You can follow translations in the issue [#137](https://github.com/caouecs/Laravel4-lang/issues/137).
83+
You can follow translations in the issue [#137](https://github.com/caouecs/laravel-lang/issues/137).
3784

3885
### Required without all
3986

4087
In `validation.php` file, a new line has been added :
4188

4289
"required_without_all" => "The :attribute field is required when none of :values are present."
4390

44-
You can follow translations in the issue [#172](https://github.com/caouecs/Laravel4-lang/issues/172).
91+
You can follow translations in the issue [#172](https://github.com/caouecs/laravel-lang/issues/172).
4592

4693
### Validation email
4794

4895
In `validation.php` file, the text for email has been updated :
4996

5097
"email" => "The :attribute must be a valid email address."
5198

52-
You can follow translations in the issue [#187](https://github.com/caouecs/Laravel4-lang/issues/187).
99+
You can follow translations in the issue [#187](https://github.com/caouecs/laravel-lang/issues/187).
53100

54101
### Required with all
55102

56103
In `validation.php` file, a new line has been added :
57104

58105
"required_with_all" => "The :attribute field is required when :values is present."
59106

60-
You can follow translations in the issue [#193](https://github.com/caouecs/Laravel4-lang/issues/193).
107+
You can follow translations in the issue [#193](https://github.com/caouecs/laravel-lang/issues/193).
61108

62109
Laravel 4.2
63110
---
@@ -68,56 +115,24 @@ In `reminders.php` file, a new line has been added :
68115

69116
"reset" => "Password has been reset!"
70117

71-
You can follow translations in the issue [#258](https://github.com/caouecs/Laravel4-lang/issues/258).
118+
You can follow translations in the issue [#258](https://github.com/caouecs/laravel-lang/issues/258).
72119

73120
### Validation.timezone
74121

75122
In `validation.php` file, a new line has been added :
76123

77124
"timezone" => "The :attribute must be a valid zone."
78125

79-
You can follow translations in the issue [#259](https://github.com/caouecs/Laravel4-lang/issues/259).
80-
81-
---
82-
83-
How add languages in my app ?
84-
---
85-
86-
### Installation by GitHub
87-
88-
* Clone the [GitHub repository](https://github.com/caouecs/Laravel4-lang/) : *git clone https://github.com/caouecs/Laravel4-lang.git*
89-
* Or download the [zip file](https://github.com/caouecs/Laravel4-lang/archive/master.zip)
90-
* Copy the folders of languages that you want, in *app/lang* folder of your application Laravel
91-
92-
93-
### Installation by Composer
94-
95-
* For Laravel 4 : add *"caouecs/laravel4-lang": "dev-master"* in your `composer.json` in "require" or run *composer require caouecs/laravel4-lang*
96-
* For Laravel 5 : add *"caouecs/laravel4-lang": "dev-laravel5"* in your `composer.json` in "require"
97-
* Do "composer update"
98-
* Files of languages are in "vendor/caouecs/laravel4-lang" directory
99-
* Copy the folders of languages that you want, in *app/lang* folder of your application Laravel
100-
101-
102-
### Language by default in your app
103-
104-
In the file *app/config/app.php*, change the value of *language* by the short name of your language.
105-
106-
---
126+
You can follow translations in the issue [#259](https://github.com/caouecs/laravel-lang/issues/259).
107127

108-
How can I add a language in this project ?
128+
Laravel 5.0
109129
---
110130

111-
* fork this repository
112-
* create a directory with the short name of the language (ex: fr for French) from ISO-639-1 ( see [Wikipedia](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) )
113-
* copy this three files of the english version with your translate
114-
* for [Laravel](https://github.com/laravel/laravel/tree/master/app/lang/en)
115-
* add a pull request with the name of the language
116-
131+
* array for PHP 5.4+
132+
* validation.filled, with same translation than validation.required
133+
* *reminders* file is now *languages* file
117134

118-
How can I fix a file ?
119-
---
135+
In `passwords` file [#323](https://github.com/caouecs/laravel-lang/issues/323) :
120136

121-
* fork this repository
122-
* update the file
123-
* add a pull request with the name of the language
137+
"sent" => "We have e-mailed your password reset link!"
138+
"reset" => "Your password has been reset!"

‎ar/pagination.php‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
<?php
1+
<?php
22

3-
return array(
3+
return [
44

55
/*
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-
*/
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+
*/
1515

1616
'previous' => '&laquo; السابق',
1717

1818
'next' => 'التالي &raquo;',
1919

20-
);
20+
];
21+

‎ar/reminders.php‎ renamed to ‎ar/passwords.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
return array(
3+
return [
44

55
/*
66
|--------------------------------------------------------------------------
@@ -12,6 +12,7 @@
1212
| has failed, such as for an invalid token or invalid new password.
1313
|
1414
*/
15+
1516
"password" => "يجب أن لا يقل طول كلمة السر عن ستة أحرف، كما يجب أن تتطابق مع حقل التأكيد",
1617

1718
"user" => "لم يتم العثور على أيّ حسابٍ بهذا العنوان الإلكتروني",
@@ -22,4 +23,5 @@
2223

2324
"reset" => "تمت إعادة تعيين كلمة السر",
2425

25-
);
26+
];
27+

‎ar/validation.php‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
return array(
3+
return [
44

55
/*
66
|--------------------------------------------------------------------------
@@ -15,18 +15,18 @@
1515

1616
"accepted" => "يجب قبول الحقل :attribute",
1717
"active_url" => "الحقل :attribute لا يُمثّل رابطًا صحيحًا",
18-
"before" => "يجب على الحقل :attribute أن يكون تاريخًا سابقًا للتاريخ :date.",
1918
"after" => "يجب على الحقل :attribute أن يكون تاريخًا لاحقًا للتاريخ :date.",
2019
"alpha" => "يجب أن لا يحتوي الحقل :attribute سوى على حروف",
2120
"alpha_dash" => "يجب أن لا يحتوي الحقل :attribute على حروف، أرقام ومطّات.",
2221
"alpha_num" => "يجب أن يحتوي :attribute على حروفٍ وأرقامٍ فقط",
2322
"array" => "يجب أن يكون الحقل :attribute ًمصفوفة",
24-
"between" => array(
23+
"before" => "يجب على الحقل :attribute أن يكون تاريخًا سابقًا للتاريخ :date.",
24+
"between" => [
2525
"numeric" => "يجب أن تكون قيمة :attribute محصورة ما بين :min و :max.",
2626
"file" => "يجب أن يكون حجم الملف :attribute محصورًا ما بين :min و :max كيلوبايت.",
2727
"string" => "يجب أن يكون عدد حروف النّص :attribute محصورًا ما بين :min و :max",
2828
"array" => "يجب أن يحتوي :attribute على عدد من العناصر محصورًا ما بين :min و :max"
29-
),
29+
],
3030
"boolean" => "يجب أن تكون قيمة الحقل :attribute إما true أو false ",
3131
"confirmed" => "حقل التأكيد غير مُطابق للحقل :attribute",
3232
"date" => "الحقل :attribute ليس تاريخًا صحيحًا",
@@ -36,23 +36,24 @@
3636
"digits_between" => "يجب أن يحتوي الحقل :attribute ما بين :min و :max رقمًا/أرقام ",
3737
"email" => "يجب أن يكون :attribute عنوان بريد إلكتروني صحيح البُنية",
3838
"exists" => "الحقل :attribute لاغٍ",
39+
"filled" => "الحقل :attribute إجباري",
3940
"image" => "يجب أن يكون الحقل :attribute صورةً",
4041
"in" => "الحقل :attribute لاغٍ",
4142
"integer" => "يجب أن يكون الحقل :attribute عددًا صحيحًا",
4243
"ip" => "يجب أن يكون الحقل :attribute عنوان IP ذي بُنية صحيحة",
43-
"max" => array(
44+
"max" => [
4445
"numeric" => "يجب أن تكون قيمة الحقل :attribute أصغر من :max.",
4546
"file" => "يجب أن يكون حجم الملف :attribute أصغر من :max كيلوبايت",
4647
"string" => "يجب أن لا يتجاوز طول النّص :attribute :max حروفٍ/حرفًا",
4748
"array" => "يجب أن لا يحتوي الحقل :attribute على أكثر من :max عناصر/عنصر."
48-
),
49+
],
4950
"mimes" => "يجب أن يكون الحقل ملفًا من نوع : :values.",
50-
"min" => array(
51+
"min" => [
5152
"numeric" => "يجب أن تكون قيمة الحقل :attribute أكبر من :min.",
5253
"file" => "يجب أن يكون حجم الملف :attribute أكبر من :min كيلوبايت",
5354
"string" => "يجب أن يكون طول النص :attribute أكبر :min حروفٍ/حرفًا",
5455
"array" => "يجب أن يحتوي الحقل :attribute على الأقل على :min عُنصرًا/عناصر"
55-
),
56+
],
5657
"not_in" => "الحقل :attribute لاغٍ",
5758
"numeric" => "يجب على الحقل :attribute أن يكون رقمًا",
5859
"regex" => "صيغة الحقل :attribute .غير صحيحة",
@@ -63,13 +64,13 @@
6364
"required_without" => "الحقل :attribute إذا لم يتوفّر :values.",
6465
"required_without_all" => "الحقل :attribute إذا لم يتوفّر :values.",
6566
"same" => "يجب أن يتطابق الحقل :attribute مع :other",
66-
"size" => array(
67+
"size" => [
6768
"numeric" => "يجب أن تكون قيمة :attribute أكبر من :size.",
6869
"file" => "يجب أن يكون حجم الملف :attribute أكبر من :size كيلو بايت.",
6970
"string" => "يجب أن يحتوي النص :attribute عن ما لا يقل عن :size حرفٍ/أحرف.",
7071
"array" => "يجب أن يحتوي الحقل :attribute عن ما لا يقل عن:min عنصرٍ/عناصر"
71-
),
72-
"timezone" => "يجب أن يكون :attribute نطاقًا زمنيًا صحيحًا",
72+
],
73+
"timezone" => "يجب أن يكون :attribute نطاقًا زمنيًا صحيحًا",
7374
"unique" => "قيمة الحقل :attribute مُستخدمة من قبل",
7475
"url" => "صيغة الرابط :attribute غير صحيحة",
7576

@@ -83,11 +84,12 @@
8384
| specify a specific custom language line for a given attribute rule.
8485
|
8586
*/
86-
'custom' => array(
87-
'attribute-name' => array(
87+
88+
'custom' => [
89+
'attribute-name' => [
8890
'rule-name' => 'custom-message',
89-
),
90-
),
91+
],
92+
],
9193

9294
/*
9395
|--------------------------------------------------------------------------
@@ -100,14 +102,15 @@
100102
|
101103
*/
102104

103-
'attributes' => array(
104-
"name" => "الاسم",
105+
'attributes' => [
106+
"name" => "الاسم",
105107
"username" => "اسم المُستخدم",
106108
"email" => "البريد الالكتروني",
107109
"first_name" => "الاسم",
108110
"last_name" => "اسم العائلة",
109111
"password" => "كلمة السر",
110-
"city" => "المدينة",
112+
"password_confirmation" => "تأكيد كلمة السر",
113+
"city" => "المدينة",
111114
"country" => "الدولة",
112115
"address" => "العنوان",
113116
"phone" => "الهاتف",
@@ -129,6 +132,7 @@
129132
"time" => "الوقت",
130133
"available" => "مُتاح",
131134
"size" => "الحجم"
132-
),
135+
],
136+
137+
];
133138

134-
);

0 commit comments

Comments
 (0)