Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

s/adress/ad*d*ress/

Browse Source
This commit is contained in:
jomo
2014-06-30 23:48:11 +02:00
parent d50c674664
commit 0714c54e5b
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@@ -281,7 +281,7 @@ class UsersController < ApplicationController
render action: "lost_password"
end
else
flash[:alert] = "Token or Email adress invalid!"
flash[:alert] = "Token or Email address invalid!"
render action: "lost_password"
end
end

2
app/models/user.rb
View File

@@ -18,7 +18,7 @@ class User < ActiveRecord::Base
validates_length_of :about, maximum: 5000
validates_length_of :ign, minimum: 1, maximum: 16
validates :email, uniqueness: {case_sensitive: false}, format: {with: /\A.+@(.+\..{2,}|\[[0-9a-f:.]+\])\z/i, message: "That doesn't look like an email adress."}
validates :email, uniqueness: {case_sensitive: false}, format: {with: /\A.+@(.+\..{2,}|\[[0-9a-f:.]+\])\z/i, message: "That doesn't look like an email address."}
validates :ign, uniqueness: {case_sensitive: false}, format: {with: /\A[a-z\d_]+\z/i, message: "Username is invalid (a-z, 0-9, _)."}
validate :account_exists?, :if => lambda {|user| user.ign_changed? }

4
app/views/users/edit.html.erb
View File

@@ -28,7 +28,7 @@
</td>
</tr>
<tr>
<td>Confirmed email adress</td>
<td>Confirmed email address</td>
<td>
<%= f.select :confirmed, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %>
</td>
@@ -76,7 +76,7 @@
<% if !@user.confirmed? %>
<% if @user.is?(current_user) %>
<span class='red-alert'>Please confirm your email adress first!</span>
<span class='red-alert'>Please confirm your email address first!</span>
<% else %>
<span class='red-alert'>This user has not confirmed his email!</span>
<% end %>

4
app/views/users/lost_password.html.erb
View File

@@ -2,12 +2,12 @@
<h1>Reset password</h1>
<p>You lost your password? Don't do that!</p>
<p>Luckily for you, you can reset your password. Please use the command <code>/gettoken &lt;your email adress&gt;</code>, then fill in the form below:</p>
<p>Luckily for you, you can reset your password. Please use the command <code>/gettoken &lt;your email address&gt;</code>, then fill in the form below:</p>
<%= form_tag reset_password_users_path do |f| %>
<table>
<tr>
<td><%= label_tag :email %></td>
<td><%= text_field_tag :email, nil, placeholder: "steve@example.com", required: true, pattern: ".+@.+", title: "enter valid email adress", "x-moz-errormessage" => "enter valid email adress" %></td>
<td><%= text_field_tag :email, nil, placeholder: "steve@example.com", required: true, pattern: ".+@.+", title: "enter valid email address", "x-moz-errormessage" => "enter valid email address" %></td>
</tr>
<tr>
<td><%= label_tag :secret_token %></td>

2
app/views/users/new.html.erb
View File

@@ -16,7 +16,7 @@
</tr>
<tr>
<td><%= f.label :email, "Email" %></td>
<td><%= f.email_field :email, placeholder: "steve@example.com", required: true, pattern: ".+@.+", title: "enter valid email adress", "x-moz-errormessage" => "enter valid email adress" %></td>
<td><%= f.email_field :email, placeholder: "steve@example.com", required: true, pattern: ".+@.+", title: "enter valid email address", "x-moz-errormessage" => "enter valid email address" %></td>
</tr>
<tr>
<td><%= f.label :registration_token, "Token" %></td>