diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index 25b12e52a..cb9b886e2 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -72,7 +72,7 @@ class MemosController < ApplicationController
end
end
format.js
- format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
+ format.html { redirect_to back_memo_url }
format.json { render json: @memo, status: :created, location: @memo }
else
flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index d07a42ed5..1f0cea922 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -29,7 +29,7 @@
-
推荐问吧
+ 推荐贴吧
<%= render :partial => "forums/right_bar" %>
diff --git a/app/views/layouts/_base_footer_public.html.erb b/app/views/layouts/_base_footer_public.html.erb
index 043c254e2..2cec0fc27 100644
--- a/app/views/layouts/_base_footer_public.html.erb
+++ b/app/views/layouts/_base_footer_public.html.erb
@@ -8,8 +8,8 @@
<% unless memo.nil? %>
<%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|
<% end %>
-
<%= l(:label_forums)%>|
-
<%= l(:label_language)%>
+ <%= l(:label_forums)%>|
+
<%= l(:label_language)%>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 29fa421cc..1d6d8f0f1 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -26,7 +26,7 @@
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<% end %>
<% else %>
diff --git a/app/views/layouts/_org_custom_footer.html.erb b/app/views/layouts/_org_custom_footer.html.erb
index ffaa22fd7..0fce573e2 100644
--- a/app/views/layouts/_org_custom_footer.html.erb
+++ b/app/views/layouts/_org_custom_footer.html.erb
@@ -6,7 +6,7 @@
<% unless memo.nil? %>