devise-i18n-bootstrap 0.3.0.beta → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +18 -1
  3. data/app/views/devise/_links.erb +3 -3
  4. data/app/views/devise/confirmations/new.html.erb +10 -7
  5. data/app/views/devise/mailer/confirmation_instructions.html.erb +6 -4
  6. data/app/views/devise/mailer/reset_password_instructions.html.erb +5 -5
  7. data/app/views/devise/mailer/unlock_instructions.html.erb +4 -4
  8. data/app/views/devise/passwords/edit.html.erb +11 -10
  9. data/app/views/devise/passwords/new.html.erb +10 -7
  10. data/app/views/devise/registrations/edit.html.erb +24 -16
  11. data/app/views/devise/registrations/new.html.erb +12 -13
  12. data/app/views/devise/sessions/_navbar_new.html.erb +18 -0
  13. data/app/views/devise/sessions/new.html.erb +13 -15
  14. data/app/views/devise/shared/_links.erb +6 -6
  15. data/app/views/devise/unlocks/new.html.erb +11 -7
  16. data/config/locales/de.yml +3 -3
  17. data/config/locales/en.yml +10 -1
  18. data/config/locales/hu.yml +70 -10
  19. data/lib/devise-i18n-bootstrap.rb +4 -21
  20. data/lib/devise_i18n_bootstrap/engine.rb +20 -0
  21. data/lib/devise_i18n_bootstrap/version.rb +3 -0
  22. data/lib/generators/devise/views/i18n_templates/i18n_templates_generator.rb +1 -1
  23. data/spec/controllers/home_controller_spec.rb +12 -0
  24. data/spec/devise_i18n_bootstrap_spec.rb +12 -0
  25. data/spec/dummy/app/controllers/application_controller.rb +5 -0
  26. data/spec/dummy/app/controllers/home_controller.rb +6 -0
  27. data/spec/dummy/app/helpers/application_helper.rb +2 -0
  28. data/spec/dummy/app/helpers/home_helper.rb +2 -0
  29. data/spec/dummy/app/models/user.rb +7 -0
  30. data/spec/dummy/config/application.rb +23 -0
  31. data/spec/dummy/config/boot.rb +5 -0
  32. data/spec/dummy/config/environment.rb +5 -0
  33. data/spec/dummy/config/environments/development.rb +38 -0
  34. data/spec/dummy/config/environments/production.rb +82 -0
  35. data/spec/dummy/config/environments/test.rb +40 -0
  36. data/spec/dummy/config/initializers/assets.rb +8 -0
  37. data/spec/dummy/config/initializers/backtrace_silencers.rb +7 -0
  38. data/spec/dummy/config/initializers/cookies_serializer.rb +3 -0
  39. data/spec/dummy/config/initializers/devise.rb +256 -0
  40. data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  41. data/spec/dummy/config/initializers/inflections.rb +16 -0
  42. data/spec/dummy/config/initializers/mime_types.rb +4 -0
  43. data/spec/dummy/config/initializers/session_store.rb +3 -0
  44. data/spec/dummy/config/initializers/simple_form.rb +165 -0
  45. data/spec/dummy/config/initializers/simple_form_bootstrap.rb +128 -0
  46. data/spec/dummy/config/initializers/wrap_parameters.rb +14 -0
  47. data/spec/dummy/config/routes.rb +60 -0
  48. data/spec/dummy/db/migrate/20140729100536_devise_create_users.rb +41 -0
  49. data/spec/dummy/db/schema.rb +43 -0
  50. data/spec/features/sessions_spec.rb +1 -0
  51. data/spec/spec_helper.rb +28 -0
  52. metadata +204 -21
  53. data/.document +0 -5
  54. data/.project +0 -12
  55. data/.rspec +0 -1
  56. data/Gemfile +0 -9
  57. data/Rakefile +0 -30
  58. data/VERSION +0 -1
  59. data/devise-i18n-bootstrap.gemspec +0 -95
  60. data/spec/devise-i18n-bootstrap_spec.rb +0 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e078d066df6a96d3d9118b67a33b4607bcc9880c
4
- data.tar.gz: 195754d35af3beb57151d5b38b7c5c68bb3071e9
3
+ metadata.gz: 9b2d0c05575c40afa5b3e69a77d9eb8998665bf6
4
+ data.tar.gz: 944ee0d5bffca55ded481e9ad9a66aeb99217821
5
5
  SHA512:
6
- metadata.gz: bf1e28348d13cd61608b36d47b3b1d8f251d9baf93673063fe44abffda67245305145f1b60276ad4756cddc82a00f297ea7b05047c48d0c6cf3e4bf6178face4
7
- data.tar.gz: 64d3202ebcd1cfc29ff4a0d18aebe0c0253f47cb2d85e5780d0808153b873b79fa0e9790e4075ed95fabd4dcd518a897646d860145356ce83613bab30e7277fe
6
+ metadata.gz: 653682fb64248caf9b7998f7e71ca34f466e48dd2d88ad833aff1cdfe83883841967da7ef6aa8298270f022e3145ecadbb2e0cecc4f03dd669f22fb595ed4ca3
7
+ data.tar.gz: 7f1ae631ab2949ace3fcd4dabf7ebf189ed58fb9d2d42a5df9aed55109ea604333df521967499747fe44705a6c1b9f38628db5dd124f4670bc5f7112220c1447
data/README.md CHANGED
@@ -1,6 +1,16 @@
1
1
  # devise-i18n-bootstrap
2
2
 
3
- It's forked from devise-i18n-views gem. This gem is under development. I18n support and translations for **[Devise v2.+](https://github.com/plataformatec/devise)** views.
3
+ <<<<<<< HEAD
4
+ [![Build Status](https://travis-ci.org/maximalink/devise-i18n-bootstrap.svg?branch=refactoring)](https://travis-ci.org/maximalink/devise-i18n-bootstrap)
5
+ [![Code Climate](https://codeclimate.com/github/maximalink/devise-i18n-bootstrap.png)](https://codeclimate.com/github/maximalink/devise-i18n-bootstrap)
6
+ [![Dependency Status](https://gemnasium.com/maximalink/devise-i18n-bootstrap.svg)](https://gemnasium.com/maximalink/devise-i18n-bootstrap)
7
+ =======
8
+ [![Build Status](https://travis-ci.org/nyjt/devise-i18n-bootstrap.svg?branch=refactoring)](https://travis-ci.org/nyjt/devise-i18n-bootstrap)
9
+ [![Code Climate](https://codeclimate.com/github/nyjt/devise-i18n-bootstrap.png)](https://codeclimate.com/github/nyjt/devise-i18n-bootstrap)
10
+ [![Dependency Status](https://gemnasium.com/nyjt/devise-i18n-bootstrap.svg)](https://gemnasium.com/nyjt/devise-i18n-bootstrap)
11
+ >>>>>>> c3a366cbb4ff07151da79bf1363f73351386b85b
12
+
13
+ It's forked from devise-i18n-views gem. This gem is under development. I18n support and translations for **[Devise v3.+](https://github.com/plataformatec/devise)** views.
4
14
 
5
15
  ## Install
6
16
 
@@ -28,6 +38,13 @@ The `devise:views:i18n_templates` generator will copy all views to your applicat
28
38
  rails g devise:views:i18n_templates
29
39
  ```
30
40
 
41
+ ## Horizontal login form in navbar
42
+
43
+ Using navbar login partial is very simple. You need to give devise resource name (like :user) and the partial generate login form in bootstrap navbar.
44
+ ```erb
45
+ <%= render partial: 'devise/sessions/navbar_new', locals: { resource: :user } %>
46
+ ```
47
+
31
48
  ## Contributing to devise-i18n-views
32
49
  ### with Localeapp
33
50
 
@@ -1,3 +1,3 @@
1
- <% ActiveSupport::Deprecation.warn "Rendering partials devise/_links.erb is deprecated" \
2
- "please use devise/shared/_links.erb instead."%>
3
- <%= render "shared/links" %>
1
+ <% ActiveSupport::Deprecation.warn 'Rendering partials devise/_links.erb is deprecated' \
2
+ 'please use devise/shared/_links.erb instead.'%>
3
+ <%= render 'shared/links' %>
@@ -1,12 +1,15 @@
1
- <h2><%= t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></h2>
1
+ <h2><%= t('.resend_confirmation_instructions', default: 'Resend confirmation instructions') %></h2>
2
2
 
3
- <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
4
- <%= devise_error_messages! %>
3
+ <%= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
4
+ <%= f.error_notification class: 'alert alert-danger' %>
5
5
 
6
- <div><%= f.label :email %><br />
7
- <%= f.email_field :email %></div>
6
+ <div class="form-inputs">
7
+ <%= f.input :email, autofocus: true, autocomplete: 'off', required: true %>
8
+ </div>
8
9
 
9
- <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></div>
10
+ <div class="form-actions">
11
+ <%= f.button :submit, t('.resend_confirmation_instructions', default: 'Resend confirmation instructions'), class: 'btn btn-primary' %>
12
+ </div>
10
13
  <% end %>
11
14
 
12
- <%= render "devise/shared/links" %>
15
+ <%= render 'devise/shared/links' %>
@@ -1,6 +1,8 @@
1
- <p><%= t('.greeting', :recipient => @resource.email, :default => "Welcome #{@resource.email}!") %></p>
1
+ <p><%= t('.greeting', recipient: @resource.email, default: "Welcome #{@resource.email}!") %></p>
2
2
 
3
- <p><%= t('.instruction', :default => "You can confirm your account email through the link below:") %></p>
3
+ <p><%= t('.instruction', default: 'You can confirm your account email through the link below:') %></p>
4
4
 
5
- <p><%= link_to t('.action', :default => "Confirm my account"),
6
- confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>
5
+ <p>
6
+ <%= link_to t('.action', default: 'Confirm my account'),
7
+ confirmation_url(@resource, confirmation_token: @token) %>
8
+ </p>
@@ -1,8 +1,8 @@
1
- <p><%= t('.greeting', :recipient => @resource.email, :default => "Hello #{@resource.email}!") %></p>
1
+ <p><%= t('.greeting', recipient: @resource.email, default: "Hello #{@resource.email}!") %></p>
2
2
 
3
- <p><%= t('.instruction', :default => "Someone has requested a link to change your password, and you can do this through the link below.") %></p>
3
+ <p><%= t('.instruction', default: 'Someone has requested a link to change your password, and you can do this through the link below.') %></p>
4
4
 
5
- <p><%= link_to t('.action', :default => "Change my password"), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
5
+ <p><%= link_to t('.action', default: 'Change my password'), edit_password_url(@resource, reset_password_token: @token) %></p>
6
6
 
7
- <p><%= t('.instruction_2', :default => "If you didn't request this, please ignore this email.") %></p>
8
- <p><%= t('.instruction_3', :default => "Your password won't change until you access the link above and create a new one.") %></p>
7
+ <p><%= t('.instruction_2', default: "If you didn't request this, please ignore this email.") %></p>
8
+ <p><%= t('.instruction_3', default: "Your password won't change until you access the link above and create a new one.") %></p>
@@ -1,7 +1,7 @@
1
- <p><%= t('.greeting', :recipient => @resource.email, :default => "Hello #{@resource.email}!") %></p>
1
+ <p><%= t('.greeting', recipient: @resource.email, default: "Hello #{@resource.email}!") %></p>
2
2
 
3
- <p><%= t('.message', :default => "Your account has been locked due to an excessive amount of unsuccessful sign in attempts.") %></p>
3
+ <p><%= t('.message', default: 'Your account has been locked due to an excessive amount of unsuccessful sign in attempts.') %></p>
4
4
 
5
- <p><%= t('.instruction', :default => "Click the link below to unlock your account:") %></p>
5
+ <p><%= t('.instruction', default: 'Click the link below to unlock your account:') %></p>
6
6
 
7
- <p><%= link_to t('.action', :default => "Unlock my account"), unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
7
+ <p><%= link_to t('.action', default: 'Unlock my account'), unlock_url(@resource, unlock_token: @token) %></p>
@@ -1,16 +1,17 @@
1
- <h2><%= t('.change_your_password', :default => 'Change your password') %></h2>
1
+ <h2><%= t('.change_your_password', default: 'Change your password') %></h2>
2
2
 
3
- <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
4
- <%= devise_error_messages! %>
3
+ <%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
4
+ <%= f.error_notification class: 'alert alert-danger' %>
5
5
  <%= f.hidden_field :reset_password_token %>
6
6
 
7
- <div><%= f.label :password, t('.new_password', :default => 'New password') %><br />
8
- <%= f.password_field :password %></div>
7
+ <div class="form-inputs">
8
+ <%= f.input :password, label: t('.new_password', default: 'New password'), autocomplete: 'off', autofocus: true, required: true %>
9
+ <%= f.input :password_confirmation, label: t('.confirm_new_password', default: 'Confirm new password'), autocomplete: 'off', required: true %>
10
+ </div>
9
11
 
10
- <div><%= f.label :password_confirmation, t('.confirm_new_password', :default => 'Confirm new password') %><br />
11
- <%= f.password_field :password_confirmation %></div>
12
-
13
- <div><%= f.submit t('.change_my_password', :default => 'Change my password') %></div>
12
+ <div class="form-actions">
13
+ <%= f.button :submit, t('.change_my_password', default: 'Change my password'), class: 'btn btn-primary' %>
14
+ </div>
14
15
  <% end %>
15
16
 
16
- <%= render "devise/shared/links" %>
17
+ <%= render 'devise/shared/links' %>
@@ -1,12 +1,15 @@
1
- <h2><%= t('.forgot_your_password', :default => 'Forgot your password?') %></h2>
1
+ <h2><%= t('.forgot_your_password', default: 'Forgot your password?') %></h2>
2
2
 
3
- <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
4
- <%= devise_error_messages! %>
3
+ <%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
4
+ <%= f.error_notification class: 'alert alert-danger' %>
5
5
 
6
- <div><%= f.label :email %><br />
7
- <%= f.email_field :email %></div>
6
+ <div class="form-inputs">
7
+ <%= f.input :email, autofocus: true, required: true %>
8
+ </div>
8
9
 
9
- <div><%= f.submit t('.send_me_reset_password_instructions', :default => "Send me reset password instructions") %></div>
10
+ <div class="form-actions">
11
+ <%= f.button :submit, t('.send_me_reset_password_instructions', default: 'Send me reset password instructions'), class: 'btn btn-primary' %>
12
+ </div>
10
13
  <% end %>
11
14
 
12
- <%= render "devise/shared/links" %>
15
+ <%= render 'devise/shared/links' %>
@@ -1,25 +1,33 @@
1
- <h2><%= t('.title', :resource => resource_class.model_name.human , :default => 'Edit #{resource_name.to_s.humanize}') %></h2>
1
+ <h2><%= t('.title', resource: resource_class.model_name.human , default: "Edit #{resource_name.to_s.humanize}") %></h2>
2
2
 
3
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
4
- <%= devise_error_messages! %>
3
+ <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
4
+ <%= f.error_notification class: 'alert alert-danger' %>
5
5
 
6
- <div><%= f.label :email %><br />
7
- <%= f.email_field :email %></div>
6
+ <div class="form-inputs">
7
+ <%= f.input :email, autofocus: true, required: true %>
8
8
 
9
- <div><%= f.label :password %> <i>(<%= t('.leave_blank_if_you_don_t_want_to_change_it', :default => "leave blank if you don't want to change it") %>)</i><br />
10
- <%= f.password_field :password, :autocomplete => "off" %></div>
9
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
10
+ <p><%= t('.currently_waiting_confirmation_for', default: 'Currently waiting confirmation for') %>: <%= resource.unconfirmed_email %></p>
11
+ <% end %>
11
12
 
12
- <div><%= f.label :password_confirmation %><br />
13
- <%= f.password_field :password_confirmation %></div>
13
+ <%= f.input :password, autocomplete: 'off', required: false, hint: t('.leave_blank_if_you_don_t_want_to_change_it', default: "leave blank if you don't want to change it") %>
14
+ <%= f.input :password_confirmation, autocomplete: 'off', required: false %>
15
+ <%= f.input :current_password, autocomplete: 'off', required: true, hint: t('.we_need_your_current_password_to_confirm_your_changes', default: 'we need your current password to confirm your changes') %>
16
+ </div>
14
17
 
15
- <div><%= f.label :current_password %> <i>(<%= t('.we_need_your_current_password_to_confirm_your_changes', :default => 'we need your current password to confirm your changes') %>)</i><br />
16
- <%= f.password_field :current_password %></div>
17
-
18
- <div><%= f.submit t('.update', :default => 'Update') %></div>
18
+ <div class="form-actions">
19
+ <%= f.button :submit, t('.update', default: 'Update'), class: 'btn btn-primary' %>
20
+ </div>
19
21
  <% end %>
20
22
 
21
- <h3><%= t('.cancel_my_account', :default => 'Cancel my account') %></h3>
23
+ <h3><%= t('.cancel_my_account', default: 'Cancel my account') %></h3>
22
24
 
23
- <p><%= t('.unhappy', :default => 'Unhappy') %>? <%= link_to t('.cancel_my_account', :default => 'Cancel my account'), registration_path(resource_name), :data => { :confirm => t('.are_you_sure', :default => "Are you sure?") }, :method => :delete %>.</p>
25
+ <p>
26
+ <%= t('.unhappy', default: 'Unhappy') %>?
27
+ <%= link_to t('.cancel_my_account', default: 'Cancel my account'),
28
+ registration_path(resource_name),
29
+ data: { confirm: t('.are_you_sure', default: 'Are you sure?') },
30
+ method: :delete %>.
31
+ </p>
24
32
 
25
- <%= link_to t('.back', :default => 'Back'), :back %>
33
+ <%= link_to t('.back', default: 'Back'), back %>
@@ -1,18 +1,17 @@
1
- <h2><%= t('.sign_up', :default => 'Sign up') %></h2>
1
+ <h2><%= t('.sign_up', default: 'Sign up') %></h2>
2
2
 
3
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
4
- <%= devise_error_messages! %>
3
+ <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
4
+ <%= f.error_notification class: 'alert alert-danger' %>
5
5
 
6
- <div><%= f.label :email %><br />
7
- <%= f.email_field :email %></div>
6
+ <div class="form-inputs">
7
+ <%= f.input :email, autofocus: true, autocomplete: 'off', required: true %>
8
+ <%= f.input :password, autocomplete: 'off', required: true %>
9
+ <%= f.input :password_confirmation, autocomplete: 'off' %>
10
+ </div>
8
11
 
9
- <div><%= f.label :password %><br />
10
- <%= f.password_field :password %></div>
11
-
12
- <div><%= f.label :password_confirmation %><br />
13
- <%= f.password_field :password_confirmation %></div>
14
-
15
- <div><%= f.submit t('.sign_up', :default => 'Sign up') %></div>
12
+ <div class="form-actions">
13
+ <%= f.button :submit, t('.sign_up', default: 'Sign up'), class: 'btn btn-primary'%>
14
+ </div>
16
15
  <% end %>
17
16
 
18
- <%= render "devise/shared/links" %>
17
+ <%= render 'devise/shared/links' %>
@@ -0,0 +1,18 @@
1
+ <div class="container-fluid">
2
+ <%= simple_form_for(resource, url: session_path(resource), html: { class: 'form-inline navigation-form', id: 'login' }) do |f| %>
3
+ <div class="row">
4
+ <div class="col-md-4"><%= f.input :email, label: false, placeholder: I18n.t('.email', default: 'Email') %></div>
5
+ <div class="col-md-4"><%= f.input :password, label: false, placeholder: I18n.t('.password', default: 'Password') %></div>
6
+ <div class="col-md-4"><%= f.submit t('.sign_in', default: 'Sign in'), class: 'btn btn-primary' %></div>
7
+ </div>
8
+ <div class="row">
9
+ <div class="col-md-4"><%= f.input :remember_me, label: t('.remember_me', default: 'Remember me'), as: :boolean, boolean_style: :inline, wrapper_class: 'checkbox-inline', required: false %></div>
10
+ <div class="col-md-4"><%= link_to t('.forgot_your_password', default: 'Forgot your password?'), new_password_path(resource) %></div>
11
+ <div class="col-md-4">
12
+ <%- if Devise.mappings[resource].registerable? && controller_name != 'registrations' %>
13
+ <%= link_to t('.sign_up', default: 'Sign up'), new_registration_path(resource) %><br />
14
+ <% end -%>
15
+ </div>
16
+ </div>
17
+ <% end %>
18
+ </div>
@@ -1,17 +1,15 @@
1
- <h2><%= t('.sign_in', :default => "Sign in") %></h2>
2
-
3
- <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
4
- <div><%= f.label :email %><br />
5
- <%= f.email_field :email %></div>
6
-
7
- <div><%= f.label :password %><br />
8
- <%= f.password_field :password %></div>
9
-
10
- <% if devise_mapping.rememberable? -%>
11
- <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
12
- <% end -%>
13
-
14
- <div><%= f.submit t('.sign_in', :default => "Sign in") %></div>
1
+ <h2><%= t('.sign_in', default: 'Sign in') %></h2>
2
+
3
+ <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
4
+ <div class="form-inputs">
5
+ <%= f.input :email, autofocus: true, required: true %>
6
+ <%= f.input :password, required: true %>
7
+ <%= f.input :remember_me, as: :boolean, boolean_style: :inline, wrapper_class: 'checkbox-inline' if devise_mapping.rememberable? %>
8
+ </div>
9
+
10
+ <div class="form-actions">
11
+ <%= f.button :submit, t('.sign_in', default: 'Sign in'), class: 'btn btn-primary' %>
12
+ </div>
15
13
  <% end %>
16
14
 
17
- <%= render "devise/shared/links" %>
15
+ <%= render 'devise/shared/links' %>
@@ -1,25 +1,25 @@
1
1
  <%- if controller_name != 'sessions' %>
2
- <%= link_to t(".sign_in", :default => "Sign in"), new_session_path(resource_name) %><br />
2
+ <%= link_to t('.sign_in', default: 'Sign in'), new_session_path(resource_name) %><br />
3
3
  <% end -%>
4
4
 
5
5
  <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
6
- <%= link_to t(".sign_up", :default => "Sign up"), new_registration_path(resource_name) %><br />
6
+ <%= link_to t('.sign_up', default: 'Sign up'), new_registration_path(resource_name) %><br />
7
7
  <% end -%>
8
8
 
9
9
  <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
10
- <%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %><br />
10
+ <%= link_to t('.forgot_your_password', default: 'Forgot your password?'), new_password_path(resource_name) %><br />
11
11
  <% end -%>
12
12
 
13
13
  <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
14
- <%= link_to t('.didn_t_receive_confirmation_instructions', :default => "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %><br />
14
+ <%= link_to t('.didn_t_receive_confirmation_instructions', default: "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %><br />
15
15
  <% end -%>
16
16
 
17
17
  <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
18
- <%= link_to t('.didn_t_receive_unlock_instructions', :default => "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %><br />
18
+ <%= link_to t('.didn_t_receive_unlock_instructions', default: "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %><br />
19
19
  <% end -%>
20
20
 
21
21
  <%- if devise_mapping.omniauthable? %>
22
22
  <%- resource_class.omniauth_providers.each do |provider| %>
23
- <%= link_to t('.sign_in_with_provider', :provider => provider.to_s.titleize, :default => "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider) %><br />
23
+ <%= link_to t('.sign_in_with_provider', provider: provider.to_s.titleize, default: "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider) %><br />
24
24
  <% end -%>
25
25
  <% end -%>
@@ -1,12 +1,16 @@
1
- <h2><%= t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></h2>
1
+ <h2><%= t('.resend_unlock_instructions', default: 'Resend unlock instructions') %></h2>
2
2
 
3
- <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
4
- <%= devise_error_messages! %>
3
+ <%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
4
+ <%= f.error_notification class: 'alert alert-danger' %>
5
+ <%= f.full_error :unlock_token %>
5
6
 
6
- <div><%= f.label :email %><br />
7
- <%= f.email_field :email %></div>
7
+ <div class="form-inputs">
8
+ <%= f.input :email, autofocus: true, required: true %>
9
+ </div>
8
10
 
9
- <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></div>
11
+ <div class="form-actions">
12
+ <%= f.button :submit, t('.resend_unlock_instructions', default: 'Resend unlock instructions') %>
13
+ </div>
10
14
  <% end %>
11
15
 
12
- <%= render "devise/shared/links" %>
16
+ <%= render 'devise/shared/links' %>
@@ -3,9 +3,9 @@ de:
3
3
  confirmations:
4
4
  new:
5
5
  resend_confirmation_instructions: Anleitung zur Bestätigung noch mal schicken
6
- confirmed: Ihre Konto wurde erfolgreich bestätigt.
7
- send_instructions: Sie erhalten ein wenigen Minuten eine E-Mail mit Anweisungen, wie Sie Ihr Konto bestätigen.
8
- send_paranoid_instructions: Falls Ihre E-Mail-Adresse in unserer Datenbank existiert, werden Sie in wenigen Minuten eine E-Mail mit Anweisungen erhalten, wie Sie Ihr Konto bestätigen.
6
+ confirmed: Ihre Konto wurde erfolgreich bestätigt.
7
+ send_instructions: Sie erhalten ein wenigen Minuten eine E-Mail mit Anweisungen, wie Sie Ihr Konto bestätigen.
8
+ send_paranoid_instructions: Falls Ihre E-Mail-Adresse in unserer Datenbank existiert, werden Sie in wenigen Minuten eine E-Mail mit Anweisungen erhalten, wie Sie Ihr Konto bestätigen.
9
9
  failure:
10
10
  already_authenticated: "Sie sind schon angemeldet."
11
11
  inactive: "Ihr Konto ist noch nicht aktiviert."
@@ -58,9 +58,11 @@ en:
58
58
  cancel_my_account: "Cancel my account"
59
59
  leave_blank_if_you_don_t_want_to_change_it: "leave blank if you dont want to change it"
60
60
  title: "Edit %{resource}"
61
+ currently_waiting_confirmation_for: 'Currently waiting confirmation for'
61
62
  we_need_your_current_password_to_confirm_your_changes: "we need your current password to confirm your changes"
62
63
  update: "Update"
63
64
  unhappy: "Unhappy"
65
+ back: 'Back'
64
66
  new:
65
67
  sign_up: "Sign up"
66
68
  destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
@@ -75,6 +77,13 @@ en:
75
77
  signed_out: "Signed out successfully."
76
78
  new:
77
79
  sign_in: "Sign in"
80
+ navbar_new:
81
+ sign_in: 'Sign in'
82
+ sign_up: 'Sign up'
83
+ email: 'Email'
84
+ password: 'Password'
85
+ forgot_your_password: 'Forgot your password?'
86
+ remember_me: 'Remember me'
78
87
  shared:
79
88
  links:
80
89
  didn_t_receive_confirmation_instructions: "Didn't receive confirmation instructions?"
@@ -107,4 +116,4 @@ en:
107
116
  current_sign_in_at: "Signed in at"
108
117
  email: "Email"
109
118
  password: "Password"
110
- last_sign_in_at: "Last signed in at"
119
+ last_sign_in_at: "Last signed in at"
@@ -2,13 +2,26 @@ hu:
2
2
  devise:
3
3
  confirmations:
4
4
  new:
5
- resend_confirmation_instructions: Megerősítő levél újraküldése
5
+ resend_confirmation_instructions: "Aktiváláshoz szükséges levél újraküldése"
6
+ confirmed: "A felhasználói fiók aktiválása megtörtént."
7
+ send_instructions: "Egy levelet küldtünk a megadott e-mail címre. Ebben leírjuk hogyan lehet aktiválni a felhasználói fiókot."
8
+ send_paranoid_instructions: "Ha a megadott e-mailcím megtalálható a rendszerben, akkor néhány percen belül kiküldjük rá a tudnivalókat a felhasználói fiók aktiválásáról."
9
+ failure:
10
+ already_authenticated: "A bejelentkezés már korábban megtörtént."
11
+ inactive: "A felhasználói fiók még nincs aktiválva."
12
+ invalid: "Helytelen e-mail vagy jelszó."
13
+ invalid_token: "Érvénytelen azonosító."
14
+ locked: "Ezt a felhasználói fiókot a rendszer zárolta."
15
+ not_found_in_database: "Helytelen e-mail vagy jelszó."
16
+ timeout: "Inaktivitás miatt az automatikus kijelentkezés megtörtént. A folytatáshoz ismételt bejelentkezés szükséges."
17
+ unauthenticated: "A folytatáshoz bejelntkezés vagy regisztráció szükséges."
18
+ unconfirmed: "A folytatáshoz a felhasználói fiók aktiválása szükséges."
6
19
  mailer:
7
20
  confirmation_instructions:
8
- action: Fiók megerősítése
9
- greeting: Kedves %{reciipient}!
10
- instruction: ! 'A fiók megerősítéséhez kell kattintani az alábbi linkre:'
11
- subject: A fiók megerősítéséhez szükséges teendők
21
+ action: "Felhasználói fiók aktiválása"
22
+ greeting: "Kedves %{recipient}!"
23
+ instruction: ! "A fiók aktiválása a következő link segítségével lehetséges:"
24
+ subject: "Felhasználói fiók aktiválása"
12
25
  reset_password_instructions:
13
26
  action: Jelszó megváltoztatása
14
27
  greeting: Kedves %{recipient}!
@@ -22,30 +35,55 @@ hu:
22
35
  instruction: ! 'A zárolás feloldásához az alábbi linkre kell kattintani:'
23
36
  message: A felhasználói fiókja zárolva lett túl sok sikertelen belépési kísérlet miatt.
24
37
  subject: Fiókzárolás feloldásához szükséges teendők
38
+ omniauth_callbacks:
39
+ failure: "Az bejelentkezés %{kind} fiókkal nem sikerült: \"%{reason}\"."
40
+ success: "Sikeres bejelentkezés %{kind} fiókkal."
25
41
  passwords:
26
42
  new:
27
- forgot_your_password: Elfelejtette a jelszavát?
43
+ forgot_your_password: "Elfelejtett jelszó?"
28
44
  send_me_reset_password_instructions: Jelszóviszaállítási teendők küldése
29
45
  edit:
30
46
  change_your_password: Jelszó megváltoztatása
31
47
  new_password: Új jelszó
32
48
  confirm_new_password: Jelszó megerősítése
33
49
  change_my_password: Jelszó megváltoztatása
50
+ no_token: "Ez az oldal csak egy jelszó helyreállító e-mailben kapott linkről tekinthető meg. Ha így jutott el erre az oldalra, ellenőríze, hogy a teljes URL meg van-e adva."
51
+ send_instructions: "Hamarosan e-mailt küldünk arról, hogyan lehet új jelszót igényelni."
52
+ send_paranoid_instructions: "Ha az e-mail cím az adatbázisban volt, hamarosan e-mailt küldünk arról, hogyan lehet új jelszót igényelni."
53
+ updated: "A jelszó megváltoztatása sikeres volt. A bejelentkezés megtörtént."
54
+ updated_not_active: "A jelszó megváltoztatása sikerült."
34
55
  registrations:
35
56
  edit:
36
57
  are_you_sure: Biztos benne?
37
58
  cancel_my_account: Fiók megszüntetése
38
59
  leave_blank_if_you_don_t_want_to_change_it: csak változás esetén kitöltendő
39
60
  title: "%{resource} módosítása"
61
+ currently_waiting_confirmation_for: 'Jelenleg aktiválásra vár'
40
62
  we_need_your_current_password_to_confirm_your_changes: a változtatás végrehajtásához szükséges a jelenlegi jelszó
41
63
  update: Módosítás
42
- cancel_my_account: Fiók megszüntetése
43
- unhappy: Szomorú
64
+ unhappy: Elégedetlen?
65
+ back: 'Vissza'
44
66
  new:
45
67
  sign_up: Regisztráció
68
+ destroyed: "A felhasználói fiókot töröltük. Reméljük hamarosan ismét felhasználóink közt köszönthetjük."
69
+ signed_up: "Sikeres regisztráció."
70
+ signed_up_but_inactive: "A regisztráció siekres volt. Azonban a bejelntkezés csak a felhasználói fiók aktiálása után lehetséges."
71
+ signed_up_but_locked: "A regisztráció sikeres volt. Azonban a felhasználói fiók jelenleg még zárolva van."
72
+ signed_up_but_unconfirmed: "Az aktiválásról szóló tudnivalókat elküldtük a megadott e-mail címre. Az e-mailben található linkre kattintva aktiválható az új felhasználó fiók."
73
+ update_needs_confirmation: "A felhasználói fiók módosítása sikeres volt, de az e-mail cím megváltoztatásához megerősítő e-mail küldtünk ki rá. A linkre kattintva lesz csak aktív az új e-mail cím."
74
+ updated: "A felhasználói fiók módosítása sikeres volt."
46
75
  sessions:
76
+ signed_in: "A bejelentkezés sikerült."
77
+ signed_out: "A kijelentkezés sikerült."
47
78
  new:
48
- sign_in: Belépés
79
+ sign_in: "Bejelentkezés"
80
+ navbar_new:
81
+ sign_in: 'Bejelentkezés'
82
+ sign_up: 'Regisztráció'
83
+ email: 'E-mail'
84
+ password: 'Jelszó'
85
+ forgot_your_password: 'Elfelejtett jelszó'
86
+ remember_me: 'Maradjak belépve'
49
87
  shared:
50
88
  links:
51
89
  didn_t_receive_confirmation_instructions: Nem kapta meg a megerősítő levelet?
@@ -56,4 +94,26 @@ hu:
56
94
  sign_up: Regisztráció
57
95
  unlocks:
58
96
  new:
59
- resend_unlock_instructions: Feloldási teendők újraküldése
97
+ resend_unlock_instructions: Tudnivalók küldése a zárolás megszüntetéséről
98
+ send_instructions: "E-mailt küldtünk arról, hogyan lehet a felhasználói fiók zárolását megszüntetni."
99
+ send_paranoid_instructions: "Ha a megadott felhasználói fiók létezik, akkor e-mailt küldtünk arról, hogyan lehet a felhasználói fiók zárolását megszüntetni."
100
+ unlocked: "A felhasználói fiók sikeresen újra lett engedélyezve. A folytatáshoz bejelentkezés szükséges."
101
+ errors:
102
+ messages:
103
+ already_confirmed: "már aktiválva van, csak be kell jelentkezni vele"
104
+ confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
105
+ expired: "már lejárt, újat kell igényelni"
106
+ not_found: "nem található"
107
+ not_locked: "nem volt zárolva"
108
+ not_saved:
109
+ one: "Nem menthető %{resource} 1 hiba miatt:"
110
+ other: "Nem menthető %{resource} %{count} hiba miatt:"
111
+ activerecord:
112
+ models:
113
+ user: "Felhasználó"
114
+ attributes:
115
+ user:
116
+ current_sign_in_at: "Bejelentkezés időpontja"
117
+ email: "E-mail"
118
+ password: "Jelszó"
119
+ last_sign_in_at: "Legutóbbi bejelentkezés időpontja"