From f6ab4378890f944791ed64f68c7105d726a3c4fe Mon Sep 17 00:00:00 2001 From: Bruno Fontes Date: Thu, 27 Sep 2018 13:00:03 -0300 Subject: [PATCH] Added PTB Translation of emails and some pages Now the main page, item page and e-mails are translated into Brazilian Portuguese --- .../Controllers/Auth/RegisterController.php | 2 +- .../Auth/VerificationController.php | 2 +- app/Http/Controllers/ItemController.php | 6 +- app/Http/Controllers/ProductController.php | 7 +- app/Http/Controllers/TakeController.php | 6 +- app/Http/Controllers/UserController.php | 28 +++- app/Mail/ItemAvailable.php | 8 +- app/Mail/UserWaiting.php | 11 +- app/Mail/Welcome.php | 3 +- resources/lang/en/item.php | 40 +++++ resources/lang/en/welcome.php | 10 ++ resources/lang/pt-br.json | 50 ++++++ resources/lang/pt-br/auth.php | 19 +++ resources/lang/pt-br/home.php | 4 +- resources/lang/pt-br/item.php | 39 +++++ resources/lang/pt-br/pagination.php | 19 +++ resources/lang/pt-br/passwords.php | 22 +++ resources/lang/pt-br/validation.php | 148 ++++++++++++++++++ resources/lang/pt-br/welcome.php | 10 ++ .../views/emails/itemAvailable.blade.php | 21 +-- resources/views/emails/userWaiting.blade.php | 12 +- resources/views/emails/welcome.blade.php | 15 +- resources/views/item.blade.php | 2 +- resources/views/item/deleteButton.blade.php | 10 +- resources/views/item/editButton.blade.php | 10 +- resources/views/item/otherItems.blade.php | 4 +- resources/views/item/users.blade.php | 14 +- resources/views/welcome.blade.php | 20 +-- 28 files changed, 476 insertions(+), 66 deletions(-) create mode 100644 resources/lang/en/item.php create mode 100644 resources/lang/en/welcome.php create mode 100644 resources/lang/pt-br.json create mode 100644 resources/lang/pt-br/auth.php create mode 100644 resources/lang/pt-br/item.php create mode 100644 resources/lang/pt-br/pagination.php create mode 100644 resources/lang/pt-br/passwords.php create mode 100644 resources/lang/pt-br/validation.php create mode 100644 resources/lang/pt-br/welcome.php diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 482ef14..3f78a3f 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -73,7 +73,7 @@ class RegisterController extends Controller \Mail::to($user)->send(new Welcome($user)); - session()->flash(FlashMessage::PRIMARY, 'Thanks for registering. Please, do not forget to validate your e-mail address.'); + session()->flash(FlashMessage::PRIMARY, __('Thanks for registering. Please, do not forget to validate your e-mail address.')); return $user; } diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php index 4163aaa..4bb7a8f 100644 --- a/app/Http/Controllers/Auth/VerificationController.php +++ b/app/Http/Controllers/Auth/VerificationController.php @@ -25,7 +25,7 @@ class VerificationController extends Controller * * @var string */ - protected $redirectTo = '/home'; + protected $redirectTo = '/'; /** * Create a new controller instance. diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 4867ee0..83fe1fe 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -13,7 +13,11 @@ class ItemController extends Controller { $item = Item::find($id); if (!$item || $item->product->user_id != \Auth::id()) { - session()->flash(flash::DANGER, "The item doesn't exist."); + session()->flash(flash::DANGER, + \Lang::getFromJson( + "The item doesn't exist." + ) + ); return back(); } $users = $item->users()->get(); diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index 849fa7b..9282989 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -71,7 +71,12 @@ class ProductController extends Controller $product = Product::fromAuthUser()->find($id); if (!$product) { - session()->flash(flash::DANGER, "The product doesn't exist or doesn't belongs to you."); + session()->flash( + flash::DANGER, + \Lang::getFromJson( + "The product doesn't exist or doesn't belongs to you." + ) + ); return redirect('/product'); } return view('product.show', compact('product')); diff --git a/app/Http/Controllers/TakeController.php b/app/Http/Controllers/TakeController.php index 0870177..2333783 100644 --- a/app/Http/Controllers/TakeController.php +++ b/app/Http/Controllers/TakeController.php @@ -13,7 +13,11 @@ class TakeController extends Controller { $item = User::loggedIn()->items()->find(request('item')); if ($item->used_by) { - return back()->withErrors("This item is already taken"); + return back()->withErrors( + \Lang::getFromJson( + "This item is already taken" + ) + ); } $item->used_by = \Auth::id(); $item->save(); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 8d81573..cfaf577 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -42,14 +42,22 @@ class UserController extends Controller $userArray = User::where('email', request('email'))->get(); if (count($userArray) == 0) { - return back()->withErrors("The e-mail address is not registered yet."); + return back()->withErrors( + \Lang::getFromJson("The e-mail address is not registered yet.") + ); } $item = Item::findOrFail(request('item_id')); if ($item->product->user_id == \Auth::id()) { - User::findOrFail($userArray[0]->id)->items()->syncWithoutDetaching([request('item_id')]); + User::findOrFail($userArray[0]->id) + ->items() + ->syncWithoutDetaching([request('item_id')]); } else { - return back()->withErrors("You cannot add a user to a product that is not yourse."); + return back()->withErrors( + \Lang::getFromJson( + "You cannot add a user to a product that is not yourse." + ) + ); } return back(); } @@ -67,12 +75,20 @@ class UserController extends Controller $item = Item::findOrFail(request('item_id')); if ($item->product->user_id == \Auth::id()) { - $returnItem = User::findOrFail(request('user_id'))->items()->findOrFail(request('item_id')); + $returnItem = User::findOrFail(request('user_id')) + ->items() + ->findOrFail(request('item_id')); $returnItem->used_by = null; $returnItem->save(); - User::findOrFail(request('user_id'))->items()->detach([request('item_id')]); + User::findOrFail(request('user_id')) + ->items() + ->detach([request('item_id')]); } else { - return back()->withErrors("You cannot remove a user from a product that is not yourse."); + return back()->withErrors( + \Lang::getFromJson( + "You cannot remove a user from a product that is not yourse." + ) + ); } return back(); } diff --git a/app/Mail/ItemAvailable.php b/app/Mail/ItemAvailable.php index 17450c4..a93e074 100644 --- a/app/Mail/ItemAvailable.php +++ b/app/Mail/ItemAvailable.php @@ -32,7 +32,11 @@ class ItemAvailable extends Mailable */ public function build() { - return $this->subject($this->item->name . ' is available!') - ->markdown('emails.itemAvailable'); + return $this->subject( + \Lang::getFromJson( + ':itemname is available!', + ['itemname' => $this->item->name] + ) + )->markdown('emails.itemAvailable'); } } diff --git a/app/Mail/UserWaiting.php b/app/Mail/UserWaiting.php index 2be9b38..c8f8f87 100644 --- a/app/Mail/UserWaiting.php +++ b/app/Mail/UserWaiting.php @@ -34,7 +34,14 @@ class UserWaiting extends Mailable */ public function build() { - return $this->subject($this->waitingUser . ' wants to use ' . $this->item->name) - ->markdown('emails.userWaiting'); + return $this->subject( + \Lang::getFromJson( + ':waitinguser wants to use :itemname', + [ + 'waitinguser' => $this->waitingUser, + 'itemname' => $this->item->name + ] + ) + )->markdown('emails.userWaiting'); } } diff --git a/app/Mail/Welcome.php b/app/Mail/Welcome.php index 806d6df..8b272b6 100644 --- a/app/Mail/Welcome.php +++ b/app/Mail/Welcome.php @@ -2,6 +2,7 @@ namespace App\Mail; +use \Lang; use \App\User; use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; @@ -30,6 +31,6 @@ class Welcome extends Mailable */ public function build() { - return $this->markdown('emails.welcome'); + return $this->subject(Lang::getFromJson('Welcome'))->markdown('emails.welcome'); } } diff --git a/resources/lang/en/item.php b/resources/lang/en/item.php new file mode 100644 index 0000000..2b4c958 --- /dev/null +++ b/resources/lang/en/item.php @@ -0,0 +1,40 @@ + 'Confirmation...', + 'confirmDeletion' => 'Would you like to delete the item :itemname?', + 'notAbleRestore' => 'You will not be able to restore it after deletion.', + 'close' => 'Close', + 'delete' => 'Delete', + + /** + * Strings from Item Edit button menu + */ + 'edit' => 'Edit', + 'edititem' => 'Edit item', + 'newname' => 'New name:', + + /** + * Strings from the Users box on Item page + */ + 'users' => 'Users:', + 'noItems' => 'There are no items yet. Include one with the form above.', + 'addUser' => 'Add user', + 'email' => 'E-mail: ', + 'nameDomain' => 'name@domain.com', + 'insert' => 'Insert', + + /** + * String from otherItems.blade.php - Other items box from item page + */ + 'otherItems' => 'Other items from the same product', + + /** + * String from item.blade.php + */ + 'back' => 'BACK', + +]; \ No newline at end of file diff --git a/resources/lang/en/welcome.php b/resources/lang/en/welcome.php new file mode 100644 index 0000000..f17e8f4 --- /dev/null +++ b/resources/lang/en/welcome.php @@ -0,0 +1,10 @@ + 'Home', + 'Login' => 'Login', + 'Register' => 'Register', + 'Products' => 'Products', + 'Help' => 'Help', + 'copyright' => '© 2018 Bruno Fontes All Rights Reserved', + 'byAuthor' => 'By Bruno Fontes', +]; \ No newline at end of file diff --git a/resources/lang/pt-br.json b/resources/lang/pt-br.json new file mode 100644 index 0000000..06d69f3 --- /dev/null +++ b/resources/lang/pt-br.json @@ -0,0 +1,50 @@ +{ + "Reset Password": "Redefinir senha", + "E-Mail Address" : "E-mail", + "Send Password Reset Link" : "Redefinir senha", + "Password" : "Senha", + "Confirm Password" : "Confirmar senha", + "Login" : "Entrar", + "Remember Me" : "Manter conectado", + "Forgot Your Password?" : "Esqueceu sua senha?", + "Register" : "Cadastrar", + "Name" : "Nome", + "Logout" : "Desconectar", + "Verify Your Email Address" : "Confirme seu e-mail", + "A fresh verification link has been sent to your email address." : "Enviamos outro link de confirmação para o seu e-mail.", + "Before proceeding, please check your email for a verification link." : "Antes de continuar, use o link de confirmação que enviamos para o seu e-mail.", + "If you did not receive the email" : "Se você não recebeu o e-mail", + "click here to request another" : "clique aqui para enviar novamente", + "Thanks for registering. Please, do not forget to validate your e-mail address." : "Obrigado por se cadastrar. Não esqueça de validar seu e-mail.", + + "Welcome": "Bem-vindo!", + "Welcome, :username,": "Bem-vindo, :username,", + "Thank's for registering at **Share It!**" : "Obrigado por se registrar no **Share It!**", + "Your account was created, but you still need to activate it. We've sent you another e-mail and we are ready to go!" : "Sua conta foi criada, mas você ainda precisa confirmar o seu e-mail para usá-la. Enviamos um outro e-mail com a confirmação.", + "And you? Are you ready to Share It with your friends?" : "E você? Está pronto para compartilhar?", + + ":waitinguser wants to use :itemname": ":waitinguser quer usar :itemname", + "Hello!": "Olá!", + "Verify Email Address" : "Confirme o seu e-mail", + "Please click the button below to verify your email address." : "Clique no botão abaixo para confirmar o seu e-mail.", + "If you did not create an account, no further action is required." : "Se você não criou uma conta, basta ignorar este e-mail.", + "Regards": "Obrigado", + + ":itemname is available!": ":itemname está disponível!", + "Hi, :username,": "Olá, :username,", + "Good news: :itemname is available!": "Uma boa notícia: :itemname está disponível!", + "The item :itemname (:productname) is now available on **Share It**.": "O item :itemname (:productname) já está disponível no **Share It**.", + "**Take It** before anyone else at the website:": "Entre no nosso site para usar o item antes de todo mundo.", + + "Are you still using :itemname?": "Você ainda está usando o item :itemname?", + "We just want to let you know that :waitinguser asked us to be alerted when this item were available.": "A gente apenas queria dizer que :waitinguser nos pediu para avisar quando esse item estivesse disponível.", + "So, if you are not using it anymore, please **Return It** at the website:": "Então, se você não estiver mais usando, por favor, **Devolva** no nosso site:", + + "The e-mail address is not registered yet.": "Esse usuário ainda não está cadastrado.", + "You cannot add a user to a product that is not yourse.": "Você não pode adicionar um usuário a um produto que não é seu.", + "You cannot remove a user from a product that is not yourse.": "Você não pode remover um usuário de um produto que não é seu.", + + "The item doesn't exist.": "O item não existe.", + "The product doesn't exist or doesn't belongs to you.": "O produto não existe ou não é seu.", + "This item is already taken": "Esse item já está sendo usado" +} \ No newline at end of file diff --git a/resources/lang/pt-br/auth.php b/resources/lang/pt-br/auth.php new file mode 100644 index 0000000..ad5c5d1 --- /dev/null +++ b/resources/lang/pt-br/auth.php @@ -0,0 +1,19 @@ + 'Login ou senha inválidos.', + 'throttle' => 'Limite tentativas excedido. Você pode tentar novamente após :seconds segundos.', + +]; diff --git a/resources/lang/pt-br/home.php b/resources/lang/pt-br/home.php index 0c0c3cf..4ea2216 100644 --- a/resources/lang/pt-br/home.php +++ b/resources/lang/pt-br/home.php @@ -5,8 +5,8 @@ return [ 'no_messages' => 'Ainda não há itens compartilhados com você.', 'share_item' => 'Compartilhe um item!', - 'return' => 'Retornar', + 'return' => 'Devolver', 'cancel_alert' => 'Cancelar alerta', 'alert_me' => 'Alertar', - 'take' => 'Pegar' + 'take' => 'Usar' ]; \ No newline at end of file diff --git a/resources/lang/pt-br/item.php b/resources/lang/pt-br/item.php new file mode 100644 index 0000000..5e1f571 --- /dev/null +++ b/resources/lang/pt-br/item.php @@ -0,0 +1,39 @@ + 'Confirmação...', + 'confirmDeletion' => 'Você gostaria de apagar o item :itemname?', + 'notAbleRestore' => 'Não será possível restaurá-lo posteriormente.', + 'close' => 'Fechar', + 'delete' => 'Apagar', + + /** + * Strings from Item Edit button menu + */ + 'edit' => 'Editar', + 'edititem' => 'Editar item', + 'newname' => 'Novo nome:', + + /** + * Strings from the Users box on Item page + */ + 'users' => 'Usuários:', + 'noItems' => 'Não há itens cadastrados. Adicione um no formulário acima.', + 'addUser' => 'Adicionar usuário', + 'email' => 'E-mail: ', + 'nameDomain' => 'nome@dominio.com.br', + 'insert' => 'Inserir', + + /** + * String from otherItems.blade.php - Other items box from item page + */ + 'otherItems' => 'Outros items do mesmo produto', + + /** + * String from item.blade.php + */ + 'back' => 'VOLTAR', +]; \ No newline at end of file diff --git a/resources/lang/pt-br/pagination.php b/resources/lang/pt-br/pagination.php new file mode 100644 index 0000000..87b421a --- /dev/null +++ b/resources/lang/pt-br/pagination.php @@ -0,0 +1,19 @@ + '« Anterior', + 'next' => 'Próxima »', + +]; diff --git a/resources/lang/pt-br/passwords.php b/resources/lang/pt-br/passwords.php new file mode 100644 index 0000000..5f61fbf --- /dev/null +++ b/resources/lang/pt-br/passwords.php @@ -0,0 +1,22 @@ + 'As senhas precisam ter pelo menos 6 caracteres e serem iguais a confirmação.', + 'reset' => 'Sua senha foi redefinida!', + 'sent' => 'O link para redefinir sua senha foi enviado por e-mail!', + 'token' => 'O token de redefinição de senha é inválido.', + 'user' => "Não foi possível encontrar um usuário com o e-mail digitado.", + +]; diff --git a/resources/lang/pt-br/validation.php b/resources/lang/pt-br/validation.php new file mode 100644 index 0000000..53816aa --- /dev/null +++ b/resources/lang/pt-br/validation.php @@ -0,0 +1,148 @@ + 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', + 'alpha' => 'The :attribute may only contain letters.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.', + 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', + 'between' => [ + 'numeric' => 'The :attribute must be between :min and :max.', + 'file' => 'The :attribute must be between :min and :max kilobytes.', + 'string' => 'The :attribute must be between :min and :max characters.', + 'array' => 'The :attribute must have between :min and :max items.', + ], + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'Os campos :attribute e confirmar :attribute são diferentes.', + 'date' => 'The :attribute is not a valid date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'dimensions' => 'The :attribute has invalid image dimensions.', + 'distinct' => 'The :attribute field has a duplicate value.', + 'email' => 'The :attribute must be a valid email address.', + 'exists' => 'The selected :attribute is invalid.', + 'file' => 'The :attribute must be a file.', + 'filled' => 'The :attribute field must have a value.', + 'gt' => [ + 'numeric' => 'The :attribute must be greater than :value.', + 'file' => 'The :attribute must be greater than :value kilobytes.', + 'string' => 'The :attribute must be greater than :value characters.', + 'array' => 'The :attribute must have more than :value items.', + ], + 'gte' => [ + 'numeric' => 'The :attribute must be greater than or equal :value.', + 'file' => 'The :attribute must be greater than or equal :value kilobytes.', + 'string' => 'The :attribute must be greater than or equal :value characters.', + 'array' => 'The :attribute must have :value items or more.', + ], + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'in_array' => 'The :attribute field does not exist in :other.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'ipv4' => 'The :attribute must be a valid IPv4 address.', + 'ipv6' => 'The :attribute must be a valid IPv6 address.', + 'json' => 'The :attribute must be a valid JSON string.', + 'lt' => [ + 'numeric' => 'The :attribute must be less than :value.', + 'file' => 'The :attribute must be less than :value kilobytes.', + 'string' => 'The :attribute must be less than :value characters.', + 'array' => 'The :attribute must have less than :value items.', + ], + 'lte' => [ + 'numeric' => 'The :attribute must be less than or equal :value.', + 'file' => 'The :attribute must be less than or equal :value kilobytes.', + 'string' => 'The :attribute must be less than or equal :value characters.', + 'array' => 'The :attribute must not have more than :value items.', + ], + 'max' => [ + 'numeric' => 'The :attribute may not be greater than :max.', + 'file' => 'The :attribute may not be greater than :max kilobytes.', + 'string' => 'The :attribute may not be greater than :max characters.', + 'array' => 'The :attribute may not have more than :max items.', + ], + 'mimes' => 'The :attribute must be a file of type: :values.', + 'mimetypes' => 'The :attribute must be a file of type: :values.', + 'min' => [ + 'numeric' => 'O campo :attribute precisa ter pelo menos :min.', + 'file' => 'The :attribute must be at least :min kilobytes.', + 'string' => 'O campo :attribute precisa ter pelo menos :min caracteres.', + 'array' => 'The :attribute must have at least :min items.', + ], + 'not_in' => 'The selected :attribute is invalid.', + 'not_regex' => 'The :attribute format is invalid.', + 'numeric' => 'The :attribute must be a number.', + 'present' => 'The :attribute field must be present.', + 'regex' => 'The :attribute format is invalid.', + 'required' => 'The :attribute field is required.', + 'required_if' => 'The :attribute field is required when :other is :value.', + 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_with' => 'The :attribute field is required when :values is present.', + 'required_with_all' => 'The :attribute field is required when :values is present.', + 'required_without' => 'The :attribute field is required when :values is not present.', + 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'same' => 'The :attribute and :other must match.', + 'size' => [ + 'numeric' => 'The :attribute must be :size.', + 'file' => 'The :attribute must be :size kilobytes.', + 'string' => 'The :attribute must be :size characters.', + 'array' => 'The :attribute must contain :size items.', + ], + 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid zone.', + 'unique' => 'The :attribute has already been taken.', + 'uploaded' => 'The :attribute failed to upload.', + 'url' => 'The :attribute format is invalid.', + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'custom-message', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Custom 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". This simply helps us make messages a little cleaner. + | + */ + + 'attributes' => [ + 'password' => 'senha' + ], + +]; diff --git a/resources/lang/pt-br/welcome.php b/resources/lang/pt-br/welcome.php new file mode 100644 index 0000000..b636b3c --- /dev/null +++ b/resources/lang/pt-br/welcome.php @@ -0,0 +1,10 @@ + 'Início', + 'Login' => 'Login', + 'Register' => 'Cadastrar', + 'Products' => 'Produtos', + 'Help' => 'Ajuda', + 'copyright' => '© 2018 Bruno Fontes Todos os direitos reservados', + 'byAuthor' => 'Por Bruno Fontes', +]; \ No newline at end of file diff --git a/resources/views/emails/itemAvailable.blade.php b/resources/views/emails/itemAvailable.blade.php index c0d36dc..93b517f 100644 --- a/resources/views/emails/itemAvailable.blade.php +++ b/resources/views/emails/itemAvailable.blade.php @@ -1,15 +1,18 @@ @component('mail::message') -Hi, {{$username}}, - 
- 
-#Good news: {{$item->name}} is available! - 
-The item {{$item->name}} ({{$item->product->name}}) is now available on **Share It**. - 
-**Take It** before anyone else at the website: +{!! __('Hi, :username,', ['username' => $username]) !!} + + +#{!! __('Good news: :itemname is available!', ['itemname' => $item->name]) !!} + + +{!! __('The item :itemname (:productname) is now available on **Share It**.', ['itemname' => $item->name, 'productname' => $item->product->name]) !!} + + +{!! __('**Take It** before anyone else at the website:') !!} + @component('mail::button', ['url' => 'https://shareit.brunofontes.net/home']) -Share It! +{{ config('app.name') }} @endcomponent @endcomponent \ No newline at end of file diff --git a/resources/views/emails/userWaiting.blade.php b/resources/views/emails/userWaiting.blade.php index 6e1ae58..ec28a07 100644 --- a/resources/views/emails/userWaiting.blade.php +++ b/resources/views/emails/userWaiting.blade.php @@ -1,11 +1,15 @@ @component('mail::message') -Hello, {{$userWithItem}}, +{!! __('Hi, :username,', ['username' => $userWithItem]) !!} -Are you still using {{$item->name}}? -We just want to let you know that {{$waitingUser}} asked us to be alerted when this item were available. +{!! __('Are you still using :itemname?', ['itemname' => $item->name]) !!} + + +{!! __('We just want to let you know that :waitinguser asked us to be alerted when this item were available.', ['waitinguser' => $waitingUser]) !!} + + +{!! __('So, if you are not using it anymore, please **Return It** at the website:') !!} -So, if you are not using it anymore, please **Return It** at the website: @component('mail::button', ['url' => 'https://shareit.brunofontes.net/home']) Share It! diff --git a/resources/views/emails/welcome.blade.php b/resources/views/emails/welcome.blade.php index 3bcf297..028f659 100644 --- a/resources/views/emails/welcome.blade.php +++ b/resources/views/emails/welcome.blade.php @@ -1,12 +1,17 @@ @component('mail::message') -# Welcome, {{$user->name}}, +# @lang('Welcome, :username,', ['username' => $user->name]) -Thank's for registering at **Share It!** -Your account was created, but you still need to activate it. We've sent you another e-mail and we are ready to go! +@lang("Thank's for registering at **Share It!**") + + +@lang("Your account was created, but you still need to activate it. We've sent you another e-mail and we are ready to go!") + + +@lang("And you? Are you ready to Share It with your friends?") -And you? Are you ready to Share It with your friends? :) @component('mail::button', ['url' => 'https://shareit.brunofontes.net']) -Share It! +{{ config('app.name') }} +@endcomponent @endcomponent \ No newline at end of file diff --git a/resources/views/item.blade.php b/resources/views/item.blade.php index 2f816ba..ff1cda4 100644 --- a/resources/views/item.blade.php +++ b/resources/views/item.blade.php @@ -29,7 +29,7 @@ @include ('item.otherItems') -
BACK
+
{{ __('item.back') }}
diff --git a/resources/views/item/deleteButton.blade.php b/resources/views/item/deleteButton.blade.php index cc49276..dbd2597 100644 --- a/resources/views/item/deleteButton.blade.php +++ b/resources/views/item/deleteButton.blade.php @@ -5,22 +5,22 @@
- +
-

Would you like to delete the item {{$item->name}}?

-

You will not be able to restore it after deletion.

+

{!! __('item.confirmDeletion', ['itemname' => $item->name]) !!}

+

{!! __('item.notAbleRestore') !!}

- +
@method('DELETE') {{ csrf_field() }} - +
diff --git a/resources/views/item/editButton.blade.php b/resources/views/item/editButton.blade.php index d934c0a..b1408fe 100644 --- a/resources/views/item/editButton.blade.php +++ b/resources/views/item/editButton.blade.php @@ -1,11 +1,11 @@ - +