diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
deleted file mode 100644
index 949b172..0000000
--- a/app/views/devise/confirmations/new.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-
Resend confirmation instructions
-
-<%= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
- <%= f.error_notification %>
- <%= f.full_error :confirmation_token %>
-
-
- <%= f.input :email, required: true, autofocus: true %>
-
-
-
- <%= f.button :submit, "Resend confirmation instructions" %>
-
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/confirmations/new.html.slim b/app/views/devise/confirmations/new.html.slim
new file mode 100644
index 0000000..4437d9d
--- /dev/null
+++ b/app/views/devise/confirmations/new.html.slim
@@ -0,0 +1,13 @@
+h2.entry-title Повторно изпращане на инструкции за потвърждаване на акаунт
+
+= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+ = f.error_notification
+ = f.full_error :confirmation_token
+
+ .form-inputs
+ = f.input :email, required: true, autofocus: true, hint: false
+
+ .form-actions
+ = f.button :submit, 'Изпрати отново инструкциите'
+
+== render 'devise/shared/links'
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index dc55f64..879307d 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,5 +1,5 @@
-Welcome <%= @email %>!
+Добре дошли, <%= @email %>!
-You can confirm your account email through the link below:
+Можете да потвърдите акаунта си като кликнете на линка отдолу:
-<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>
+<%= link_to 'Потвърди акаунта ми', confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
index f667dc1..387dcaa 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -1,8 +1,8 @@
-Hello <%= @resource.email %>!
+Здравейте, <%= @resource.email %>!
-Someone has requested a link to change your password. You can do this through the link below.
+Някой поиска линк за промяна на парола на аканута Ви. Паролата може да бъде променена от линкът отдолу.
-<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>
+<%= link_to 'Промяна на парола', edit_password_url(@resource, reset_password_token: @token) %>
-If you didn't request this, please ignore this email.
-Your password won't change until you access the link above and create a new one.
+Ако не желаете да смените паролата си, моля изтрийте това писмо.
+Паролата Ви няма да бъде променена докато не кликнете горния линк и не въведете нова парола.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
index 41e148b..145011d 100644
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -1,7 +1,7 @@
-Hello <%= @resource.email %>!
+Здравейте, <%= @resource.email %>!
-Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+Акаунтът Ви беше заключен поради голям брой неуспешни опити за влизане в него.
-Click the link below to unlock your account:
+Кликнете линкът отдолу, за да го отключите:
-<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>
+<%= link_to 'Отключване на акаунт', unlock_url(@resource, unlock_token: @token) %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
deleted file mode 100644
index 8f995ed..0000000
--- a/app/views/devise/passwords/edit.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-Change your password
-
-<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
- <%= f.error_notification %>
-
- <%= f.input :reset_password_token, as: :hidden %>
- <%= f.full_error :reset_password_token %>
-
-
- <%= f.input :password, label: "New password", required: true, autofocus: true %>
- <%= f.input :password_confirmation, label: "Confirm your new password", required: true %>
-
-
-
- <%= f.button :submit, "Change my password" %>
-
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/edit.html.slim b/app/views/devise/passwords/edit.html.slim
new file mode 100644
index 0000000..2a698ca
--- /dev/null
+++ b/app/views/devise/passwords/edit.html.slim
@@ -0,0 +1,16 @@
+h2.entry-title Промяна на парола
+
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+ = f.error_notification
+
+ = f.input :reset_password_token, as: :hidden
+ = f.full_error :reset_password_token
+
+ .form-inputs
+ = f.input :password, required: true, autofocus: true
+ = f.input :password_confirmation, required: true
+
+ .form-actions
+ = f.button :submit, 'Промяна на паролата'
+
+= render 'devise/shared/links'
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
deleted file mode 100644
index d1503e7..0000000
--- a/app/views/devise/passwords/new.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-Forgot your password?
-
-<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
- <%= f.error_notification %>
-
-
- <%= f.input :email, required: true, autofocus: true %>
-
-
-
- <%= f.button :submit, "Send me reset password instructions" %>
-
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.slim b/app/views/devise/passwords/new.html.slim
new file mode 100644
index 0000000..81f8378
--- /dev/null
+++ b/app/views/devise/passwords/new.html.slim
@@ -0,0 +1,12 @@
+h2.entry-title Забравена парола?
+
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+ = f.error_notification
+
+ .form-inputs
+ = f.input :email, required: true, autofocus: true, hint: false
+
+ .form-actions
+ = f.button :submit, 'Изпрати ми инструкции за промяна на парола'
+
+== render 'devise/shared/links'
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
deleted file mode 100644
index 090fb29..0000000
--- a/app/views/devise/registrations/new.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-Sign up
-
-<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
- <%= f.error_notification %>
-
-
- <%= f.input :email, required: true, autofocus: true %>
- <%= f.input :password, required: true %>
- <%= f.input :password_confirmation, required: true %>
-
-
-
- <%= f.button :submit, "Sign up" %>
-
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/registrations/new.html.slim b/app/views/devise/registrations/new.html.slim
new file mode 100644
index 0000000..f024368
--- /dev/null
+++ b/app/views/devise/registrations/new.html.slim
@@ -0,0 +1,14 @@
+h2.entry-title Регистрация
+
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+ = f.error_notification
+
+ .form-inputs
+ = f.input :email, required: true, autofocus: true
+ = f.input :password, required: true
+ = f.input :password_confirmation, required: true
+
+ .form-actions
+ = f.button :submit
+
+== render 'devise/shared/links'
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
deleted file mode 100644
index c790b49..0000000
--- a/app/views/devise/sessions/new.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-Sign in
-
-<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-
- <%= f.input :email, required: false, autofocus: true %>
- <%= f.input :password, required: false %>
- <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
-
-
-
- <%= f.button :submit, "Sign in" %>
-
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/sessions/new.html.slim b/app/views/devise/sessions/new.html.slim
new file mode 100644
index 0000000..996b085
--- /dev/null
+++ b/app/views/devise/sessions/new.html.slim
@@ -0,0 +1,12 @@
+h2.entry-title Вход
+
+= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+ .form-inputs
+ = f.input :email, required: false, autofocus: true, hint: false
+ = f.input :password, required: false, hint: false
+ = f.input :remember_me, as: :boolean if devise_mapping.rememberable?
+
+ .form-actions
+ = f.button :submit, 'Влез'
+
+== render 'devise/shared/links'
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
deleted file mode 100644
index d84bdde..0000000
--- a/app/views/devise/shared/_links.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
- <%= link_to "Sign up", new_registration_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
- <%= link_to "Forgot your password?", new_password_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
- <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
- <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.omniauthable? %>
- <%- resource_class.omniauth_providers.each do |provider| %>
- <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
- <% end -%>
-<% end -%>
diff --git a/app/views/devise/shared/_links.html.slim b/app/views/devise/shared/_links.html.slim
new file mode 100644
index 0000000..366b7c3
--- /dev/null
+++ b/app/views/devise/shared/_links.html.slim
@@ -0,0 +1,23 @@
+- if controller_name != 'sessions'
+ = link_to 'Вход', new_session_path(resource_name)
+ br
+
+- if devise_mapping.registerable? && controller_name != 'registrations'
+ = link_to 'Регистрация', new_registration_path(resource_name)
+ br
+
+- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
+ = link_to 'Забравена парола?', new_password_path(resource_name)
+ br
+
+- if devise_mapping.confirmable? && controller_name != 'confirmations'
+ = link_to 'Не Сте получили инструкции за потвърждение?', new_confirmation_path(resource_name)
+ br
+
+- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+ = link_to 'Не Сте получили инструкции за отключване?', new_unlock_path(resource_name)
+ br
+
+- if devise_mapping.omniauthable?
+ - resource_class.omniauth_providers.each do |provider|
+ = link_to 'Влез с #{provider.to_s.titleize}', omniauth_authorize_path(resource_name, provider)
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
deleted file mode 100644
index 788f62e..0000000
--- a/app/views/devise/unlocks/new.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-Resend unlock instructions
-
-<%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
- <%= f.error_notification %>
- <%= f.full_error :unlock_token %>
-
-
- <%= f.input :email, required: true, autofocus: true %>
-
-
-
- <%= f.button :submit, "Resend unlock instructions" %>
-
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/unlocks/new.html.slim b/app/views/devise/unlocks/new.html.slim
new file mode 100644
index 0000000..9b5abf7
--- /dev/null
+++ b/app/views/devise/unlocks/new.html.slim
@@ -0,0 +1,13 @@
+h2 Изпрати отново инструкции за отключване
+
+= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
+ = f.error_notification
+ = f.full_error :unlock_token
+
+ .form-inputs
+ = f.input :email, required: true, autofocus: true, hint: false
+
+ .form-actions
+ = f.button :submit, 'Изпрати отново инструкциите'
+
+== render 'devise/shared/links'
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index f26b51b..7851063 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -22,6 +22,9 @@
bg:
activerecord:
models:
+ user:
+ one: Потребител
+ other: Потребители
lecture:
one: Лекция
other: Лекции
@@ -30,6 +33,11 @@ bg:
other: Уъркшопи
track: Поток от лекции
attributes:
+ user:
+ email: E-mail
+ password: Парола
+ password_confirmation: Отново паролата
+ remember_me: Запомни ме
lecture:
title: Заглавие
subtitle: Подзаглавие
@@ -48,6 +56,14 @@ bg:
description: Описание
notes: Забележки
track: Поток от лекции
+ errors:
+ models:
+ user:
+ attributes:
+ email:
+ invalid: не е валиден имейл адрес
+ password_confirmation:
+ confirmation: не съответства на паролата
errors:
messages:
improbable_phone: 'не е валиден телефонен номер'
\ No newline at end of file
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 4641608..4f63345 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -1,13 +1,17 @@
bg:
simple_form:
- "yes": 'Да'
- "no": 'Не'
+ "yes": Да
+ "no": Не
required:
- text: 'Задължително поле'
+ text: Задължително поле
mark: '*'
error_notification:
- default_message: "Моля разгледайте проблемите по-долу:"
+ default_message: 'Моля разгледайте посочените грешките във формуляра:'
hints:
+ user:
+ email: Имейл адресът Ви. Ще бъде видим само от организаторите.
+ password: Парола с дължина между 8 и 128 символа
+ password_confirmation: Отново въведената отгоре парола
lecture:
title: Заглавието на лекцията Ви
subtitle: Подзаглавието на лекцията Ви (ако има такова)