jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2015-04-10 16:35:20 +08:00
parent d99910e8a1 db219205d9
commit ece4a67f97
30 changed files with 301 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/mobile/apis/users.rb
View File

@ -14,7 +14,7 @@ module Mobile
us = UsersService.new us = UsersService.new
user = us.register params.merge(:password_confirmation => params[:password], user = us.register params.merge(:password_confirmation => params[:password],
:should_confirmation_password => true) :should_confirmation_password => true)
raise "register failed #{user.errors.full_messages}" if user.new_record? raise "该邮箱已经被注册过了" if user.new_record?
present :data, user, with: Mobile::Entities::User present :data, user, with: Mobile::Entities::User
present :status, 0 present :status, 0

22
app/views/boards/_project_show.html.erb
View File

@ -10,7 +10,7 @@
<div id="add-message" class="add_frame" style="display:<%= !@flag.nil?&&@flag=='true' ? '' : 'none' %>;"> <div id="add-message" class="add_frame" style="display:<%= !@flag.nil?&&@flag=='true' ? '' : 'none' %>;">
<% if User.current.logged? %> <% if User.current.logged? %>
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2"><%= l(:label_message_new) %></h2> <h2 class="project_h2"><%= l(:project_module_boards_post) %></h2>
</div> </div>
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'messages/form', :locals => {:f => f} %> <%= render :partial => 'messages/form', :locals => {:f => f} %>
@ -39,12 +39,18 @@
<!-- 内容显示部分 --> <!-- 内容显示部分 -->
<div class="project_right"> <div class="project_right">
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2"><%= h @board.name %></h2> <h2 class="project_h2">
<% if User.current.language == "zh"%>
<%= h @board.name %>
<% else %>
<%= l(:project_module_boards) %>
<% end %>
</h2>
</div> </div>
<div class="talk_top"> <div class="talk_top">
<div class="fl">项目讨论区共有<span><%= @topic_count %></span>个帖子 </div> <div class="fl"><span><%= l(:label_project_board_count , :count => @topic_count)%></span></div>
<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %> <% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
<span><%= link_to l(:label_message_new), new_board_message_path(@board), <span><%= link_to l(:project_module_boards_post), new_board_message_path(@board),
:class => 'problem_new_btn fl', :class => 'problem_new_btn fl',
:onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %></span> :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %></span>
<% end %> <% end %>
@ -61,15 +67,15 @@
<div> <div>
<span><%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %></span> <span><%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %></span>
<% if topic.sticky? %> <% if topic.sticky? %>
<span class="talk_up">置顶</span> <span class="talk_up" style="float:right;"><%= l(:label_board_sticky)%></span>
<% end %> <% end %>
</div> </div>
<div class="problem_line"> <div class="problem_line">
<span>由<%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %></span> <span><%= l(:label_post_by)%><%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %></span>
<span>添加于<%= format_time topic.created_on %></span> &nbsp;<span><%= l(:label_post_by_time)%><%= format_time topic.created_on %></span>
</div> </div>
</div> </div>
<span class="talk_btn fr"><%= link_to (l(:label_reply) + topic.replies_count.to_s), board_message_path(@board, topic), :style =>"color:#fff;" %></span> <span class="talk_btn fr"><%= link_to (l(:label_short_reply) + " "+topic.replies_count.to_s), board_message_path(@board, topic), :style =>"color:#fff;line-height: 18px;" %></span>
<div class="cl"></div> <div class="cl"></div>
</div><!--讨论主类容 end--> </div><!--讨论主类容 end-->
<% end %> <% end %>

2
app/views/issues/index.html.erb
View File

@ -12,7 +12,7 @@
:onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %> :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
</span> </span>
<% end %> <% end %>
<span class="problem_p fr"><%= l(:label_issues_sum) %>：<span><%= @project.issues.count %></span> <%= l(:lable_issues_undo) %> <span><%= @project.issues.where('status_id in (1,2,4,6)').count %></span></span> <span class="problem_p fr"><%= l(:label_issues_sum) %>：<span><%= @project.issues.count %></span> <%= l(:lable_issues_undo) %>：<span><%= @project.issues.where('status_id in (1,2,4,6)').count %></span></span>
</div> </div>
<div class="contextual"> <div class="contextual">
<% if !@query.new_record? && @query.editable_by?(User.current) %> <% if !@query.new_record? && @query.editable_by?(User.current) %>

2
app/views/layouts/base_users.html.erb
View File

@ -173,7 +173,7 @@
<table style="font-family:'微软雅黑'" width="240"> <table style="font-family:'微软雅黑'" width="240">
<tr> <tr>
<td style=" float: right" width="70px"> <td style=" float: right" width="70px">
<span style="float: right"> <%= l(:label_user_joinin) %>：</span> <span style="float: right"> <%= l(:label_user_join) %>：</span>
</td> </td>
<td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"> <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
<%= format_time(@user.created_on) %> <%= format_time(@user.created_on) %>

1
app/views/open_source_projects/master_apply.html.erb
View File

@ -64,6 +64,7 @@
<% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %> <% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %>
<% memberships = user.memberships.all(:conditions => cond) %> <% memberships = user.memberships.all(:conditions => cond) %>
<%= l(:label_x_course_contribute_to, :count => memberships.count) %> <%= l(:label_x_course_contribute_to, :count => memberships.count) %>
<%= "：" unless user_courses.empty? %>
<% for member in memberships %> <% for member in memberships %>
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
<% end %> <% end %>

2
app/views/projects/files_tags.html.erb
View File

@ -7,7 +7,7 @@
<div> <div>
<h3><strong><%= l(:label_tags_search_result) %></strong></h3> <h3><strong><%= l(:label_tags_search_result) %></strong></h3>
<div align="right"> <div align="right">
<%= l(:label_tags_numbers) %> <%= l(:label_tags_numbers) %>：
<%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) | <%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) |
<%= l(:label_project_plural) %>(<%= @projects_tags_num %>) | <%= l(:label_project_plural) %>(<%= @projects_tags_num %>) |
<%= l(:label_user_plural) %>(<%= @users_tags_num %>) | <%= l(:label_user_plural) %>(<%= @users_tags_num %>) |

2
app/views/projects/settings/_modules.html.erb
View File

@ -4,7 +4,7 @@
:method => :post} do |f| %> :method => :post} do |f| %>
<fieldset class="box"> <fieldset class="box">
<legend><%= l(:text_select_project_modules) %></legend> <legend><%= l(:text_select_project_modules) %>：</legend>
<% Redmine::AccessControl.available_project_modules.each do |m| %> <% Redmine::AccessControl.available_project_modules.each do |m| %>

2
app/views/projects/show.html.erb
View File

@ -93,7 +93,7 @@
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
<%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
<%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"), <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"),
{:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
<div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;"> <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">

2
app/views/repositories/show.html.erb
View File

@ -1,6 +1,6 @@
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %> <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2">版本库</h2> <h2 class="project_h2"><%=l(:project_module_repository)%></h2>
</div> </div>
<div class="contextual" style="padding-right: 10px;"> <div class="contextual" style="padding-right: 10px;">
<%= render :partial => 'navigation' %> <%= render :partial => 'navigation' %>

10
app/views/tags/_show_attachments.html.erb
View File

@ -24,19 +24,19 @@
&nbsp;&nbsp; &nbsp;&nbsp;
<%= file.description %> <%= file.description %>
<div class="c9 gray-color"> <div class="c9 gray-color">
<%= l('attachment.category')%> <%= l('attachment.category')%>：
<%=result_come_from file%> <%=result_come_from file%>
</div> </div>
<span class="gray blue-color"> <span class="gray blue-color">
<%= l('attachment.download_num')%> <%= l('attachment.download_num')%>：
<%= file.downloads%>| <%= file.downloads%>|
<%= l('attachment.size')%> <%= l('attachment.size')%>：
<%= number_to_human_size(file.filesize) %>| <%= number_to_human_size(file.filesize) %>|
<%= l('attachment.sharer')%> <%= l('attachment.sharer')%>：
<a class="gray" > <a class="gray" >
<%= link_to file.author, user_path(file.author), target: "_blank" unless file.author.blank? %> <%= link_to file.author, user_path(file.author), target: "_blank" unless file.author.blank? %>
</a>| </a>|
<%= l('attachment.upload_time')%> <%= l('attachment.upload_time')%>：
<%= format_time(file.created_on) %> <%= format_time(file.created_on) %>
</span> </span>
<div style="display: none"></div> <div style="display: none"></div>

2
app/views/tags/_show_issues.html.erb
View File

@ -3,7 +3,7 @@
<hr /> <hr />
<% issues_results.each do |issue| %> <% issues_results.each do |issue| %>
<p class="font_description2"> <p class="font_description2">
<strong><%= l(:label_tags_issue) %><%= link_to "#{issue.subject}",:controller => "issues",:action => "show",:id => issue.id %></strong> <strong><%= l(:label_tags_issue) %>：<%= link_to "#{issue.subject}",:controller => "issues",:action => "show",:id => issue.id %></strong>
<br /> <br />
<strong><%= l(:label_tags_issue_description) %>：</strong><%= textilizable issue.description %> <strong><%= l(:label_tags_issue_description) %>：</strong><%= textilizable issue.description %>
</p> </p>

2
app/views/tags/_show_open_source_projects.html.erb
View File

@ -4,7 +4,7 @@
<% projects_results.each do |prj| %> <% projects_results.each do |prj| %>
<div> <div>
<p class="font_description2"> <p class="font_description2">
<strong><%= l(:label_tags_project_name) %><%= link_to "#{prj.name}",:controller => "open_source_projects",:action => "show",:id => prj.id %></strong> <strong><%= l(:label_tags_project_name) %>：<%= link_to "#{prj.name}",:controller => "open_source_projects",:action => "show",:id => prj.id %></strong>
<br /> <br />
<strong><%= l(:label_tags_project_description) %></strong><%= textilizable prj.short_description %> <strong><%= l(:label_tags_project_description) %></strong><%= textilizable prj.short_description %>
</p> </p>

2
app/views/tags/index.html.erb
View File

@ -17,7 +17,7 @@
<div> <div>
<h3><strong><%= l(:label_tags_search_result) %></strong></h3> <h3><strong><%= l(:label_tags_search_result) %></strong></h3>
<div align="right"> <div align="right">
<%= l(:label_tags_numbers) %> <%= l(:label_tags_numbers) %>：
<%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) | <%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) |
<%= l(:label_project_plural) %>(<%= @projects_tags_num %>) | <%= l(:label_project_plural) %>(<%= @projects_tags_num %>) |
<%= l(:label_user_plural) %>(<%= @users_tags_num %>) | <%= l(:label_user_plural) %>(<%= @users_tags_num %>) |

2
app/views/tags/show_all.html.erb
View File

@ -1,5 +1,5 @@
<% content_for :content do %> <% content_for :content do %>
<h3 style="color: red;"><%= l(:label_tags_count) %><%= @tags.size %>个</h3> <h3 style="color: red;"><%= l(:label_tags_count) %>：<%= @tags.size %>个</h3>
<hr /> <hr />
<% i = 0 %> <% i = 0 %>
<div id="show_all_tags"> <div id="show_all_tags">

1
app/views/users/_user_show.html.erb
View File

@ -42,6 +42,7 @@
<%# memberships = user.memberships.all(:conditions => cond) %> <%# memberships = user.memberships.all(:conditions => cond) %>
<% user_courses = user_courses_list(user) %> <% user_courses = user_courses_list(user) %>
<%= l(:label_x_course_contribute_to, :count => user_courses.count) %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
<%= "：" unless user_courses.empty? %>
<% for course in user_courses %> <% for course in user_courses %>
<%# if course.name != nil %> <%# if course.name != nil %>
<%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>

4
app/views/users/show.html.erb
View File

@ -202,7 +202,7 @@
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
<%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
{:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
</td> </td>
@ -216,7 +216,7 @@
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
<%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
{:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
</td> </td>

1
app/views/users/user_fanslist.html.erb
View File

@ -30,6 +30,7 @@
<p class="font_description"> <p class="font_description">
<% user_courses = user_courses_list(user) %> <% user_courses = user_courses_list(user) %>
<%= l(:label_x_course_contribute_to, :count => user_courses.count) %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
<%= "：" unless user_courses.empty? %>
<% for course in user_courses %> <% for course in user_courses %>
<%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
<% end %> <% end %>

4
app/views/welcome/contest.html.erb
View File

@ -277,11 +277,11 @@
<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %> <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
</span> </span>
<span class="memo_author"> <span class="memo_author">
<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %> <%=l(:label_question_sponsor)%>&nbsp;<%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
</span> </span>
<span class="memo_last_person"> <span class="memo_last_person">
<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %> <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
<%=l(:label_final_reply)%>:&nbsp; <%=l(:label_final_reply)%>&nbsp;
<%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%> <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
<% end %> <% end %>
</span> </span>

4
app/views/welcome/course.html.erb
View File

@ -203,12 +203,12 @@
<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %> <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
</span> </span>
<span class="memo_author" title="<%= topic.author.login%>"> <span class="memo_author" title="<%= topic.author.login%>">
<%= l(:label_question_sponsor)%>： <%= l(:label_question_sponsor)%>
<%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %> <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
</span> </span>
<span class="memo_last_person" title="<%= topic.last_reply.author.login unless (topic.last_reply.nil? || topic.last_reply.author.nil?)%>"> <span class="memo_last_person" title="<%= topic.last_reply.author.login unless (topic.last_reply.nil? || topic.last_reply.author.nil?)%>">
<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %> <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
<%= l(:label_final_reply)%>： <%= l(:label_final_reply)%>
<%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%> <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
<% end %> <% end %>
</span> </span>

10
app/views/welcome/index.html.erb
View File

@ -44,7 +44,11 @@
<div class="welcome_left" id="welcome_left"> <div class="welcome_left" id="welcome_left">
<% if @organization.nil? %> <% if @organization.nil? %>
<% unless @first_page.nil? %> <% unless @first_page.nil? %>
<%= @first_page.description.html_safe %> <!-- 改为国际化后无法通过后台配置
<%= @first_page.description.html_safe %>
-->
<span class="font_welcome_trustie"><%= l(:label_welcome_trustie_project)%></span>,&nbsp;
<span class="font_welcome_tdescription"><span class="font_welcome_tdescription"><%= l(:label_welcome_trustie_project_description)%></span></span>
<% end %> <% end %>
<% else %> <% else %>
<span class="font_welcome_school" style="color: #E8770D"> <span class="font_welcome_school" style="color: #E8770D">
@ -132,12 +136,12 @@
<%= format_time topic_last_time topic %> <%= format_time topic_last_time topic %>
</span> </span>
<span class="memo_author"> <span class="memo_author">
<%= l(:label_question_sponsor)%>： <%= l(:label_question_sponsor)%>
<%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %> <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
</span> </span>
<span class="memo_last_person"> <span class="memo_last_person">
<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %> <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
<%= l(:label_final_reply)%>： <%= l(:label_final_reply)%>
<%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%> <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
<% end %> <% end %>
</span> </span>

97
config/locales/commons/en.yml
View File

@ -176,16 +176,16 @@ en:
label_loading: Loading... label_loading: Loading...
label_create_time: Created time label_create_time: Created at
label_update_time: Update time label_update_time: Update at
label_reply: Reply label_reply: Reply
label_anonymous: Anonymous #作业和留言 模块 label_anonymous: Anonymous #作业和留言 模块
text_are_you_sure: Are you sure? #js 提示 text_are_you_sure: Are you sure? #js 提示
text_are_you_sure_out: 你确定要退出该课程吗？ text_are_you_sure_out: Are you sure to quit from this course?
text_are_you_sure_out_group: 你确定要退出该分班吗？ text_are_you_sure_out_group: Are you sure to quit from this group?
@ -225,9 +225,9 @@ en:
# #
# #
button_upload_photo: Upload photo button_upload_photo: Upload photo
button_delete_file: delete button_delete_file: Delete
error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})" error_attachment_too_big: "Cannot be uploaded when exceeding (%{max_size})"
error_pic_type: "Only supports the following image formats:" error_pic_type: "Only supports the following image formats: "
# #
@ -240,47 +240,47 @@ en:
label_more_tags: More label_more_tags: More
label_add_tag: "+ Add tags" label_add_tag: "+ Add tags"
label_tags_count: "The total number of tags：" label_tags_count: "Total number of tags"
label_tags_selected: Selected Tags label_tags_selected: Selected Tags
label_tags_related: Related Tags label_tags_related: Related Tags
label_tags_search_result: Search Results label_tags_search_result: Search Results
label_tags_numbers: "Tag numbers：" label_tags_numbers: "Tags"
label_tags_call: Calls label_tags_call: Calls
label_tags_contest: Competition tag label_tags_contest: Competitions
label_tags_opensource: Open source projects label_tags_opensource: Projects
label_tags_all_objects: all objects label_tags_all_objects: All objects
label_tags_bid: Call name label_tags_bid: Name
label_tags_bid_description: call description label_tags_bid_description: Description
label_tags_course_name: Course Title label_tags_course_name: Title
label_new_course_description: Description label_new_course_description: Description
label_tags_issue: "issue：" label_tags_issue: Issue
label_tags_issue_description: issue description label_tags_issue_description: Description
label_tags_project_name: "Project name：" label_tags_project_name: "Project name"
label_tags_project_description: "Project description：" label_tags_project_description: "Description"
label_tags_user_mail: "User E-mail：" label_tags_user_mail: "User E-mail："
label_tags_user_name: "User Name：" label_tags_user_name: "User Name："
label_tags_contest_name: Contest name label_tags_contest_name: Name
label_tags_contest_description: Contest description label_tags_contest_description: Description
label_tags_forum_description: Forum description label_tags_forum_description: Description
label_tags_forum: Call forum label_tags_forum: Forum
label_attachment: Files label_attachment: Files
attachment: attachment:
category: "From：" category: "From"
download_num: "Downloads:" download_num: "Downloads"
size: "Size:" size: "Size"
sharer: "Sharer：" sharer: "Sharer"
upload_time: "Upload time:" upload_time: "Upload time"
# #
@ -316,14 +316,18 @@ en:
# "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}" # "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"
# "缺陷 #1869 (已解决):subject" # "缺陷 #1869 (已解决):subject"
# tracker.name和status在数据库中以中文字段形式存储 # tracker.name和status在数据库中以中文字段形式存储
# 项目托管平台主页 > 贴吧动态栏 #
lable_bar_active: Question&Feedback # 项目托管平台主页
label_my_question: My-question #
label_my_feedback: My-feedback # 贴吧动态栏
#
lable_bar_active: Feedbacks
label_my_question: Ask
label_my_feedback: Comment
label_updated_time: "Updated %{value} ago" label_updated_time: "Updated %{value} ago"
label_question_sponsor: Sponsor label_question_sponsor: Created by
label_final_reply: Last-reply label_final_reply: Updated by
# #
@ -334,17 +338,30 @@ en:
label_feedback: Feedback label_feedback: Feedback
label_feedback_tips: "Anything you want to say， roar it here ~~" label_feedback_tips: "Anything you want to say， roar it here ~~"
label_technical_support: "Support: " label_technical_support: "Support: "
label_feedback_success: "Your comments have been posted back to the bar of discussion by newbie(in the Public Post Bar), we will be the first time to solve your problem, thanks for your support!" label_feedback_success: "Your comments have been sent to the public bar in the home page, thanks for your support!"
label_feedback_value: "The posts comes from user feedback！" label_feedback_value: "The post comes from user feedback box!"
#
#
#
# 评论
#
label_find_all_comments: view all comments
label_comments_count:
zero: "(%{count} comment)"
one: "(%{count} comment)"
other: "(%{count} comments)"
# #
# Trustie # Trustie
# #
# 新闻 # 新闻
# #
label_news: 新闻 label_news: News
label_news_description: Track the latest activities of projects, and obtain the latest information！
# #
# Trustie # Trustie

25
config/locales/commons/zh.yml
View File

@ -244,12 +244,12 @@ zh:
label_more_tags: 更多 label_more_tags: 更多
label_add_tag: "+ 添加标签" label_add_tag: "+ 添加标签"
label_tags_count: "总标签数：" label_tags_count: "总标签数"
label_tags_selected: 已选标签 label_tags_selected: 已选标签
label_tags_related: 相关标签 label_tags_related: 相关标签
label_tags_search_result: 搜索结果 label_tags_search_result: 搜索结果
label_tags_numbers: "Tag统计：" label_tags_numbers: "Tag统计"
label_issue_plural: 问题跟踪 label_issue_plural: 问题跟踪
label_project_plural: 项目列表 label_project_plural: 项目列表
@ -270,11 +270,11 @@ zh:
label_tags_course_name: 课程名称 label_tags_course_name: 课程名称
label_new_course_description: 课程描述 label_new_course_description: 课程描述
label_tags_issue: "问题名称：" label_tags_issue: "问题名称"
label_tags_issue_description: 问题描述 label_tags_issue_description: 问题描述
label_tags_project_name: "项目名称：" label_tags_project_name: "项目名称："
label_tags_project_description: "项目描述：" label_tags_project_description: "项目描述"
label_tags_user_mail: "用户邮箱：" label_tags_user_mail: "用户邮箱："
label_tags_user_name: "用户名：" label_tags_user_name: "用户名："
@ -287,11 +287,11 @@ zh:
label_attachment: 文件 label_attachment: 文件
attachment: attachment:
category: "所属分类：" category: "所属分类"
download_num: "下载:" download_num: "下载"
size: "大小:" size: "大小"
sharer: "共享者：" sharer: "共享者"
upload_time: "上传时间:" upload_time: "上传时间"
# #
# 项目托管平台主页 # 项目托管平台主页
@ -355,7 +355,10 @@ zh:
# 评论 # 评论
# #
label_find_all_comments: 查看所有评论 label_find_all_comments: 查看所有评论
label_comments_count: (%{count}条评论) label_comments_count:
zero: (%{count}条评论)
one: (%{count}条评论)
other: (%{count}条评论)
# #
# #
@ -363,7 +366,7 @@ zh:
# 新闻 # 新闻
# #
label_news: 新闻 label_news: 新闻
label_news_description: 实时了解项目的最新动态，掌握最新项目咨询！
# #
# #

20
config/locales/en.yml
View File

@ -570,10 +570,7 @@ en:
label_copied: copied label_copied: copied
label_renamed: renamed label_renamed: renamed
label_deleted: deleted label_deleted: deleted
label_latest_revision: Latest revision
label_latest_revision_plural: Latest revisions
label_view_revisions: View revisions
label_view_all_revisions: View all revisions
label_sort_highest: Move to top label_sort_highest: Move to top
label_sort_higher: Move up label_sort_higher: Move up
label_sort_lower: Move down label_sort_lower: Move down
@ -637,7 +634,7 @@ en:
label_board_new: New forum label_board_new: New forum
label_board_plural: Forums label_board_plural: Forums
label_board_locked: Locked label_board_locked: Locked
label_board_sticky: Sticky
label_topic_plural: Topics label_topic_plural: Topics
field_sticky: '' field_sticky: ''
field_locked: '' field_locked: ''
@ -654,7 +651,7 @@ en:
label_date_from: From label_date_from: From
label_date_to: To label_date_to: To
label_language_based: Based on user's language label_language_based: Based on user's language
label_sort_by: "Sort by %{value}"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key: RSS access key label_feeds_access_key: RSS access key
label_missing_feeds_access_key: Missing a RSS access key label_missing_feeds_access_key: Missing a RSS access key
@ -971,9 +968,6 @@ en:
label_delete_confirm: Confirm delete？ label_delete_confirm: Confirm delete？
label_exit_project: Exit Project
label_apply_project_waiting: "Application has been submitted, please wait for administrator review."
label_unapply_project: Unsubscribe
#fq #fq
@ -1029,9 +1023,8 @@ en:
label_priority_as: Priority as label_priority_as: Priority as
label_author_name: Posted by %{author_name} label_author_name: Posted by %{author_name}
label_comments_count: (%{count} comments)
label_post_on: posts on label_post_on: posts on
label_find_all_comments: view all comments
label_updated_time_on: " Updated on %{value} " label_updated_time_on: " Updated on %{value} "
label_call_list: Calls list label_call_list: Calls list
@ -1082,8 +1075,7 @@ en:
label_create_new_projects_description: Create a new project, you will open a magical journey of collaborative creation and development！ label_create_new_projects_description: Create a new project, you will open a magical journey of collaborative creation and development！
label_call_for_bids_description: Publish your call for anything, feel the excitement of hundreds respond to a single call！ label_call_for_bids_description: Publish your call for anything, feel the excitement of hundreds respond to a single call！
label_create_course_description: Create a new course, let us share the public resources in the course community which are more than you can imagine！ label_create_course_description: Create a new course, let us share the public resources in the course community which are more than you can imagine！
label_news: News
label_news_description: Track the latest activities of projects, and obtain the latest information！
label_milestone: Milestone label_milestone: Milestone
label_milestone_description: Review the commits, branches and versions of your project！ label_milestone_description: Review the commits, branches and versions of your project！
label_features: Features label_features: Features
@ -1124,7 +1116,7 @@ en:
label_follow_no_requirement: You don't have followed any requirements！ label_follow_no_requirement: You don't have followed any requirements！
label_all_revisions: All revisions：
label_repository_name: Repository name label_repository_name: Repository name
label_upassword_info: The password can be shared in the group label_upassword_info: The password can be shared in the group
label_how_commit_code: How to commit code： label_how_commit_code: How to commit code：

4
config/locales/my/en.yml
View File

@ -13,9 +13,9 @@ en:
label_location: Location label_location: Location
label_identity: Identity label_identity: Identity
# top_menu 个人相关 # top_menu 个人相关
label_my_course: My Course label_my_course: My Courses
label_my_message: Msgs label_my_message: Msgs
label_my_projects: My projectsed label_my_projects: My Projects
# #

35
config/locales/navigatiors/en.yml
View File

@ -11,10 +11,10 @@ en:
label_course_practice: Courses label_course_practice: Courses
label_forum_all: Forums label_forum_all: Forums
label_school_all: Schools label_school_all: Schools
label_contest_innovate: Competition community label_contest_innovate: Competitions
label_software_user: Users # 删除 label_software_user: Users # 删除
label_requirement_enterprise: Requirements # 删除 label_requirement_enterprise: Requirements # 删除
label_stores_index: Resource search label_stores_index: Search
label_login: Login label_login: Login
@ -23,8 +23,8 @@ en:
# #
# 主旨 # 主旨
# #
label_welcome_trustie_project: Trustie online projects hosting platform label_welcome_trustie_project: Trustie online projects hosting services
label_welcome_trustie_project_description: "Software for Chinese college students and practitioners to provide social-oriented project management, code hosting, resource sharing, cooperation and exchange." label_welcome_trustie_project_description: "Socialized research & development communities for distributed collaboration, resource sharing, code hosting and acitivity analysis."
# #
@ -32,8 +32,8 @@ en:
# #
# 主旨 # 主旨
# #
label_welcome_trustie_course: Trustie online courses practice platform label_welcome_trustie_course: "Trustie online course & practice hosting services"
label_welcome_trustie_course_description: Teachers and Students for Chinese universities to provide social-oriented curriculum management, resource sharing, cooperation achieved, collaborative research. label_welcome_trustie_course_description: "Socialized innovative practicing communities for classroom hosting, resource sharing, collaborative homeworking and ranking."
# #
@ -41,9 +41,8 @@ en:
# #
# 主旨 # 主旨
# #
label_welcome_trustie_contest: Trustie online contests practice platform label_welcome_trustie_contest: "Trustie online contest hosting services"
label_welcome_trustie_contest_description: Software for Chinese college students and practitioners to provide social-oriented contest management, code hosting, resource sharing, cooperation and exchange. label_welcome_trustie_contest_description: "Socialized competition communities for contest management, demo destration and ranking."
# #
# Trustie平台导航 # Trustie平台导航
@ -53,7 +52,7 @@ en:
label_search: Search label_search: Search
welcome: welcome:
search: search:
information: "Please input the keywords!" # 搜索提示信息 information: "Please input the keywords :)" # 搜索提示信息
select: # 下拉列表 select: # 下拉列表
project: project project: project
course: course course: course
@ -63,17 +62,17 @@ en:
showname: name showname: name
email: email email: email
label_search_conditions_not_null: The search conditions cannot be blank label_search_conditions_not_null: Search conditions cannot be blank
label_resources_search_all: "Search all files in the website, while will not search the contents of private items." # 资源搜索提示信息 label_resources_search_all: "Search all public resources in the website." # 资源搜索提示信息
# #
# Trustie平台导航 # Trustie平台导航
# #
# 下方托管平台链接 # 下方托管平台链接
# #
label_projects_management_platform: Projects-platform label_projects_management_platform: Projects
label_courses_management_platform: Courses-platform label_courses_management_platform: Courses
label_contests_management_platform: Competitions-platform label_contests_management_platform: Competitions
# #
@ -81,7 +80,7 @@ en:
# #
# 各模块内导航 # 各模块内导航
# #
label_courses_community: Universities Curriculum Communities of Practice label_courses_community: Project hosting communities
label_projects_community: Software Project Communities of Hosting label_projects_community: Course & practice hosting communities
label_contest_innovate_community: Innovation Communities of Competition label_contest_innovate_community: Innovative competition communities
label_user_location: Location label_user_location: Location

5
config/locales/navigatiors/zh.yml
View File

@ -15,8 +15,8 @@ zh:
label_forum_all: 公共贴吧 label_forum_all: 公共贴吧
label_school_all: 中国高校 label_school_all: 中国高校
label_contest_innovate: 创新竞赛 label_contest_innovate: 创新竞赛
label_software_user: 软件创客 #label_software_user: 软件创客
label_requirement_enterprise: 软件众包 #label_requirement_enterprise: 软件众包
label_stores_index: 资源搜索 label_stores_index: 资源搜索
label_login: 登录 label_login: 登录
@ -26,6 +26,7 @@ zh:
# #
# 主旨 # 主旨
# #
label_welcome_trustie_project: Trustie在线项目托管平台 label_welcome_trustie_project: Trustie在线项目托管平台
label_welcome_trustie_project_description: "面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。" label_welcome_trustie_project_description: "面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。"

170
config/locales/projects/en.yml
View File

@ -7,7 +7,6 @@ en:
# #
# 公共类 # 公共类
# #
label_apply_project: Apply Project
label_project_new: New project label_project_new: New project
label_join_project: Join a project label_join_project: Join a project
@ -17,13 +16,13 @@ en:
# #
# 热门项目栏 # 热门项目栏
# #
lable_hot_projects: Hot Projects lable_hot_projects: "Hot Projects"
label_private: private label_private: "private"
label_project_member_amount: label_project_member_amount:
one: "%{count} member" one: "%{count} member"
other: "%{count} members" other: "%{count} members"
label_project_score_tips: "Considering all activities of the project, project's score reflects the activity level of project" label_project_score_tips: "The score reflects the workload of this project"
label_project_score: Score label_project_score: "Score"
# #
@ -33,27 +32,30 @@ en:
# #
label_project_id: "Projcet ID:" label_project_id: "Projcet ID:"
label_apply_project: "+Apply to Join" label_apply_project: "+Join"
label_exit_project: Exit label_button_following: "+Follow"
label_apply_project_waiting: "Application has been processed, please wait for administrator review."
label_unapply_project: Cancel the application label_exit_project: "Exit"
label_apply_project_waiting: "Application is sent, please wait for the response of the administrator."
label_unapply_project: "Cancel the application"
lable_sure_exit_project: "Are you sure exit from the projcet"
label_member: Members label_member: "Members"
project_module_attachments: Resources project_module_attachments: "Resources"
label_invite: Invitation label_invite: Invitation
label_invite_new_user: "Send e-mail to invite new user" label_invite_new_user: "Send email to invite new user"
label_invite_trustie_user: "Invite the Trustie registered user" label_invite_trustie_user: "Invite the Trustie registered user"
label_issue_tracking: Issues label_issue_tracking: "Issues"
label_release_issue: New Issue label_release_issue: "New Issue"
project_module_boards: Forums project_module_boards: "Forums"
project_module_boards_post: New Post project_module_boards_post: "New Post"
project_module_files: Resources project_module_files: "Resources"
label_upload_files: New File label_upload_files: "New Resource"
project_module_repository: Repository project_module_repository: "Repositories"
project_module_create_repository: New Repository project_module_create_repository: "New Repository"
label_project_more: More label_project_more: More
project_module_news: News project_module_news: News
@ -66,8 +68,8 @@ en:
label_project_tool_response: Feedback label_project_tool_response: Feedback
project_module_dts: DTS Test Tool project_module_dts: DTS Test Tool
label_project_overview: "Profile:" label_project_overview: "Description:"
label_expend_information: More Information label_expend_information: More
# #
@ -92,8 +94,8 @@ en:
# #
label_followers: Followers label_followers: Followers
label_contribute_to: label_contribute_to:
one: "Participates %{count} project—" one: "Participates %{count} project"
other: "Participates %{count} projects—" other: "Participates %{count} projects"
# #
@ -106,20 +108,21 @@ en:
# 资源库（附件）公用 # 资源库（附件）公用
label_relation_files: Select an existing resource label_relation_files: Select an existing resource
label_search_by_keyword: "Search by keywords" label_search_by_keyword: "Search by keywords"
label_files_filter: "Filter Files:" label_files_filter: Filter
attachment_all: "All" attachment_all: All
attachment_browse: "By Attachment Content " attachment_browse: By Content
attachment_sufix_browse: "By Attachment Type " attachment_sufix_browse: By Type
label_unknow_type: Unknow type label_unknow_type: Unknow type
field_filename: File field_filename: File
field_filesize: Size field_filesize: Size
field_filecontenttype: Content field_filecontenttype: Content
field_filetype: File Typ field_filetype: File Type
field_downloads: Downloads field_downloads: Downloads
field_file_dense: Dense field_file_dense: Scope
label_sort_by: "Sort by %{value}"
# 资源库（附件）公用 > 上传文件 # 资源库（附件）公用 > 上传文件
label_attachment_new: New file label_attachment_new: New file
field_version: Version field_version: Version
@ -130,14 +133,14 @@ en:
label_max_size: Maximum size label_max_size: Maximum size
label_optional_description: Description label_optional_description: Description
label_file_count: "files were uploaded successfully" label_file_count: "Uploaded successfully"
# #
# 项目托管平台 # 项目托管平台
# #
# 问题跟踪 # 问题跟踪
label_issues_sum: 'Total' label_issues_sum: "Total"
lable_issues_undo: 'Unresolved：' lable_issues_undo: "Unresolved"
label_successful_create: Successfully created label_successful_create: Successfully created
label_query: Custom query label_query: Custom query
label_issue_new: New issue label_issue_new: New issue
@ -205,7 +208,14 @@ en:
# 项目讨论区 # 项目讨论区
# #
label_project_board_count:
zero: Displaying Topic(%{count} total)
one: Displaying Topic(%{count} total)
other: Displaying Topics(%{count} total)
label_board_sticky: Sticky
label_post_by: "Started by "
label_post_by_time: "on "
label_short_reply: "RE:"
# #
# 项目托管平台 # 项目托管平台
# #
@ -218,23 +228,27 @@ en:
# #
# 版本库 # 版本库
# #
lael_all_revisions: All revisions：
label_latest_revision: Latest revision
label_latest_revision_plural: Latest revisions
label_view_revisions: View revisions
label_view_all_revisions: View all revisions
# #
# 项目托管平台 # 项目托管平台
# #
# 项目配置 # 项目配置
# #
label_module_plural: Modules label_module_plural: Tool
label_version_plural: Versions label_version_plural: Version
label_issue_category_plural: Issue categories label_issue_category_plural: Issue type
label_repository_plural: Repositories label_repository_plural: Repository
enumeration_activities: Activities enumeration_activities: Activity type
text_select_project_modules: "Select modules to enable for this project:" text_select_project_modules: "Select tools to enable for this project"
project_module_issue_tracking: Issue tracking project_module_issue_tracking: Issue tracking
project_module_time_tracking: Time tracking project_module_time_tracking: Time tracking
project_module_course: 课程 #project_module_course: 课程
project_module_boards: Forums project_module_boards: Forums
# #
@ -242,21 +256,19 @@ en:
# #
# 邀请 # 邀请
# #
label_invite_new_user: "Send email to invite users" label_invite_join: "Invite"
label_invite_join: Invite label_invite_email_tips: "Enter the email address, Trustie will send invitation mail to the user!"
label_invite_email_tips: Enter the email address, Trustie will automatically register a user for the email address! notice_registed_error: "Email address is blank or has been registered!"
notice_registed_error: Email address is blank or has been registered! label_input_email_blank: "Email address is blank!"
label_input_email_blank: Email address is blank! label_email_format_error: "Email format is incorrect!"
label_email_format_error: Email format is incorrect! label_send_email: "Send"
label_send_email: Send label_input_email: "Please input email address"
label_input_email: Please input email address
label_invite_trustie_user_tips: "Type to find users"
label_invite_trustie_user: "Invite Trustie registered users" label_user_role_null: "User and Role can not be blank！"
label_invite_trustie_user_tips: "Type nickname to find users"
label_user_role_null: User and Role can not be blank！
label_invite_project: "invites you to join the project" label_invite_project: "invites you to join the project"
label_invite_success: Successful invitation label_invite_success: "Invitation is successfully sent out!"
label_invite_members: Invite label_invite_members: "Invite"
# #
@ -264,17 +276,17 @@ en:
# #
# 新建项目/项目配置 >信息 # 新建项目/项目配置 >信息
# #
label_project_new_description: "A project can be used to do anything that requires distributed collaboration." label_project_new_description: "A project is used for distributed collaboration."
field_name: Name field_name: "Name"
field_description: Description field_description: "Description"
field_identifier: Identifier #field_identifier: Identifier
field_enterprise_name: Enterprise field_enterprise_name: "Organization"
label_organization_choose: "- Please select an organization -" label_organization_choose: "- Please select an organization -"
text_length_between: "Length between %{min} and %{max} characters." text_length_between: "Length between %{min} and %{max} characters."
text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.<br />Once saved, the identifier cannot be changed." text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.<br />Once saved, the identifier cannot be changed."
field_is_public: Public field_is_public: "Public"
field_hidden_repo: code protected field_hidden_repo: "Private repository"
@ -286,33 +298,33 @@ en:
project: project:
join: join:
title: Quickly Join to Project title: Quickly Join to Project
description: "Just hold the project ID, while you can quickly apply to join the project.Private projects can only join by this channel!" description: "Input the project ID, then you can quickly apply to join the project. Private projects can only join by this way!"
id: id:
label: "Project ID:" label: "Project ID:"
tips: "Project ID is the number within project URL" tips: "Project ID is the unique number for each project"
# #
# 项目托管平台 # 项目托管平台
# #
# 项目得分 # 项目得分
# #
label_projects_score: Project Total Score label_projects_score: "Total Score"
label_issue_score: Issue Score label_issue_score: "Issue Score"
label_issue_number: issues label_issue_number: "issues"
label_issue_journal_number: messages of issue label_issue_journal_number: "messages of issue"
label_news_score: News Score label_news_score: "News Score"
label_new_number: news label_new_number: "news"
label_file_score: Document Scores label_file_score: "Document Score"
label_file_number: documents label_file_number: "documents"
label_code_submit_score: Code Commit Score label_code_submit_score: "Code Commit Score"
label_code_submit_number: commit code frequency label_code_submit_number: "commit code frequency"
label_topic_score: Forum Score label_topic_score: "Forum Score"
label_topic_number: posts label_topic_number: "posts"
@ -320,7 +332,7 @@ en:
# #
# 项目托管平台 # 项目托管平台
# #
# 项目得分 # 项目配置
# #
label_approve: Approve label_approve: Approve
label_refusal: Refusal label_refusal: Refusal

22
config/locales/projects/zh.yml
View File

@ -52,7 +52,7 @@ zh:
project_module_boards: 讨论区 project_module_boards: 讨论区
project_module_boards_post: 发帖 project_module_boards_post: 发布新帖
project_module_files: 资源库 project_module_files: 资源库
project_module_repository: 版本库 project_module_repository: 版本库
project_module_create_repository: 创建版本库 project_module_create_repository: 创建版本库
@ -120,12 +120,13 @@ zh:
field_filetype: 文件格式 field_filetype: 文件格式
field_file_dense: 是否公开 field_file_dense: 是否公开
field_downloads: 下载次数 field_downloads: 下载次数
label_sort_by: "根据 %{value} 排序"
attachment_sufix_browse: "文件类型" attachment_sufix_browse: "文件类型"
attachment_browse: "内容类型" attachment_browse: "内容类型"
attachment_all: "全部" attachment_all: "全部"
label_unknow_type: 未知类型 label_unknow_type: 未知类型
# 资源库（附件）公用 > 上传文件 # 资源库（附件）公用 > 上传文件
label_attachment_new: 新建文件 label_attachment_new: 新建文件
field_version: 版本 field_version: 版本
@ -256,8 +257,17 @@ zh:
# #
# 项目讨论区 # 项目讨论区
# #
label_user_login_project_board: 您还没有登录，请登录后参与项目讨论
label_project_board_count:
zero: 项目讨论区共有%{count}个帖子
one: 项目讨论区共有%{count}个帖子
other: 项目讨论区共有%{count}个帖子
label_board_sticky: 置顶
label_post_by: 由
label_post_by_time: 添加于
label_short_reply: "回复"
# #
# 项目托管平台 # 项目托管平台
# #
@ -270,7 +280,11 @@ zh:
# #
# 版本库 # 版本库
# #
label_all_revisions: "所有版本："
label_latest_revision: 最近的修订版本
label_latest_revision_plural: 最近的修订版本
label_view_revisions: 查看修订
label_view_all_revisions: 查看所有修订
# #
# 项目托管平台 # 项目托管平台
# #

79
config/locales/users/en.yml
View File

@ -24,23 +24,23 @@ en:
# #
# 左边栏 # 左边栏
# #
label_user_edit: Edit information label_user_edit: Edit
label_user_grade: Individual score label_user_grade: Score
label_user_score: Individual synthetic score label_user_score: Total
label_user_score_of_influence: Influence score label_user_score_of_influence: Influence
label_user_score_of_collaboration: Collaborative score label_user_score_of_collaboration: Collaboration
label_user_score_of_skill: Skill score label_user_score_of_skill: Skill
label_user_score_of_active: Project score label_user_score_of_active: Workload
userscore: userscore:
collaboration: collaboration:
memos: The number of Posts memos: Posts
message_for_issues: The number of messages to issues message_for_issues: Comments to issues
issue_status: Times of change the issue state issue_status: Changes to issues
reply_for_messages: The number of replies to messages reply_for_messages: Replies to messages
reply_for_memos: The number of replies to posts reply_for_memos: Replies to posts
influence: influence:
followers: Followers followers: Fans
skill: skill:
tramples: 踩别人的帖子数量 tramples: 踩别人的帖子数量
like: like:
@ -53,26 +53,26 @@ en:
level3: 帖子被三级会员踩的次数 level3: 帖子被三级会员踩的次数
active: active:
commit: commit:
codes: 提交代码次数 codes: Commits
documents: 提交文档次数 documents: Documents
attachments: 提交附件次数 attachments: Attachments
update_issues: 更新缺陷完成度次数 update_issues: Updates of issue states
release_issues: 发布缺陷数量 release_issues: Issues
label_score_less_than_zero: Score less than 0, revised to 0 label_score_less_than_zero: Score less than 0, revised to 0
label_user_info: User information label_user_info: Information
label_user_watcher: Followers label_user_watcher: Following
label_user_fans: Followed by label_user_fans: Followed
label_x_user_fans: label_x_user_fans:
zero: Fan zero: Fan
one: Fan one: Fan
other: Fans other: Fans
label_brief_introduction: Personality words label_brief_introduction: Feeling words
label_my_brief_introduction: "How are feeling today? Leave your footprints ~" label_my_brief_introduction: "How are feeling today? Leave some words ~~"
label_user_joinin: Join date label_user_join: Join
label_user_login: Last login label_user_login: Last login
label_technical_title: Title label_technical_title: Title
@ -113,7 +113,7 @@ en:
label_goto: "Go to»" label_goto: "Go to»"
label_activity_project: "Project：" label_activity_project: "Project"
label_active_call: call label_active_call: call
label_active_homework: homework label_active_homework: homework
# 评论、评论数在commons模块下 # 评论、评论数在commons模块下
@ -136,11 +136,11 @@ en:
label_about_issue: "about the issue—" label_about_issue: "about the issue—"
label_about_requirement: "about requirement—" label_about_requirement: "about requirement—"
label_have_respond: had a respond label_have_respond: " had a respond"
label_in_issues: "in the issue—" label_in_issues: "in the issue—"
label_no_user_respond_you: "There is no respond for you！" label_no_user_respond_you: "No responses for you now:)"
# end # end
@ -149,12 +149,12 @@ en:
# #
# 项目栏 # 项目栏
# #
label_project_unadd: "No project, go to creat it!" label_project_unadd: "No project, creat one!"
label_project_un: "You haven't joined any project yet!" label_project_un: "You haven't joined any project yet!"
label_has_watched_project: "The projects of attention" label_has_watched_project: "Followed projects"
label_project_take: "The projects of participation" label_project_take: "Joined projects"
label_project_take_in: "joined the project—" label_project_take_in: "joined the project—"
@ -163,9 +163,9 @@ en:
# #
# 课程栏 # 课程栏
# #
label_project_course_un: "The user is not enrolled in any course yet. " label_project_course_un: "Not joined any course yet."
label_project_course_unadd: "You have no course,creat one now!" label_project_course_unadd: "You have no course,creat one now:)"
label_project_cousre_studentun: "You have not joined any course, come and join now!" label_project_cousre_studentun: "No courses, come and join now!"
user: user:
courses: courses:
doing: Strating doing: Strating
@ -178,13 +178,13 @@ en:
# 留言栏 # 留言栏
# #
label_responses: Messages label_responses: Messages
label_user_response: Feedback label_user_response: Comment
label_leave_a_message: "Leave him/her a message" label_leave_a_message: "Leave him/her a message"
button_leave_meassge: Submit button_leave_meassge: Submit
button_clear_meassge: Reset button_clear_meassge: Reset
label_user_login_new: Login label_user_login_new: Login
label_user_login_tips: "You haven't logged in, please login first to leave a message!" label_user_login_tips: "Log in before leave a message:)"
label_bid_respond_delete: Delete label_bid_respond_delete: Delete
label_bid_respond_quote: Respond label_bid_respond_quote: Respond
@ -205,12 +205,13 @@ en:
# #
# Followers & Fans # Followers & Fans
# #
label_user_joinin: Join at
label_x_contribute_to: label_x_contribute_to:
zero: "participates %{count} project" zero: "participates %{count} project"
one: "participates %{count} project—" one: "participates %{count} project"
other: "participates %{count} projects—" other: "participates %{count} projects"
label_x_course_contribute_to: label_x_course_contribute_to:
zero: "participates %{count} course" zero: "participates %{count} course"
one: "participates %{count} course—" one: "participates %{count} course"
other: "participates %{count} courses—" other: "participates %{count} courses"

21
config/locales/zh.yml
View File

@ -474,7 +474,7 @@ zh:
label_activities_settings: 显示设置 label_activities_settings: 显示设置
label_user_login_course_board: 您还没有登录，请登录后参与课程讨论 label_user_login_course_board: 您还没有登录，请登录后参与课程讨论
label_user_login_project_board: 您还没有登录，请登录后参与项目讨论
label_user_login_attending_contest: 您还没有登录，请登录后参赛 label_user_login_attending_contest: 您还没有登录，请登录后参赛
label_user_login_score_and_comment: 您还没有登录，请登录后对作品进行打分评价 label_user_login_score_and_comment: 您还没有登录，请登录后对作品进行打分评价
label_user_login_notificationcomment: 您还没有登录，请登录后参加评论 label_user_login_notificationcomment: 您还没有登录，请登录后参加评论
@ -710,7 +710,7 @@ zh:
label_board_new: 新建讨论区 label_board_new: 新建讨论区
label_board_plural: 讨论区 label_board_plural: 讨论区
label_board_locked: 锁定 label_board_locked: 锁定
label_board_sticky: 置顶
field_sticky: '' field_sticky: ''
field_locked: '' field_locked: ''
field_lock: '' field_lock: ''
@ -727,7 +727,7 @@ zh:
label_date_from: 从 label_date_from: 从
label_date_to: 到 label_date_to: 到
label_language_based: 根据用户的语言 label_language_based: 根据用户的语言
label_sort_by: "根据 %{value} 排序"
label_send_test_email: 发送测试邮件 label_send_test_email: 发送测试邮件
label_feeds_access_key: RSS存取键 label_feeds_access_key: RSS存取键
label_missing_feeds_access_key: 缺少RSS存取键 label_missing_feeds_access_key: 缺少RSS存取键
@ -1330,7 +1330,7 @@ zh:
label_create_new_projects_description: 创建项目，让我们开启一次神奇的协同创作和开发之旅！ label_create_new_projects_description: 创建项目，让我们开启一次神奇的协同创作和开发之旅！
label_call_for_bids_description: 发布需求，征集解决方案，体验一呼百应的兴奋感觉！ label_call_for_bids_description: 发布需求，征集解决方案，体验一呼百应的兴奋感觉！
label_news_description: 实时了解项目的最新动态，掌握最新项目咨询！
label_milestone_description: 在这里您可以看见任何一个版本的工程！ label_milestone_description: 在这里您可以看见任何一个版本的工程！
label_welcome: 欢迎 label_welcome: 欢迎
@ -1347,12 +1347,7 @@ zh:
label_course_homework: 发布了作业 label_course_homework: 发布了作业
label_follow_no_requirement: 暂未关注任何需求！ label_follow_no_requirement: 暂未关注任何需求！
label_tags_issue: 问题名称：
label_tags_project_name: 项目名称：
label_tags_project_description: 项目描述：
label_tags_user_mail: 用户邮箱：
label_tags_user_name: 用户名：
label_tags_numbers: Tag统计：
label_your_course: 您的课程《 label_your_course: 您的课程《
label_have_message : 》有新的留言 label_have_message : 》有新的留言
label_all_revisions: 所有版本： label_all_revisions: 所有版本：
@ -1370,8 +1365,7 @@ zh:
label_welcome_my_respond: 请在此留下你的意见和建议！ label_welcome_my_respond: 请在此留下你的意见和建议！
label_course_feedback: 留言 label_course_feedback: 留言
label_tags_search_result: 搜索结果
label_tags_call: 需求
label_user_extensions: 其他信息 label_user_extensions: 其他信息
label_boy: 男 label_boy: 男
@ -1698,8 +1692,7 @@ zh:
label_forum: 公共贴吧 label_forum: 公共贴吧
label_forum_new: 新建贴吧 label_forum_new: 新建贴吧
label_forum_set: 贴吧设置 label_forum_set: 贴吧设置
label_tags_forum_description: 贴吧描述
label_tags_forum: 贴吧名称
label_project_module_forums: 公共贴吧 label_project_module_forums: 公共贴吧
label_memo_locked: 帖子已被锁定 label_memo_locked: 帖子已被锁定
label_downloads_list: 进入附件列表 label_downloads_list: 进入附件列表