From a52e057d94bc9e974ea4fe7f0370b02eeced3047 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Wed, 16 Apr 2014 21:44:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E4=B8=8D=E8=83=BD=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/contests_controller.rb | 6 +++--- config/locales/zh.yml | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb index 86c4df36..2c09a880 100644 --- a/app/controllers/contests_controller.rb +++ b/app/controllers/contests_controller.rb @@ -300,13 +300,13 @@ class ContestsController < ApplicationController contest_message = params[:contest_for_save][:contest_message] if ContestingSoftapplication.where("softapplication_id = ? and contest_id = ?", softapplication.id, @contest.id).size == 0 if ContestingSoftapplication.create_softapplication_contesting(@contest.id, softapplication.id, contest_message) - flash.now[:notice] = l(:label_bidding_contest_succeed) + flash.now[:notice] = l(:label_release_add_contest_succeed) end else - flash.now[:error] = l(:label_bidding_fail) + flash.now[:error] = l(:label_add_contest_succeed_fail) end - @contesting_softapplication = @contest.contesting_softapplications + @contesting_softapplication = paginateHelper @contest.contesting_softapplications respond_to do |format| diff --git a/config/locales/zh.yml b/config/locales/zh.yml index a483f32d..2b188338 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1847,5 +1847,8 @@ zh: label_tags_contest: 竞赛标签 label_tags_contest: 竞赛名称 label_tags_contest_description: 竞赛描述 + label_release_add_contest_succeed: 该应用发布并添加成功. + label_add_contest_succeed_fail: 添加失败,该应用已参赛. + \ No newline at end of file