From 248781006ec9b8737e3e83e4e1a4d19499f0cce9 Mon Sep 17 00:00:00 2001 From: Vasil Kolev Date: Sun, 31 Aug 2014 22:34:24 +0300 Subject: [PATCH] Finished translating .erb files --- .../mailer/confirmation_instructions.text.erb | 4 +-- .../reset_password_instructions.text.erb | 8 ++--- .../mailer/unlock_instructions.text.erb | 6 ++-- app/views/layouts/_nav.html.erb | 12 ++++---- app/views/layouts/application.html.erb | 2 +- config/locales/bg.yml | 22 +++++++++++++- config/locales/en.yml | 29 +++++++++++++------ 7 files changed, 57 insertions(+), 26 deletions(-) diff --git a/app/views/devise/mailer/confirmation_instructions.text.erb b/app/views/devise/mailer/confirmation_instructions.text.erb index 0a4a760..c6caa99 100644 --- a/app/views/devise/mailer/confirmation_instructions.text.erb +++ b/app/views/devise/mailer/confirmation_instructions.text.erb @@ -1,5 +1,5 @@ -Добре дошли, <%= @email %>! +<%= t(:welcome, name=@email) %>! -Можете да потвърдите акаунта си като кликнете на линка отдолу: +<%= t(:confirm_by_clicking) %> <%= confirmation_url(@resource, confirmation_token: @token) %> diff --git a/app/views/devise/mailer/reset_password_instructions.text.erb b/app/views/devise/mailer/reset_password_instructions.text.erb index 2caeadd..14261d0 100644 --- a/app/views/devise/mailer/reset_password_instructions.text.erb +++ b/app/views/devise/mailer/reset_password_instructions.text.erb @@ -1,8 +1,8 @@ -Здравейте, <%= @resource.email %>! +<%= t(:hello, name:@resource.email) %>! -Някой поиска линк за промяна на парола на аканута Ви. Паролата може да бъде променена от линкът отдолу. +<%= t(:someone_requested_passreset) %> <%= edit_password_url(@resource, reset_password_token: @token) %> -Ако не желаете да смените паролата си, моля изтрийте това писмо. -Паролата Ви няма да бъде променена докато не кликнете горния линк и не въведете нова парола. +<%= t(:do_not_want_pass_reset1) %> +<%= t(:do_not_want_pass_reset2) %> diff --git a/app/views/devise/mailer/unlock_instructions.text.erb b/app/views/devise/mailer/unlock_instructions.text.erb index 6a127db..637d45b 100644 --- a/app/views/devise/mailer/unlock_instructions.text.erb +++ b/app/views/devise/mailer/unlock_instructions.text.erb @@ -1,7 +1,7 @@ -Здравейте, <%= @resource.email %>! +<%= t(:hello, name:@resource.email) %>! -Акаунтът Ви беше заключен поради голям брой неуспешни опити за влизане в него. +<%= t(:account_locked) %> -Кликнете линкът отдолу, за да го отключите: +<%= t(:click_to_unlock) %> <%= unlock_url(@resource, unlock_token: @token) %> diff --git a/app/views/layouts/_nav.html.erb b/app/views/layouts/_nav.html.erb index 2910ab5..b606851 100644 --- a/app/views/layouts/_nav.html.erb +++ b/app/views/layouts/_nav.html.erb @@ -1,25 +1,25 @@