zh.yml
This commit is contained in:
parent
cdbc26e8df
commit
ae8e81fd46
|
@ -60,11 +60,11 @@ class MemosController < ApplicationController
|
|||
end
|
||||
@forum.save
|
||||
|
||||
format.html { redirect_to forum_memo_path(@memo.forum_id, @back_memo_id), notice: 'Memo was successfully created.' }
|
||||
format.html { redirect_to forum_memo_path(@memo.forum_id, @back_memo_id), notice: "#{l :label_memo_create_succ}" }
|
||||
format.json { render json: @memo, status: :created, location: @memo }
|
||||
else
|
||||
back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
|
||||
format.html { redirect_to back_error_page, notice: 'Memo was failed created.' }
|
||||
format.html { redirect_to back_error_page, notice: "#{l :label_memo_create_fail}" }
|
||||
format.json { render json: @memo.errors, status: :unprocessable_entity }
|
||||
end
|
||||
end
|
||||
|
@ -104,7 +104,7 @@ class MemosController < ApplicationController
|
|||
if(@memo.update_attribute(:subject, params[:memo][:subject]) &&
|
||||
@memo.update_attribute(:content, params[:memo][:content]))
|
||||
respond_to do |format|
|
||||
format.html {redirect_to forum_memo_path(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)), notice: 'Memo was successfully updated.'}
|
||||
format.html {redirect_to forum_memo_path(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)), notice: "#{l :label_memo_create_succ}"}
|
||||
#format.html redirect_to forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)), notice: 'Memo was successfully updated.'
|
||||
end
|
||||
else
|
||||
|
|
|
@ -15,6 +15,6 @@
|
|||
<div class="actions">
|
||||
<p><%= f.text_field :name, :required => true %></p>
|
||||
<p><%= f.text_field :description, :required => true, :size => 80 %></p>
|
||||
<%= f.submit %>
|
||||
<%= f.submit :value => (l :label_board_new) %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<!-- added by fq -->
|
||||
<h1>New forum</h1>
|
||||
<h1><%= l :label_board_new%></h1>
|
||||
|
||||
<%= render 'form' %>
|
||||
|
||||
<%= link_to 'Back', forums_path %>
|
||||
<%= link_to l :button_back, forums_path %>
|
||||
|
|
|
@ -1726,7 +1726,8 @@ zh:
|
|||
|
||||
label_newbie_faq: '新手指引 & 问答'
|
||||
label_hot_project: '热门项目'
|
||||
label_memo_create_succ: 回复成功
|
||||
label_memo_create_succ: 发布成功
|
||||
label_memo_create_fail: 发布失败
|
||||
label_memo_create: 发布
|
||||
label_memo_new: 新建主题
|
||||
label_memo_edit: 修改主题
|
||||
|
|
Loading…
Reference in New Issue