修改了部分国际化
This commit is contained in:
parent
0206d3f2c3
commit
ecdeaf123e
|
@ -466,7 +466,7 @@ class BidsController < ApplicationController
|
|||
end
|
||||
# Replaces pre blocks with [...]
|
||||
text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
|
||||
@content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> "
|
||||
@content = "> #{ll(User.current.language, :text_user_wrote, user)}\n> "
|
||||
@content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
|
||||
@id = user.id
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
|
|
|
@ -71,7 +71,7 @@ class WordsController < ApplicationController
|
|||
end
|
||||
# Replaces pre blocks with [...]
|
||||
text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
|
||||
@content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> "
|
||||
@content = "> #{ll(User.current.language, :text_user_wrote, user)}\n> "
|
||||
@content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
|
||||
|
||||
# @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
<% if get_prize(b_project).nil? or get_prize(b_project) == "" %>
|
||||
<% if @bid.deadline < Date.today %>
|
||||
未评奖
|
||||
<%= l(:label_noawards)%>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<% case @bid.reward_type %>
|
||||
|
|
|
@ -9,7 +9,9 @@
|
|||
<td valign="center"><% if User.current.logged? %>
|
||||
|
||||
<!-- <div class='icon icon-add'> -->
|
||||
<% if User.current.user_extensions.identity == 0 %>
|
||||
<%= link_to(l(:label_newtype_contest), {:controller => 'bids', :action => 'new_contest'}, :class => 'icon icon-add') %>
|
||||
<% end %>
|
||||
<!-- <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %> -->
|
||||
<!-- </div> -->
|
||||
<% end %></td>
|
||||
|
|
|
@ -47,13 +47,13 @@
|
|||
<tr>
|
||||
<td align="left"><span class="font_lighter"> <%= format_time(membership.created_on) %></span></td><!-- modified by ming -->
|
||||
<td align="right" style="font-size: 13px">
|
||||
课程角色:
|
||||
<%= l(:role_of_course)%>:
|
||||
<% if membership.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
|
||||
老师
|
||||
<%= l(:label_teacher)%>
|
||||
<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
|
||||
学生
|
||||
<%= l(:label_student)%>
|
||||
<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='TA' %>
|
||||
助教
|
||||
<%= l(:label_ta)%>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
@ -12,8 +12,13 @@
|
|||
<table width="100%" border="0">
|
||||
<tr>
|
||||
<td colspan="2"><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>
|
||||
在课程: <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %>
|
||||
中布置了作业: <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
|
||||
<%if @user.language=='zh'%>
|
||||
<%= l(:label_in_course)%>: <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %>
|
||||
<%= l(:label_assign_homework)%>: <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
|
||||
<%else%>
|
||||
<%= l(:label_assign_homework)%>: <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
|
||||
<%= l(:label_in_course)%>: <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %>
|
||||
<%end%>
|
||||
<span style="float: right">
|
||||
<%= link_to(
|
||||
l(:button_delete),
|
||||
|
|
|
@ -1535,3 +1535,11 @@ en:
|
|||
label_task_submit_form_accessory: Submitted as accessory
|
||||
label_task_submit_form_project: Submitted as project
|
||||
label_news_notice: Release course news
|
||||
|
||||
role_of_course: Role
|
||||
label_student: student
|
||||
label_teacher: teacher
|
||||
label_ta: teacher assistant
|
||||
label_in_course: in course
|
||||
label_assign_homework: assigned homewok
|
||||
label_noawards: No awards
|
||||
|
|
|
@ -1626,3 +1626,13 @@ zh:
|
|||
label_new_join_order: 请输入课程密码
|
||||
label_task_submit_form_accessory: 作业最终以附件形式提交
|
||||
label_task_submit_form_project: 作业最终以项目形式提交
|
||||
label_has_been: 已经被
|
||||
label_course_userd_by: 个课程引用
|
||||
|
||||
role_of_course: 课程角色
|
||||
label_student: 学生
|
||||
label_teacher: 老师
|
||||
label_ta: 助教
|
||||
label_in_course: 在课程中
|
||||
label_assign_homework: 中布置了作业
|
||||
label_noawards: 未评奖
|
Loading…
Reference in New Issue