From fbfbc0cdeba842f9d0a802d7c38725c1e4995cf4 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 30 Dec 2016 21:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=90=A7=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/memos_controller.rb            | 2 +-
 app/views/forums/show.html.erb                 | 2 +-
 app/views/layouts/_base_footer_public.html.erb | 4 ++--
 app/views/layouts/_footer.html.erb             | 2 +-
 app/views/layouts/_logined_header.html.erb     | 2 +-
 app/views/layouts/_org_custom_footer.html.erb  | 2 +-
 app/views/layouts/base_org.html.erb            | 2 +-
 app/views/layouts/base_org_newstyle.html.erb   | 2 +-
 app/views/layouts/base_organization.html.erb   | 2 +-
 config/locales/zh.yml                          | 2 +-
 config/routes.rb                               | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

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 @@
   <div class="homepageLeft-new" id="forum_right_bar">
     <div class="wenba-rightbar">
       <div class="wenba-rightbar-top clearfix">
-        <h3 class="fl ml10">推荐问吧</h3>
+        <h3 class="fl ml10">推荐贴吧</h3>
       </div>
       <%= render :partial => "forums/right_bar" %>
     </div>
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? %>
       <li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <% end %>
-      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
-      <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
+      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
         <select class="languageBox">
           <option value="Chinese" selected="selected">中文</option>
           <option value="English">英文</option>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index b3aa6a805..345aa40f8 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -8,7 +8,7 @@
       <% if hidden_unproject_infos && !memo.nil? %>
           <li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <% end %>
-      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
+      <li class="fl"><a href="<%= forums_path %>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
 
     </ul>
   </div>
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? %>
               <li class="navHomepageMenu fl mr20">
-                <%= link_to "贴吧", forums_path, :class =>"c_white f16 db p10", :target => "_blank" %>
+                <%= link_to "问吧", forums_path, :class =>"c_white f16 db p10", :target => "_blank" %>
               </li>
           <% 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? %>
     <li ><a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="" >帮助中心<span>|</span></a></li>
     <% end %>
-    <li ><a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="" > 贴吧交流</a></li>
+    <li ><a href="<%= forums_path %>" target="_blank" class="" > 问吧交流</a></li>
     <div class="cl"></div>
   </ul>
   <p>Copyright 2007~2016, All Rights Reserved     湘ICP备09019772</p>
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 644e99126..a422dd780 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -156,7 +156,7 @@
       <% unless memo.nil? %>
       <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
       <% end %>
-      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
+      <li class="fl"><a href="<%= forums_path %>" class="f_grey mw20" target="_blank">问吧交流</a></li>
     </ul>
   </div>
   <div class="cl"></div>
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index b68b226d6..1b5cea835 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -410,7 +410,7 @@
         <% unless memo.nil? %>
         <li><a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="fl">帮助中心</a></li>
         <% end %>
-        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="fl"> 贴吧交流</a></li>
+        <li><a href="<%= forums_path %>" target="_blank" class="fl"> 问吧交流</a></li>
       </ul>
       <div class="cl"></div>
       <p>Copyright 2007~2016  All Rights Reserved<br>湘ICP备09019772</p>
diff --git a/app/views/layouts/base_organization.html.erb b/app/views/layouts/base_organization.html.erb
index b4b1fa52e..31394265d 100644
--- a/app/views/layouts/base_organization.html.erb
+++ b/app/views/layouts/base_organization.html.erb
@@ -110,7 +110,7 @@
       <% unless memo.nil? %>
       <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
       <% end %>
-      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
+      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">问吧交流</a></li>
     </ul>
   </div>
   <div class="cl"></div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 7412ac071..d4e1475b2 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2135,7 +2135,7 @@ zh:
   label_recruitment_information: 招聘信息
   label_surpport_group: 帮助中心
   #label_forums: 论坛反馈
-  label_forums: 贴吧交流
+  label_forums: 问吧交流
   label_language: 语言
   label_license: 湘ICP备09019772
   label_org_name: 组织名称：
diff --git a/config/routes.rb b/config/routes.rb
index 8b53d9b4b..952ee65f9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -458,7 +458,7 @@ RedmineApp::Application.routes.draw do
       post 'create_memo'
       post 'create_feedback'
       post 'mail_feedback'
- 	  post 'update_memo_description'
+ 	    post 'update_memo_description'
       match 'search_memo', :via => [:get, :post]
       match 'delete_forum_tag',:via =>[:get]
       match 'add_forum_tag',:via=>[:get]