Skip to content
Browse files

Fix some warnings, bad merged code

  • Loading branch information...
1 parent 770549c commit 9828f9e51ff3d93cd85fa5a4163152496e658f81 @courtenay courtenay committed Aug 6, 2009
Showing with 5 additions and 3 deletions.
  1. +2 −2 app/controllers/sessions_controller.rb
  2. +3 −1 app/views/posts/edit.html.erb
View
4 app/controllers/sessions_controller.rb
@@ -32,7 +32,7 @@ def password_authentication(name, password)
if @current_user = current_site.users.authenticate(name, password)
successful_login
else
- failed_login I18n.t 'txt.invalid_login', :default => "Invalid login"
+ failed_login I18n.t('txt.invalid_login', :default => "Invalid login")
end
end
@@ -52,7 +52,7 @@ def open_id_authentication(openid_url)
end
successful_login
else
- failed_login I18n.t 'txt.invalid_openid', :default => "Sorry, no user by the identity URL #{openid_url} exists"
+ failed_login I18n.t('txt.invalid_openid', :default => "Sorry, no user by the identity URL #{openid_url} exists")
end
else
failed_login result.message
View
4 app/views/posts/edit.html.erb
@@ -9,5 +9,7 @@
<% form_for :post, :html => { :method => :put },
:url => forum_topic_post_path(@post.forum, @post.topic, @post, :page => current_page) do |f| -%>
<p id="post_body"><%= f.text_area :body %></p>
-<%= submit_tag I18n.t('txt.views_posts.save', :default => 'Save post') %> <%= I18n.t 'txt.or', :default => 'or' %> <%= link_to link_to(I18n.t('txt.cancel', :default => 'cancel'), forum_topic_path(@post.forum, @post.topic, :page => current_page) %>
+<p><%= submit_tag I18n.t('txt.views_posts.save', :default => 'Save post') %>
+ <%= I18n.t 'txt.or', :default => 'or' %>
+ <%= link_to I18n.t('txt.cancel', :default => 'cancel'), forum_topic_path(@post.forum, @post.topic, :page => current_page) %></p>
<% end -%>

0 comments on commit 9828f9e

Please sign in to comment.
Something went wrong with that request. Please try again.