diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index 9c41f91d6..d3de11177 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -1,5 +1,7 @@ # added by fq class ForumsController < ApplicationController + layout "users_base" + # GET /forums # GET /forums.json before_filter :find_forum_if_available @@ -143,9 +145,10 @@ class ForumsController < ApplicationController respond_to do |format| if @forum.update_attributes(params[:forum]) - format.html { redirect_to @forum, notice: 'Forum was successfully updated.' } + format.html { redirect_to @forum, notice: l(:label_forum_update_succ) } format.json { head :no_content } else + flash.now[:error] = "#{l :label_forum_update_fail}: #{@forum.errors.full_messages[0]}" format.html { render action: "edit" } format.json { render json: @forum.errors, status: :unprocessable_entity } end diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 52cc04000..3b0c49029 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1918,6 +1918,8 @@ zh: label_memo_create_fail: 发布失败 label_forum_create_succ: 贴吧新建成功 label_forum_create_fail: 贴吧新建失败 + label_forum_update_succ: 贴吧更新成功 + label_forum_update_fail: 贴吧更新失败 label_first_page_create_fail: 首页定制失败 label_forum_edit: 编辑讨论区 label_memo_create: 发布