Skip to content

Commit

Permalink
Merge pull request #1 from caouecs/master
Browse files Browse the repository at this point in the history
PR updates
  • Loading branch information
robindirksen1 authored Oct 4, 2018
2 parents 4cf10d0 + 2d212dc commit 8f34c83
Show file tree
Hide file tree
Showing 301 changed files with 6,144 additions and 1,230 deletions.
146 changes: 68 additions & 78 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -1,79 +1,69 @@
<?php

use Symfony\CS\Config\Config;
use Symfony\CS\FixerInterface;
use Symfony\CS\Finder\DefaultFinder;

$fixers = [
'align_double_arrow',
'blankline_after_open_tag',
'braces',
'concat_without_spaces',
'double_arrow_multiline_whitespaces',
'duplicate_semicolon',
'elseif',
'empty_return',
'encoding',
'eof_ending',
'extra_empty_lines',
'function_call_space',
'function_declaration',
'include',
'indentation',
'join_function',
'line_after_namespace',
'linefeed',
'list_commas',
'lowercase_constants',
'lowercase_keywords',
'method_argument_space',
'multiline_array_trailing_comma',
'multiline_spaces_before_semicolon',
'multiple_use',
'namespace_no_leading_whitespace',
'no_blank_lines_after_class_opening',
'no_empty_lines_after_phpdocs',
'object_operator',
'operators_spaces',
'parenthesis',
'phpdoc_indent',
'phpdoc_inline_tag',
'phpdoc_no_access',
'phpdoc_no_package',
'phpdoc_scalar',
'phpdoc_short_description',
'phpdoc_to_comment',
'phpdoc_trim',
'phpdoc_type_to_var',
'phpdoc_var_without_name',
'remove_leading_slash_use',
'remove_lines_between_uses',
'return',
'self_accessor',
'short_array_syntax',
'short_echo_tag',
'short_tag',
'single_array_no_trailing_comma',
'single_blank_line_before_namespace',
'single_line_after_imports',
'single_quote',
'spaces_before_semicolon',
'spaces_cast',
'standardize_not_equal',
'ternary_spaces',
'trailing_spaces',
'trim_array_spaces',
'unalign_equals',
'unary_operators_spaces',
'unused_use',
'visibility',
'whitespacy_lines',
];

$finder = DefaultFinder::create()->in(__DIR__)->name('*.php');

return Config::create()
->finder($finder)
->fixers($fixers)
->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
->setUsingCache(true);
$header = <<<'EOF'
This file is part of PHP CS Fixer.
(c) Fabien Potencier <[email protected]>
Dariusz Rumiński <[email protected]>
This source file is subject to the MIT license that is bundled
with this source code in the file LICENSE.
EOF;
$config = PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules([
'@PHP56Migration' => true,
'@PHPUnit60Migration:risky' => true,
'@Symfony' => true,
'@Symfony:risky' => true,
'align_multiline_comment' => true,
'array_syntax' => ['syntax' => 'short'],
'blank_line_before_statement' => true,
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'compact_nullable_typehint' => true,
'escape_implicit_backslashes' => true,
'explicit_indirect_variable' => true,
'explicit_string_variable' => true,
'final_internal_class' => true,
'heredoc_to_nowdoc' => true,
'list_syntax' => ['syntax' => 'long'],
'method_chaining_indentation' => true,
'method_argument_space' => ['ensure_fully_multiline' => true],
'multiline_comment_opening_closing' => true,
'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
'no_null_property_initialization' => true,
'no_short_echo_tag' => true,
'no_superfluous_elseif' => true,
'no_unneeded_curly_braces' => true,
'no_unneeded_final_method' => true,
'no_unreachable_default_argument_value' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'phpdoc_add_missing_param_annotation' => true,
'phpdoc_order' => true,
'phpdoc_types_order' => true,
'semicolon_after_instruction' => true,
'single_line_comment_style' => true,
'strict_comparison' => true,
'strict_param' => true,
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude('tests/Fixtures')
->in(__DIR__)
)
;
// special handling of fabbot.io service if it's using too old PHP CS Fixer version
try {
PhpCsFixer\FixerFactory::create()
->registerBuiltInFixers()
->registerCustomFixers($config->getCustomFixers())
->useRuleSet(new PhpCsFixer\RuleSet($config->getRules()));
} catch (PhpCsFixer\ConfigurationException\InvalidConfigurationException $e) {
$config->setRules([]);
} catch (UnexpectedValueException $e) {
$config->setRules([]);
} catch (InvalidArgumentException $e) {
$config->setRules([]);
}
return $config;
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Laravel-lang

[![Stories in Ready](https://badge.waffle.io/caouecs/Laravel-lang.svg?label=ready&title=Ready)](http://waffle.io/caouecs/Laravel-lang)
[![Stories in Ready](https://badge.waffle.io/caouecs/Laravel-lang.svg)](http://waffle.io/caouecs/Laravel-lang)

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

Expand Down Expand Up @@ -60,9 +60,10 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.

## Projects based on this package

* [LaravelLang by ARCANEDEV](https://github.com/ARCANEDEV/LaravelLang)
* [Laravel-lang by overtrue](https://github.com/overtrue/laravel-lang)
* [laravel-lang-installer by ablunier](https://github.com/ablunier/laravel-lang-installer)
* [LaravelLang by ARCANEDEV](https://github.com/ARCANEDEV/LaravelLang) - Translations manager and checker for Laravel 5.
* [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.

## Credits

Expand Down
18 changes: 18 additions & 0 deletions changelog.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

return [
'2018-01-29' => [
'uz-cyrillic' => 'add new language : Uzbek cyrillic',
'yz-latin' => 'add new language : Uzbek latin',
],
'2018-01-23' => [
'lv' => 'fix rename validation file',
'pl' => 'validation.ipv4 and validation.ipv6 updated',
],
'2018-01-19' => [
'ug' => 'add new language : Uyghur',
],
'2018-01-10' => [
'lv' => 'add new language : Latvia',
],
];
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
"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"
"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-dev": {
"friendsofphp/php-cs-fixer": "^1.10"
"friendsofphp/php-cs-fixer": "^2.10"
}
}
32 changes: 32 additions & 0 deletions json/ar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"A fresh verification link has been sent to your email address.": "تم إرسال رابط تحقق جديد إلى عنوان بريدك الإلكتروني.",
"Confirm Password": "تأكيد كلمة المرور",
"E-Mail Address": "البريد الالكتروني",
"Error": "خطأ",
"Forgot Your Password?": "نسيت كلمة المرور؟",
"Go Home": "الرئيسية",
"hi": "مرحباً",
"If you did not request a password reset, no further action is required.": "إذا لم تقم بطلب استعادة كلمة المرور، لا تحتاج القيام بأي إجراء.",
"Login": "تسجيل الدخول",
"Logout": "تسجيل الخروج",
"Name": "الاسم",
"Oh no": "انتبه",
"Page Expired": "الصفحة منتهية الصلاحية",
"Page Not Found": "الصفحة غير موجودة",
"Password": "كلمة المرور",
"Register": "تسجيل",
"Remember Me": "تذكرني",
"Reset Password": "استعادة كلمة المرور",
"Reset Password Notification": "تنبيه استعادة كلمة المرور",
"Send Password Reset Link": "أرسل رابط استعادة كلمة المرور",
"Service Unavailable": "الخدمة غير متوفرة",
"Sorry, the page you are looking for could not be found.": "عذرًا، تعذر العثور على الصفحة التي تبحث عنها.",
"Sorry, you are making too many requests to our servers.": "عذرًا، أنت ترسل طلبات كثيرة جدًا إلى خوادمنا.",
"Sorry, you are not authorized to access this page.": "عذرًا، أنت غير مصرح لك بالوصول إلى هذه الصفحة.",
"Sorry, your session has expired. Please refresh and try again.": "عذرًا، لقد انتهت صلاحية جلستك. يرجى التحديث والمحاولة مرة أخرى.",
"Sorry, we are doing some maintenance. Please check back soon.": "عذرًا، نقوم ببعض الصيانة حالياً. الرجاء التحقق مرة أخرى قريباً.",
"Too Many Requests": "طلبات كثيرة جدًا",
"Unauthorized": "غير مصرح",
"Verify Your Email Address": "تحقق من عنوان البريد الإلكتروني الخاص بك",
"You are receiving this email because we received a password reset request for your account.": "لقد استلمت هذا الإيميل لأننا استقبلنا طلباً لاستعادة كلمة مرور حسابك."
}
21 changes: 21 additions & 0 deletions json/de.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"Confirm Password": "Passwort bestätigen",
"E-Mail Address": "E-Mail Adresse",
"Forgot Your Password?": "Passwort vergessen?",
"hi": "hallo",
"Login": "Einloggen",
"Logout": "Ausloggen",
"Name": "Name",
"Oh no": "Ach nein",
"Page Expired": "Seite ist abgelaufen",
"Page Not Found": "Seite nicht gefunden",
"Password": "Passwort",
"Register": "Registrieren",
"Remember Me": "Angemeldet bleiben",
"Reset Password": "Passwort zurücksetzen",
"Send Password Reset Link": "Link zum Zurücksetzen des Passworts senden",
"If you did not request a password reset, no further action is required.": "Falls sie den Link zum Zurücksetzen des Passworts nicht angefordert haben, können sie diese E-Mail ignorieren.",
"Name": "Name",
"Reset Password Notification": "Passwort zurücksetzen",
"You are receiving this email because we received a password reset request for your account.": "Sie erhalten diese Nachricht, weil für ihren Account beantragt wurde das Passwort zurückzusetzen."
}
32 changes: 32 additions & 0 deletions json/es.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"A fresh verification link has been sent to your email address.": "Se ha enviado un nuevo enlace de verificación a su correo electrónico.",
"Confirm Password": "Confirmar contraseña",
"E-Mail Address": "E-mail",
"Error": "Error ",
"Forgot Your Password?": "¿Olvidó su contraseña?",
"Go Home": "Ir a inicio",
"hi": "hola",
"If you did not request a password reset, no further action is required.": "Si no ha solicitado este restablecimiento de contraseña, omita este correo electrónico.",
"Login": "Entrar",
"Logout": "Salir",
"Name": "Nombre",
"Oh no": "Oh no ",
"Page Expired": "Página Expirada",
"Page Not Found": "Página no encontrada",
"Password": "Contraseña",
"Register": "Registrar",
"Remember Me": "Recuérdame",
"Reset Password": "Restablecer contraseña",
"Reset Password Notification": "Notificación de restablecimiento de contraseña",
"Send Password Reset Link": "Enviar enlace para restablecer la contraseña",
"Service Unavailable": "Servicio no disponible",
"Sorry, the page you are looking for could not be found.": "Lo sentimos, la página que está buscando no se pudo encontrar.",
"Sorry, you are making too many requests to our servers.": "Lo sentimos, estás haciendo demasiadas peticiones a nuestros servidores.",
"Sorry, you are not authorized to access this page.": "Lo sentimos, no estás autorizado para acceder a esta página.",
"Sorry, your session has expired. Please refresh and try again.": "Lo sentimos, tu sesión ha expirado. Por favor, actualice y vuelva a intentarlo.",
"Sorry, we are doing some maintenance. Please check back soon.": "Lo sentimos, estamos haciendo un poco de mantenimiento. Por favor, vuelva pronto.",
"Too Many Requests": "Demansiadas peticiones",
"Unauthorized": "No autorizado",
"Verify Your Email Address": "Verifica tu correo electrónico",
"You are receiving this email because we received a password reset request for your account.": "Ha recibido este mensaje porque se solicitó un restablecimiento de contraseña para su cuenta."
}
14 changes: 14 additions & 0 deletions json/fi.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"Reset Password Notification": "Salasanan uudelleenasetusilmoitus",
"You are receiving this email because we received a password reset request for your account.":
"Saat tämän viestin koska saimme pyynnön vaihtaa salasanasi.",
"Reset Password": "Vaihdan salasanani",
"If you did not request a password reset, no further action is required.":
"Jos et ole pyytänyt salasanan vaihtoa, sinun ei tarvitse tehdä mitään ja voit poistaa tämän viestin.",

"Hello!": "Tervehdys.",
"Whoops!": "Tapahtui virhe.",
"Regards": "Terveisin",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser: [:actionURL](:actionURL)":
"Jos et pysty klikkaamaan \":actionText\" - nappia, leikkaa ja liimaa alla oleva URL\nselaimeesi: [:actionURL](:actionURL)"
}
16 changes: 16 additions & 0 deletions json/fr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"Confirm Password": "Confirmez le mot de passe",
"E-Mail Address": "Adresse courriel",
"Forgot Your Password?": "Vous avez oublié votre mot de passe ?",
"If you did not request a password reset, no further action is required.": "Si vous n'avez pas demandé de réinitialisation de mot de passe, aucune autre action n'est requise.",
"Login": "Connexion",
"Logout": "Déconnexion",
"Name": "Nom",
"Password": "Mot de passe",
"Register": "S'inscrire",
"Remember Me": "Se souvenir de moi",
"Reset Password": "Réinitialisation du mot de passe",
"Reset Password Notification": "Notification de réinitialisation du mot de passe",
"Send Password Reset Link": "Envoyer le lien de réinitialisation du mot de passe",
"You are receiving this email because we received a password reset request for your account.": "Vous avez reçu ce courriel parce que nous avons reçu une demande de réinitialisation de mot de passe pour votre compte."
}
16 changes: 16 additions & 0 deletions json/hr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"Confirm Password": "Potvrdite zaporku",
"E-Mail Address": "Adresa elektronske pošte",
"Forgot Your Password?": "Zaboravili ste zaporku?",
"If you did not request a password reset, no further action is required.": "Ukoliko niste zahtjevali promjenu zaporke, nije potrebno da preduzimate dalje korake.",
"Login": "Prijava",
"Logout": "Odjava",
"Name": "Ime",
"Password": "Zaporka",
"Register": "Registracija",
"Remember Me": "Zapamti me",
"Reset Password": "Resetuj zaporku",
"Reset Password Notification": "Obavijest o resetovanju zaporke",
"Send Password Reset Link": "Pošalji poveznicu za reset zaporke",
"You are receiving this email because we received a password reset request for your account.": "Ovaj e-mail Vam je poslat jer ste zahtjevali promjenu zaporke za vaš nalog."
}
16 changes: 16 additions & 0 deletions json/id.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"Confirm Password": "Konfirmasi Kata Sandi",
"E-Mail Address": "Alamat Surel",
"Forgot Your Password?": "Lupa Kata Sandi Anda?",
"If you did not request a password reset, no further action is required.": "Jika anda tidak meminta pengaturan ulang kata sandi, anda tidak perlu melakukan apapun.",
"Login": "Masuk",
"Logout": "Keluar",
"Name": "Nama",
"Password": "Kata Sandi",
"Register": "Daftar",
"Remember Me": "Ingatkan Saya",
"Reset Password": "Atur Ulang Kata Sandi",
"Reset Password Notification": "Pemberitahuan Pengaturan Ulang Kata Sandi",
"Send Password Reset Link": "Kirim Tautan Pengaturan Ulang Kata Sandi",
"You are receiving this email because we received a password reset request for your account.": "Anda menerima surel ini karena kami menerima permintan pengaturan ulang kata sandi untuk akun anda."
}
16 changes: 16 additions & 0 deletions json/ka.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"Confirm Password": "პაროლის დადასტურება",
"E-Mail Address": "ელ-ფოსტა",
"Forgot Your Password?": "პაროლი დაგავიწყდათ?",
"If you did not request a password reset, no further action is required.": "თუ არ მოგითხოვიათ პაროლის შეცვლა, არანაირი საპასუხო ქმედება არ არის საჭირო.",
"Login": "შესვლა",
"Logout": "გასვლა",
"Name": "სახელი",
"Password": "პაროლი",
"Register": "რეგისტრირება",
"Remember Me": "დამიმახსოვრე",
"Reset Password": "პაროლის აღდგენა",
"Reset Password Notification": "პაროლის აღდგენის შეტყობინება",
"Send Password Reset Link": "პაროლის აღსადგენი ლინკის გაგზავნა",
"You are receiving this email because we received a password reset request for your account.": "თქვენ ხედავთ აღნიშნულ შეტყობინებას რადგან მივიღეთ თქვენი მოთხოვნა პაროლის აღდგენასთან დაკავშირებით."
}
16 changes: 16 additions & 0 deletions json/ko.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"Confirm Password": "비밀번호 확인",
"E-Mail Address": "E-Mail 주소",
"Forgot Your Password?": "비밀번호를 잊으셨나요?",
"If you did not request a password reset, no further action is required.": "귀하께서 비밀번호 재설정을 요청하지 않으셨다면, 더이상 진행하지 마십시오.",
"Login": "로그인",
"Logout": "로그아웃",
"Name": "이름",
"Password": "비밀번호",
"Register": "회원가입",
"Remember Me": "ID 저장",
"Reset Password": "비밀번호 재설정",
"Reset Password Notification": "비밀번호 재설정 알림",
"Send Password Reset Link": "비밀번호 재설정 링크 보내기",
"You are receiving this email because we received a password reset request for your account.": "귀하의 계정에 비밀번호 재설정이 요청되어 해당 메일이 발송되었습니다."
}
Loading

0 comments on commit 8f34c83

Please sign in to comment.