Skip to content

Commit

Permalink
Merge pull request #1 from Laravel-Lang/master
Browse files Browse the repository at this point in the history
Update branch orginal
  • Loading branch information
olsza authored Sep 23, 2020
2 parents 235ef1c + 8a2bbe7 commit 5a65438
Show file tree
Hide file tree
Showing 278 changed files with 30,974 additions and 6,145 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/CODE_OF_CONDUCT.md export-ignore
/CONTRIBUTING.md export-ignore
/todo.md export-ignore
70 changes: 70 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Changelog

All notable changes to this project will be documented in this file, since v7.0.0.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [7.0.4] - 2020-09-11

### Changed

* feature: new organization
* feature: #1316 [sr_*] validation-inline file
* feature: #1317 [es] json file
* feature: #1318 [fa] validation.password
* feature: #1320 [lt] validation-inline and validation
* feature: #1323 #1324 [id] json and validation-inline
* feature: #1326 [ko] validation-inline

## [7.0.3] - 2020-08-23

### Changed

* feature: #1302 #1306 #1307 [Ne] Translated to Nepali Language (Validation-inline and json)
* feature: #1310 [da] passwords.throttlled
* feature: #1312 [es] validation and validation-inline
* feature: #1313 [sq] validation-inline and validation translations

## [7.0.2] - 2020-08-05

### Added

* Changelog file
* #1293 [da] Add json

### Changed

* feature: #1290 [pl] Translate validation-inline; tweak some validation translations
* feature: #1291 [pt_BR] Update validation-inline
* feature: #1292 [es] Update json
* feature: #1294 Update readme
* feature: #1295 [pt] Update json, validation-inline, validation and passwords
* feature: #1297 [sq] Update auth, passwords and validation
* feature: #1298 [si] Update passwords
* feature: #1299 [zh_*] Update json and validation-inline
* feature: #1300 [uk] validation-inline
* feature: #1301 [uk] json

## [7.0.1] - 2020-07-14

### Added

* json files for uz_Cyrillic and uz_Latin

### Changed

* fix: #1269 json file names to follow ISO-15897

## [7.0.0] - 2020-07-13

### Changed

* feature: #1269 Rename locale folders following ISO 15897 format

[Unreleased]: https://github.com/caouecs/Laravel-lang/compare/7.0.4...master
[7.0.4]: https://github.com/caouecs/Laravel-lang/compare/7.0.3...7.0.4
[7.0.3]: https://github.com/caouecs/Laravel-lang/compare/7.0.2...7.0.3
[7.0.2]: https://github.com/caouecs/Laravel-lang/compare/7.0.1...7.0.2
[7.0.1]: https://github.com/caouecs/Laravel-lang/compare/7.0.0...7.0.1
[7.0.0]: https://github.com/caouecs/Laravel-lang/compare/6.1.4...7.0.0
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Contributions are **welcome** and will be fully **credited**.

We accept contributions via Pull Requests on [Github](https://github.com/caouecs/Laravel-lang).
We accept contributions via Pull Requests on [Github](https://github.com/Laravel-Lang/lang).

## How can I add a language in this project ?

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License (MIT)

Copyright (c) 2020 caouecs <[email protected]>
Copyright (c) 2020 Laravel-Lang team

> Permission is hereby granted, free of charge, to any person obtaining a copy
> of this software and associated documentation files (the "Software"), to deal
Expand Down
64 changes: 39 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,54 @@
# Laravel-lang

In this repository, you can find the lang files for the framework PHP, [Laravel 4/5/6/7](https://laravel.com).
In this repository, you can find the lang files for the framework PHP, [Laravel 4/5/6/7/8](https://laravel.com).

## News

* in version 6.1, we propose a new file by language: `validation-inline.php` ( see #1268 )
* in version 7, we propose new directory names to follow ISO-15897 ( see #1269 )

## Install

#### Via Composer
* For Laravel 7.x : run `composer require caouecs/laravel-lang:~6.0` in your project folder
* For Laravel 6.x : run `composer require caouecs/laravel-lang:~5.0` in your project folder
* For Laravel 5.8 : run `composer require caouecs/laravel-lang:~4.0` in your project folder
* For Laravel 5.1-5.7 : run `composer require caouecs/laravel-lang:~3.0` in your project folder
* For Laravel 5 : run `composer require caouecs/laravel-lang:~2.0` in your project folder
* For Laravel 4 : run `composer require caouecs/laravel-lang:~1.0` in your project folder
* Files of languages are in "vendor/caouecs/laravel-lang" directory
* Copy the folders of languages that you want, in the *resources/lang* folder of your Laravel application (*app/lang* in Laravel 4).
### Via Composer

Install the Laravel-lang package to your Laravel project with composer using command from the table below based on the version of Laravel you are using:

| Laravel version | Composer command |
|-------------------------------------|---------------------------------------------------|
| Laravel 8.x | `composer require laravel-lang/lang:~7.0` |
| Laravel 7.x and new directory names | `composer require laravel-lang/lang:~7.0` |
| Laravel 7.x | `composer require laravel-lang/lang:~6.1` |
| Laravel 6.x | `composer require laravel-lang/lang:~5.0` |
| Laravel 5.8 | `composer require laravel-lang/lang:~4.0` |
| Laravel 5.1-5.7 | `composer require laravel-lang/lang:~3.0` |
| Laravel 5 | `composer require laravel-lang/lang:~2.0` |
| Laravel 4 | `composer require laravel-lang/lang:~1.0` |

#### Via GitHub
#### Copy files

* Clone the [GitHub repository](https://github.com/caouecs/laravel-lang/) : *git clone https://github.com/caouecs/Laravel-lang.git*
* Or download the [zip file](https://github.com/caouecs/laravel-lang/archive/master.zip)
After adding the dependency using composer (as described above) to your application you can find the language files under the directory `vendor/laravel-lang/lang`.

Copy the folders (and JSON files) of languages that you want to use, into the directory `resources/lang` of your Laravel application (or `app/lang` in Laravel 4).

### Via GitHub

* Clone the [GitHub repository](https://github.com/Laravel-Lang/lang/) : *git clone https://github.com/Laravel-Lang/lang.git*
* Or download the [zip file](https://github.com/Laravel-Lang/lang/archive/master.zip)
* Choose the branch:
* `laravel4` for Laravel 4 project
* `master` for Laravel 5, 6, 7 projects
* Copy the folders of languages that you want, in *resources/lang* folder of your Laravel application (*app/lang* in Laravel 4).
* `master` for Laravel 5, 6, 7, 8 projects
* Copy the folders of languages that you want, in `resources/lang` folder of your Laravel application (or `app/lang` in Laravel 4).

#### Via SVN
### Via SVN

Run this in your project directory:

```sh
# Laravel 5:
svn export https://github.com/caouecs/Laravel-lang/trunk/src/[language-code] resources/lang/[language-code]
svn export https://github.com/Laravel-Lang/lang/trunk/src/[language-code] resources/lang/[language-code]

# Laravel 4:
svn export https://github.com/caouecs/Laravel-lang/branches/laravel4/[language-code] app/lang/[language-code]
svn export https://github.com/Laravel-Lang/lang/branches/laravel4/[language-code] app/lang/[language-code]
```

Replace `[language-code]` by any of the languages listed [here](src).
Expand All @@ -41,7 +57,6 @@ Replace `[language-code]` by any of the languages listed [here](src).

In the file *config/app.php*, change the value of *locale* by the short name of your language (*app/config/app.php* in Laravel 4).


## Contributing

Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
Expand All @@ -52,12 +67,11 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.

## Projects based on this package

* [LaravelLang by ARCANEDEV](https://github.com/ARCANEDEV/LaravelLang) - Translations manager and checker for Laravel.
* [Laravel-lang by overtrue](https://github.com/overtrue/laravel-lang) - Command to add languages in your project.
* [laravel-lang-installer by ablunier](https://github.com/ablunier/laravel-lang-installer) - Command for easily add languages to a Laravel project.
* [laravel-lang-publisher by Andrey Helldar](https://github.com/andrey-helldar/laravel-lang-publisher) - Easy installation and update of translation files for your project.
* [LaravelLang](https://github.com/ARCANEDEV/LaravelLang) by [*@arcanedev-maroc*](https://github.com/ARCANEDEV) - Translations manager and checker for Laravel.
* [Laravel-lang](https://github.com/overtrue/laravel-lang) by [*@overtrue*](https://github.com/overtrue) - Command to add languages in your project.
* [Lang Publisher](https://github.com/andrey-helldar/laravel-lang-publisher) by [*@andrey-helldar*](https://github.com/andrey-helldar) - Easy installation and update of translation files for your project.

## Credits

- [caouecs](https://github.com/caouecs)
- [All Contributors](https://github.com/caouecs/Laravel-lang/graphs/contributors)
- [Referents by language](referents.md)
- [All Contributors](https://github.com/Laravel-Lang/lang/graphs/contributors)
3 changes: 3 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Security Policy

This project is text translations of Laravel project. So, this project doesn't need to have security policy.
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
{
"name": "caouecs/laravel-lang",
"name": "laravel-lang/lang",
"description": "Languages for Laravel",
"keywords": ["laravel", "languages", "lpm", "lang"],
"license": "MIT",
"authors": [
{
"name": "caouecs",
"email": "[email protected]"
"name": "Laravel-Lang Team",
"url": "https://github.com/Laravel-Lang"
}
],
"suggest": {
"overtrue/laravel-lang": "Command to add languages in your project",
"arcanedev/laravel-lang": "Translations manager and checker for Laravel 5",
"ablunier/laravel-lang-installer": "Command for easily add languages to a Laravel project",
"andrey-helldar/laravel-lang-publisher": "Easy installation and update of translation files for your project"
},
"require": {
Expand Down
Loading

0 comments on commit 5a65438

Please sign in to comment.