hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

项目界面缺失翻译调整

Browse Source
memcached_alan
whimlex 10 years ago
parent db219205d9
commit 69153d2d95
20 changed files with 99 additions and 56 deletions
Show Stats Download Patch File Download Diff File

10
app/views/applied_project/applied_join_project.js.erb
Unescape View File

@ -1,11 +1,11 @@
<% if @status == 0%> <% if @status == 0%>
alert("您申请的项目不存在"); alert("<%= l('project.join.tips.notexist') %>");
<% elsif @status == 1%> <% elsif @status == 1%>
alert("请勿重复申请加入该项目"); alert("<%= l('project.join.tips.repeat') %>");
<% elsif @status == 2%> <% elsif @status == 2%>
alert("申请成功"); alert("<%= l('project.join.tips.success') %>");
<% elsif @status == 3%> <% elsif @status == 3%>
alert("您已加入该项目"); alert("<%= l('project.join.tips.has') %>");
<%else%> <%else%>
alert("申请失败"); alert("<%= l('project.join.tips.fail') %>");
<%end%> <%end%>

2
app/views/homework_attach/edit.html.erb
Unescape View File

@ -28,7 +28,7 @@
} }
else else
{ {
$("#homework_attach_name_span").text("填写正确"); $("#homework_attach_name_span").text("<%= l(:label_field_correct)%>");
$("#homework_attach_name_span").css('color','#008000'); $("#homework_attach_name_span").css('color','#008000');
return true; return true;
} }

2
app/views/messages/_project_show.html.erb
Unescape View File

@ -58,7 +58,7 @@
<div class="lz"> <div class="lz">
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2"><%= h @board.name %></h2> <h2 class="project_h2"> <%= l(:label_board_plural) %></h2>
</div> </div>
<!-- 在这里添加赞和踩--> <!-- 在这里添加赞和踩-->
<span id="praise_tread" style="float: right"> <span id="praise_tread" style="float: right">

2
app/views/news/_form.html.erb
Unescape View File

@ -7,7 +7,7 @@
<%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;", :onkeyup => "regexTitle();" %> <%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;", :onkeyup => "regexTitle();" %>
</p> </p>
<P> <P>
<span id="title_notice_span">(60个字符以内)</span> <span id="title_notice_span"><%= l(:label_news_title_tips)%></span>
</P> </P>
<!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> --> <!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
<p> <p>

10
app/views/news/_project_news.html.erb
Unescape View File

@ -7,20 +7,20 @@
var name = $("#news_title").val(); var name = $("#news_title").val();
if(name.length ==0) if(name.length ==0)
{ {
$("#title_notice_span").text("标题不能为空"); $("#title_notice_span").text("<%= l(:label_title_blank)%>");
$("#title_notice_span").css('color','#ff0000'); $("#title_notice_span").css('color','#ff0000');
$("#title_notice_span").focus(); $("#title_notice_span").focus();
return false; return false;
} }
else if(name.length <= 60) else if(name.length <= 60)
{ {
$("#title_notice_span").text("填写正确"); $("#title_notice_span").text("<%= l(:label_field_correct)%>");
$("#title_notice_span").css('color','#008000'); $("#title_notice_span").css('color','#008000');
return true; return true;
} }
else else
{ {
$("#title_notice_span").text("标题超过60个字符"); $("#title_notice_span").text("<%= l(:label_title_long)%>");
$("#title_notice_span").css('color','#ff0000'); $("#title_notice_span").css('color','#ff0000');
$("#title_notice_span").focus(); $("#title_notice_span").focus();
return false; return false;
@ -32,14 +32,14 @@
var name = $("#news_description").val(); var name = $("#news_description").val();
if(name.length ==0) if(name.length ==0)
{ {
$("#description_notice_span").text("描述不能为空"); $("#description_notice_span").text("<%= l(:label_descripition_blank)%>");
$("#description_notice_span").css('color','#ff0000'); $("#description_notice_span").css('color','#ff0000');
$("#description_notice_span").focus(); $("#description_notice_span").focus();
return false; return false;
} }
else else
{ {
$("#description_notice_span").text("填写正确"); $("#description_notice_span").text("<%= l(:label_field_correct)%>");
$("#description_notice_span").css('color','#008000'); $("#description_notice_span").css('color','#008000');
return true; return true;
} }

10
app/views/news/_project_show.html.erb
Unescape View File

@ -7,20 +7,20 @@
var name = $("#news_title").val(); var name = $("#news_title").val();
if(name.length ==0) if(name.length ==0)
{ {
$("#title_notice_span").text("标题不能为空"); $("#title_notice_span").text("<%= l(:label_title_blank)%>");
$("#title_notice_span").css('color','#ff0000'); $("#title_notice_span").css('color','#ff0000');
$("#title_notice_span").focus(); $("#title_notice_span").focus();
return false; return false;
} }
else if(name.length <= 60) else if(name.length <= 60)
{ {
$("#title_notice_span").text("填写正确"); $("#title_notice_span").text("<%= l(:label_field_correct)%>");
$("#title_notice_span").css('color','#008000'); $("#title_notice_span").css('color','#008000');
return true; return true;
} }
else else
{ {
$("#title_notice_span").text("标题超过60个字符"); $("#title_notice_span").text("<%= l(:label_title_long)%>");
$("#title_notice_span").css('color','#ff0000'); $("#title_notice_span").css('color','#ff0000');
$("#title_notice_span").focus(); $("#title_notice_span").focus();
return false; return false;
@ -32,14 +32,14 @@
var name = $("#news_description").val(); var name = $("#news_description").val();
if(name.length ==0) if(name.length ==0)
{ {
$("#description_notice_span").text("描述不能为空"); $("#description_notice_span").text("<%= l(:label_descripition_blank)%>");
$("#description_notice_span").css('color','#ff0000'); $("#description_notice_span").css('color','#ff0000');
$("#description_notice_span").focus(); $("#description_notice_span").focus();
return false; return false;
} }
else else
{ {
$("#description_notice_span").text("填写正确"); $("#description_notice_span").text("<%= l(:label_field_correct)%>");
$("#description_notice_span").css('color','#008000'); $("#description_notice_span").css('color','#008000');
return true; return true;
} }

4
app/views/projects/_join_project.html.erb
Unescape View File

@ -48,7 +48,7 @@
<div class="C" > <div class="C" >
<div class="C_top"> <div class="C_top">
<h2><%= l('project.join.title')%></h2> <h2><%= l('project.join.title')%></h2>
<p><%= l('project.join.description')%></p> <p style="width: 385px"><%= l('project.join.description')%></p>
</div> </div>
<div class="C_form"> <div class="C_form">
<%= form_tag({:controller => 'applied_project', <%= form_tag({:controller => 'applied_project',
@ -64,7 +64,7 @@
<input class=" width190" name="project_id" id="project_id" type="text" value="" > <input class=" width190" name="project_id" id="project_id" type="text" value="" >
<input type="text" style="display: none"/> <input type="text" style="display: none"/>
</li> </li>
<li class="mB5"><%= l('project.join.id.tips')%></li> <li class="mB5" style="width: 260px"><%= l('project.join.id.tips')%></li>
<li> <li>
<a href="#" class="btn" style="margin-left: 50px;" onclick="submit_form(this);"> <a href="#" class="btn" style="margin-left: 50px;" onclick="submit_form(this);">
<%= l(:label_apply_project) %> <%= l(:label_apply_project) %>

2
app/views/projects/feedback.html.erb
Unescape View File

@ -1,5 +1,5 @@
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2">用户反馈</h2> <h2 class="project_h2"><%= l(:label_project_tool_response)%></h2>
</div> </div>
<% reply_allow = JournalsForMessage.create_by_user? User.current %> <% reply_allow = JournalsForMessage.create_by_user? User.current %>
<%= stylesheet_link_tag 'css', :media => 'all' %> <%= stylesheet_link_tag 'css', :media => 'all' %>

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

@ -35,7 +35,7 @@
<%= link_to_user(e.user)%> <%= link_to_user(e.user)%>
<%= l(:label_project_new) %> <%= l(:label_active_create_project) %>：
<%= link_to e.project.name %> <%= link_to e.project.name %>
<strong> !</strong> <strong> !</strong>
</td> </td>

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

@ -18,7 +18,7 @@
<% end %> <% end %>
</div> </div>
<p style=" word-wrap: break-word; word-break: break-all"> <p style=" word-wrap: break-word; word-break: break-all">
(<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo| (<%= l(:label_all_revisions) %>：<%= @repositories.sort.collect {|repo|
link_to h(repo.name), link_to h(repo.name),
{:controller => 'repositories', :action => 'show', {:controller => 'repositories', :action => 'show',
:id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil}, :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil},

14
config/locales/commons/en.yml
Unescape View File

@ -181,6 +181,13 @@ en:
label_reply: Reply label_reply: Reply
label_field_correct: correct input
label_title_blank: Title cannot be blank!
label_title_long: The title should be less than 60 characters
label_descripition_blank: Description cannot be blank!
label_subject_empty: Subject cannot be blank!
label_anonymous: Anonymous #作业和留言 模块 label_anonymous: Anonymous #作业和留言 模块
text_are_you_sure: Are you sure? #js 提示 text_are_you_sure: Are you sure? #js 提示
@ -217,7 +224,8 @@ en:
label_preview: Preview label_preview: Preview
button_update: Update button_update: Update
button_copy: Copy button_copy: Copy
button_check_all: Check all
button_uncheck_all: Uncheck all
# #
# Trustie上传头像模块 # Trustie上传头像模块
@ -361,8 +369,8 @@ en:
# 新闻 # 新闻
# #
label_news: News label_news: News
label_news_description: Track the latest activities of projects, and obtain the latest information！ label_news_description: "Track the latest activities of projects, and obtain the latest information"
label_news_title_tips: "(less than 60 characters)"
# #
# Trustie # Trustie
# #

10
config/locales/commons/zh.yml
Unescape View File

@ -190,6 +190,11 @@ zh:
text_are_you_sure_out: 你确定要退出该课程吗？ text_are_you_sure_out: 你确定要退出该课程吗？
text_are_you_sure_out_group: 你确定要退出该分班吗？ text_are_you_sure_out_group: 你确定要退出该分班吗？
label_field_correct: 填写正确
label_title_blank: 标题不能为空
label_title_long: 标题超过60个字符
label_descripition_blank: 描述不能为空
label_subject_empty: 主题不能为空
label_no_data: 没有任何数据可供显示 label_no_data: 没有任何数据可供显示
# 项目、课程、用户公用 # 项目、课程、用户公用
@ -222,6 +227,9 @@ zh:
label_preview: 预览 label_preview: 预览
button_update: 更新 button_update: 更新
button_copy: 复制 button_copy: 复制
button_check_all: 全选
button_uncheck_all: 清除
# #
# Trustie上传头像模块 # Trustie上传头像模块
@ -367,6 +375,8 @@ zh:
# #
label_news: 新闻 label_news: 新闻
label_news_description: 实时了解项目的最新动态，掌握最新项目咨询！ label_news_description: 实时了解项目的最新动态，掌握最新项目咨询！
label_news_title_tips: (60个字符以内)
# #
# #

7
config/locales/en.yml
Unescape View File

@ -146,7 +146,7 @@ en:
field_watcher: Watcher field_watcher: Watcher
field_content: Content field_content: Content
field_group_by: Group results by field_group_by: Group results by
field_sharing: Sharinglable_hot_course
field_parent_issue: Parent task field_parent_issue: Parent task
field_member_of_group: "Assignee's group" field_member_of_group: "Assignee's group"
field_assigned_to_role: "Assignee's role" field_assigned_to_role: "Assignee's role"
@ -334,7 +334,7 @@ en:
label_contest_modify_settings: Configuration label_contest_modify_settings: Configuration
bale_news_notice: Add a notification bale_news_notice: Add a notification
label_field_correct: correct input
label_work_description_lengthlimit: less than 500 characters label_work_description_lengthlimit: less than 500 characters
label_create_new_projects: Create a project label_create_new_projects: Create a project
label_work_scores_people: The total number of users given scores label_work_scores_people: The total number of users given scores
@ -749,8 +749,7 @@ en:
label_gantt_progress_line: Progress line label_gantt_progress_line: Progress line
button_check_all: Check all
button_uncheck_all: Uncheck all
button_collapse_all: Collapse all button_collapse_all: Collapse all
button_expand_all: Expand all button_expand_all: Expand all

25
config/locales/projects/en.yml
Unescape View File

@ -146,7 +146,6 @@ en:
label_issue_new: New issue label_issue_new: New issue
# 自定义查询 # 自定义查询
label_query_plural: Custom queries label_query_plural: Custom queries
label_query_new: New query label_query_new: New query
label_my_queries: My custom queries label_my_queries: My custom queries
@ -216,11 +215,14 @@ en:
label_post_by: "Started by " label_post_by: "Started by "
label_post_by_time: "on " label_post_by_time: "on "
label_short_reply: "RE:" label_short_reply: "RE:"
# #
# 项目托管平台 # 项目托管平台
# #
# 资源库 # 动态
# #
label_active_create_project: "created project"
# #
@ -228,7 +230,7 @@ en:
# #
# 版本库 # 版本库
# #
lael_all_revisions: All revisions： label_all_revisions: "All revisions"
label_latest_revision: Latest revision label_latest_revision: Latest revision
label_latest_revision_plural: Latest revisions label_latest_revision_plural: Latest revisions
label_view_revisions: View revisions label_view_revisions: View revisions
@ -245,12 +247,18 @@ en:
label_repository_plural: Repository label_repository_plural: Repository
enumeration_activities: Activity type enumeration_activities: Activity type
# 项目工具
text_select_project_modules: "Select tools 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
# 项目成员
label_approve: Approve
label_refusal: Refusal
# #
# 项目托管平台 # 项目托管平台
# #
@ -302,6 +310,13 @@ en:
id: id:
label: "Project ID:" label: "Project ID:"
tips: "Project ID is the unique number for each project" tips: "Project ID is the unique number for each project"
tips:
notexist: The project does not exist
repeat: Please do not apply to join the project again
success: Application successfully
has: You has joined in the project
fail: Application failure
# #
# 项目托管平台 # 项目托管平台
@ -334,5 +349,5 @@ en:
# #
# 项目配置 # 项目配置
# #
label_approve: Approve field_sharing: Sharinglable
label_refusal: Refusal label_title_code_review: Review

26
config/locales/projects/zh.yml
Unescape View File

@ -271,16 +271,16 @@ zh:
# #
# 项目托管平台 # 项目托管平台
# #
# 资源库 # 动态
# #
label_active_create_project: "创建了项目"
# #
# 项目托管平台 # 项目托管平台
# #
# 版本库 # 版本库
# #
label_all_revisions: "所有版本：" label_all_revisions: "所有版本"
label_latest_revision: 最近的修订版本 label_latest_revision: 最近的修订版本
label_latest_revision_plural: 最近的修订版本 label_latest_revision_plural: 最近的修订版本
label_view_revisions: 查看修订 label_view_revisions: 查看修订
@ -296,12 +296,17 @@ zh:
label_repository_plural: 版本库 label_repository_plural: 版本库
enumeration_activities: 活动（时间跟踪） enumeration_activities: 活动（时间跟踪）
# 项目工具
text_select_project_modules: '请选择此项目可以使用的模块：' text_select_project_modules: '请选择此项目可以使用的模块：'
project_module_issue_tracking: 问题跟踪 project_module_issue_tracking: 问题跟踪
project_moule_boards_show: 项目论坛 project_moule_boards_show: 项目论坛
project_module_time_tracking: 时间跟踪 project_module_time_tracking: 时间跟踪
project_module_course: 课程 #project_module_course: 课程
# 成员配置
label_approve: 批准
label_refusal: 拒绝
# #
@ -354,6 +359,13 @@ zh:
id: id:
label: "项目ID：" label: "项目ID："
tips: "项目ID是所在项目网址中显示的序号" tips: "项目ID是所在项目网址中显示的序号"
tips:
notexist: 您申请的项目不存在
repeat: 请勿重复申请加入该项目
success: 申请成功
has: 您已加入该项目
fail: 申请失败
# #
@ -385,5 +397,5 @@ zh:
# #
# 项目配置 # 项目配置
# #
label_approve: 批准 field_sharing: 共享
label_refusal: 拒绝 label_title_code_review: 代码评审

2
config/locales/users/en.yml
Unescape View File

@ -24,7 +24,7 @@ en:
# #
# 左边栏 # 左边栏
# #
label_user_edit: Edit label_user_edit: Edit information
label_user_grade: Score label_user_grade: Score
label_user_score: Total label_user_score: Total

9
config/locales/zh.yml
Unescape View File

@ -170,7 +170,7 @@ zh:
field_content: 内容 field_content: 内容
field_group_by: 根据此条件分组 field_group_by: 根据此条件分组
field_sharing: 共享
field_parent_issue: 父任务 field_parent_issue: 父任务
field_member_of_group: 用户组的成员 field_member_of_group: 用户组的成员
@ -839,8 +839,7 @@ zh:
label_user_search: "搜索用户：" label_user_search: "搜索用户："
label_mobile_version: "移动端版本管理" label_mobile_version: "移动端版本管理"
button_check_all: 全选
button_uncheck_all: 清除
button_create_and_continue: 创建并继续 button_create_and_continue: 创建并继续
button_test: 测试 button_test: 测试
@ -1762,7 +1761,7 @@ zh:
label_user_login_softapplication_board: 您还没有登录，请登录后参与应用评价。 label_user_login_softapplication_board: 您还没有登录，请登录后参与应用评价。
label_contest_description_no: 暂无描述。 label_contest_description_no: 暂无描述。
label_no_contest_softapplication: 暂无参赛应用 label_no_contest_softapplication: 暂无参赛应用
label_field_correct: 填写正确
label_button_ok: 确定 label_button_ok: 确定
label_tags_contest: 竞赛标签 label_tags_contest: 竞赛标签
label_tags_contest: 竞赛名称 label_tags_contest: 竞赛名称
@ -1890,7 +1889,7 @@ zh:
label_contest_news_condition: 竞赛描述超过5000个汉字 label_contest_news_condition: 竞赛描述超过5000个汉字
label_no_contest_news_title: 竞赛标题不能为空 label_no_contest_news_title: 竞赛标题不能为空
label_contest_news_title_condition: 竞赛标题超过255个汉字 label_contest_news_title_condition: 竞赛标题超过255个汉字
label_subject_empty: 主题不能为空
label_course_organizers: 开设单位 label_course_organizers: 开设单位
label_teacher_score: 教师评分 label_teacher_score: 教师评分
label_student_score: 学生评分 label_student_score: 学生评分

2
plugins/redmine_code_review/app/views/code_review/index.html.erb
Unescape View File

@ -1,5 +1,5 @@
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2">代码审查</h2> <h2 class="project_h2"><%= l(:label_title_code_review)%></h2>
</div> </div>
<% <%
# Code Review plugin for Redmine # Code Review plugin for Redmine

2
public/javascripts/attachments.js
Unescape View File

@ -15,7 +15,7 @@ function postUpMsg(attachmentId)
function reload(fileSpan) { function reload(fileSpan) {
fileSpan.remove(); fileSpan.remove();
$('#upload_file_count').html("未上传文件"); $('#upload_file_count').html("<%= l(:label_no_file_uploaded)%>");
$old_file = $("#_file"); $old_file = $("#_file");
$new_file = $old_file.clone(true); $new_file = $old_file.clone(true);
$old_file.replaceWith($new_file); $old_file.replaceWith($new_file);

2
public/stylesheets/welcome.css
Unescape View File

@ -451,7 +451,7 @@ a.attachments_list_color {
} }
/*帖子的各种属性*/ /*帖子的各种属性*/
.memo_activity .memo_attr{ .memo_activity .memo_attr{
margin-left: 20px; margin-left: 2px;
} }
/*帖子的时间*/ /*帖子的时间*/
.memo_activity .memo_timestamp{ .memo_activity .memo_timestamp{

Write Preview
Loading…
Cancel
Save