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

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

Browse Source
memcached_alan
sw 10 years ago
parent 312d7660b2 88449d8a1c
commit d18e9ff66b
15 changed files with 83 additions and 491 deletions
Show Stats Download Patch File Download Diff File

3
app/controllers/projects_controller.rb
Unescape View File

@ -334,8 +334,7 @@ class ProjectsController < ApplicationController
end
def send_mail_to_member
if !params[:mail].nil? && User.find_by_mail(params[:mail].to_s).nil?
if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
email = params[:mail]
Mailer.send_invite_in_project(email, @project, User.current).deliver
@is_zhuce =false

2
app/helpers/files_helper.rb
Unescape View File

@ -48,7 +48,7 @@ module FilesHelper
def courses_check_box_tags(name,courses,current_course,attachment)
s = ''
courses.each do |course|
if !(attachment.container_type && attachment.container_id == course.id) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course)
if !course_contains_attachment?(course,attachment) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course)
s << "<label>#{ check_box_tag name, course.id, false, :id => nil } #{h course.name}</label>&nbsp;[#{get_course_term course}]<br/>"
end
end

12
app/views/layouts/base_projects.html.erb
Unescape View File

@ -119,9 +119,14 @@
<% end %>
</div>
<div class="pr_info_foot">
<%= l(:label_member) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to "#{@project.members.count}", project_member_path(@project) %></a>）
<span>| </span><%= l(:label_user_watcher) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %></a>）
<span>| </span><%= l(:project_module_attachments) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to "#{@project.attachments.count}", project_files_path(@project) %></a>）</div>
<%= l(:label_member) %>（<span class="info_foot_num" >
<%= link_to "#{@project.members.count}", project_member_path(@project), :style => "color:#3CA5C6;font-weight:bold" %></span>）
<span>| </span>
<%= l(:label_user_watcher) %>（<span class="info_foot_num">
<%= link_to "#{@project.watcher_users.count}", :controller=>"projects", :action=>"watcherlist", :id => @project, :style => "color:#3CA5C6;font-weight:bold" %></span>）
<span>| </span>
<%= l(:project_module_attachments) %>（<span class="info_foot_num" >
<%= link_to "#{@project.attachments.count}", project_files_path(@project), :style => "color:#3CA5C6;font-weight:bold" %></a>）</div>
<div class="cl"></div>
</div><!--项目信息 end-->
@ -135,6 +140,7 @@
<% end %>
<div class="subNav">
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
<span class="subnav_num">(<%= ForgeActivity.where("project_id = ?", @project.id).count %>)</span>
</div>
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
<div class="subNav">

11
app/views/projects/invite_members_by_mail.html.erb
Unescape View File

@ -1,3 +1,12 @@
<script>
function ismail(mail) {
var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
if (filter.test(mail)) return true;
else {
alert('您的电子邮件格式不正确');
return false;}
}
</script>
<div class="project_r_h">
<h2 class="project_h2">邀请加入</h2>
</div>
@ -9,7 +18,7 @@
<div class="box_main">
<h3 class="box_h3">发送邮件邀请新用户</h3>
<p class="box_p">
输入好友邮箱地址，Trustie帮您免费发送！
输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
</p>
<div id="is_registed">
<%= render :partial => 'regested', locals: { :isregisted => false} %>

12
config/locales/account/en.yml
Unescape View File

@ -31,13 +31,13 @@ en:
#
lable_user_name: Username
label_login_prompt: Email/Trustie account
label_stay_logged_in: "Keep me signed in"
label_stay_logged_in: "Remember me"
label_password_lost: "Forget password？"
button_login: Login
# account_controller中判断用户名或密码输入有误的提示信息
notice_account_invalid_creditentials: "Invalid user or password."
# account_controller中判断未激活的提示信息
notice_account_invalid_creditentials_new: "Please check your email to activate your account."
notice_account_invalid_creditentials_new: "Please check your email to activate your account. Email verification helps our support team verify ownership if you lose account access and allows you to receive all the notifications you ask for. "
#
@ -81,10 +81,10 @@ en:
#
# 激活
#
label_regiter_account: Registering for an account
label_email_valid: E-mail activation
notice_email_register_time: "Please click on the link in the email to continue to complete the registration within 24 hours"
label_regiter_account: Sign up for Trustie
label_email_valid: Email verification
notice_email_register_time: "Please click the link in verification email to complete the registration within 24 hours."
notice_email_arrival: "An activation email has been sent to the email address you register."
label_check_email: "Now check your email"
label_mail_resend: "Resend the activation email"
label_mail_resend: "Resend verification email"
notice_account_activated: "Your Trustie account has been activated. You can now sign in."

4
config/locales/account/zh.yml
Unescape View File

@ -39,7 +39,7 @@ zh:
# account_controller中判断用户名或密码输入有误的提示信息
notice_account_invalid_creditentials: "无效的用户名或密码"
# account_controller中判断未激活的提示信息
notice_account_invalid_creditentials_new: "您还未到邮箱激活"
notice_account_invalid_creditentials_new: "您还未到邮箱激活。如果您丢失帐户，电子邮件验证帮助我们的支持团队验证帐户的所有权，并允许您接收所有您要求的通知。"
#
@ -84,7 +84,7 @@ zh:
#
label_regiter_account: 注册帐号
label_email_valid: 邮箱激活
notice_email_register_time: 请在24小时内点击邮件中的链接继续完成注册
notice_email_register_time: 请在24小时内点击邮件中的链接完成注册
notice_email_arrival: 邮件已发送到邮箱
label_check_email: 立即查收邮件
label_mail_resend: 重新发送激活邮件

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

@ -188,7 +188,13 @@ en:
label_anonymous: Anonymous #作业和留言 模块
text_are_you_sure: Are you sure? #js 提示
# 项目、课程、用户公用
label_settings: Settings
label_information_plural: Information
label_member_plural: Members
#
# Trustie按钮类
#

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

@ -6,166 +6,6 @@ zh:
direction: ltr
jquery:
locale: "zh-CN"
date:
formats:
# Use the strftime parameters for formats.
# When no format has been given, it uses default.
# You can provide other formats here if you like!
default: "%Y-%m-%d"
short: "%b%d日"
long: "%Y年%b%d日"
zh_date:
formats:
default: "%Y年%m月%d日"
day_names: [星期天, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
# Don't forget the nil at the beginning; there's no such thing as a 0th month
month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
# Used in date_select and datime_select.
order:
- :year
- :month
- :day
errors:
messages:
email_verifier:
email_not_real: 必须指定一个真实的邮箱地址
out_of_mail_server: 指向了一个已停用的邮箱服务器
no_mail_server: 域名地址没有邮件功能
failure: 邮箱地址不能被验证
exception: 邮箱不能发送成功
time:
formats:
default: "%Y年%b%d日 %A %H:%M:%S"
time: "%H:%M"
short: "%b%d日 %H:%M"
long: "%Y年%b%d日 %H:%M"
am: "上午"
pm: "下午"
datetime:
distance_in_words:
half_a_minute: "半分钟"
less_than_x_seconds:
one: "1秒内"
other: "少于 %{count} 秒"
x_seconds:
one: "1秒"
other: "%{count} 秒"
less_than_x_minutes:
one: "1分钟内"
other: "少于 %{count} 分钟"
x_minutes:
one: "1分钟"
other: "%{count} 分钟"
about_x_hours:
one: "大约1小时"
other: "大约 %{count} 小时"
x_hours:
one: "1 小时"
other: "%{count} 小时"
x_days:
one: "1天"
other: "%{count} 天"
about_x_months:
one: "大约1个月"
other: "大约 %{count} 个月"
x_months:
one: "1个月"
other: "%{count} 个月"
about_x_years:
one: "大约1年"
other: "大约 %{count} 年"
over_x_years:
one: "超过1年"
other: "超过 %{count} 年"
almost_x_years:
one: "将近 1 年"
other: "将近 %{count} 年"
number:
# Default format for numbers
format:
separator: "."
delimiter: ""
precision: 3
human:
format:
delimiter: ""
precision: 3
storage_units:
format: "%n %u"
units:
byte:
one: "Byte"
other: "Bytes"
kb: "KB"
mb: "MB"
gb: "GB"
tb: "TB"
# Used in array.to_sentence.
support:
array:
sentence_connector: "和"
skip_last_comma: false
activerecord:
errors:
template:
header:
one: "由于发生了一个错误 %{model} 无法保存"
other: "%{count} 个错误使得 %{model} 无法保存"
messages:
inclusion: "不包含于列表中"
exclusion: "是保留关键字"
invalid: "是无效的"
confirmation: "与确认值不匹配"
accepted: "必须是可被接受的"
empty: "不能留空"
blank: "不能为空字符"
too_long: "过长（最长为 %{count} 个字符）"
too_short: "过短（最短为 %{count} 个字符）"
wrong_length: "长度非法（必须为 %{count} 个字符）"
taken: "已经被使用"
not_a_number: "不是数字"
not_a_date: "不是合法日期"
greater_than: "必须大于 %{count}"
greater_than_or_equal_to: "必须大于或等于 %{count}"
equal_to: "必须等于 %{count}"
less_than: "必须小于 %{count}"
less_than_or_equal_to: "必须小于或等于 %{count}"
odd: "必须为单数"
even: "必须为双数"
greater_than_start_date: "必须在起始日期之后"
not_same_project: "不属于同一个项目"
circular_dependency: "此关联将导致循环依赖"
cant_link_an_issue_with_a_descendant: "问题不能关联到它的子任务"
groupname_repeat: "该班名已存在"
attachment_all: "全部"
attachment_sufix_browse: "文件类型"
attachment_browse: "内容类型"
attachment_type: '分类'
general_text_No: '否'
general_text_Yes: '是'
general_text_no: '否'
general_text_yes: '是'
general_lang_name: 'Simplified Chinese (简体中文)'
general_csv_separator: ','
general_csv_decimal_separator: '.'
general_csv_encoding: gb18030
general_pdf_encoding: gb18030
general_first_day_of_week: '7'
actionview_instancetag_blank_option: 请选择
#
@ -194,6 +34,11 @@ zh:
text_are_you_sure: 您确定要删除吗？ #js 提示
# 项目、课程、用户公用
label_settings: 配置
label_information_plural: 信息
label_member_plural: 成员
#
# Trustie按钮类
#

49
config/locales/en.yml
Unescape View File

@ -331,14 +331,8 @@ en:
project_module_issue_tracking: Issue tracking
project_module_time_tracking: Time tracking
project_module_news: News
project_module_documents: Documents
project_module_files: Files
project_module_wiki: Wiki
project_module_boards: Forums
project_module_calendar: Calendar
project_module_gantt: Gantt
project_module_boards: Forums
# edit by meng
lable_hot_course: Hot Courses
label_course_join_student: Join a course
@ -382,8 +376,7 @@ en:
label_commit_limit: Expired but can submit your work
# steam the student
label_current_group: Current group
# DTS Test tool
label_module_share: DTS Test tool
label_user_plural: Users
@ -438,7 +431,6 @@ en:
label_role_non_member: Non member
label_member: Members
label_member_new: New member
label_member_plural: Members
label_tracker: Tracker
label_tracker_plural: Trackers
label_tracker_new: New tracker
@ -447,15 +439,12 @@ en:
label_issue_status_plural: Issue statuses
label_issue_status_new: New status
label_issue_category: Issue category
label_issue_category_plural: Issue categories
label_issue_category_new: New category
label_custom_field: Custom field
label_custom_field_plural: Custom fields
label_custom_field_new: New custom field
label_enumerations: Enumerations
label_enumeration_new: New value
label_information: Information
label_information_plural: Information
label_please_login: Please log in
label_home: Home
label_my_page: My page
@ -513,7 +502,6 @@ en:
label_overview: Activities
label_version: Version
label_version_new: New version
label_version_plural: Versions
label_close_versions: Close completed versions
label_confirmation: Confirmation
label_export_to: 'Also available in:'
@ -613,7 +601,7 @@ en:
label_repository_no: Have no repository？
label_repository_new_repos: New repository
#end
label_repository_plural: Repositories
label_browse: Browse
label_branch: Branch
label_revision: Revision
@ -717,7 +705,6 @@ en:
label_feeds_access_key: RSS access key
label_missing_feeds_access_key: Missing a RSS access key
label_feeds_access_key_created_on: "RSS access key created %{value} ago"
label_module_plural: Modules
label_added_time_by: "Added by %{author} %{age} ago"
label_updated_time_by: "Updated by %{author} %{age} ago"
label_jump_to_a_project: Jump to a project...
@ -973,7 +960,6 @@ en:
enumeration_issue_priorities: Issue priorities
enumeration_doc_categories: Document categories
enumeration_activities: Activities
enumeration_system_activity: System Activity
description_filter: Filter
description_search: Searchfield
@ -1213,7 +1199,6 @@ en:
label_welcome_my_respond: Please leave your comments and suggestions here！
label_no_current_fans: The user has no fans now
label_no_current_watchers: The user hasn't watched others
label_project_tool_response: Response
label_course_feedback: Feedback
@ -1465,24 +1450,9 @@ en:
label_issue_feedback_activities: Question&Feedback
label_more_information: More...
label_release_time: Release-time
label_question_sponsor: Sponsor
label_final_reply: Final-reply
label_weixin: WeiXin
# 项目托管平台
label_work_quantity: work
label_contest_work: Competition work
@ -1596,22 +1566,13 @@ en:
label_bidding_user_studentname: name
# label_organizers: Organizer
# label_organizers_information: National Key Laboratory of Parallel and Distributed Processing, NUDT
# label_organizers_information_institute: Department of Computer Sciencer and Technology
# label_copyright: Copyright
# label_contact_us: Contact us
# label_record: 湘ICP备09019772
label_check_comment: Check comment
label_notification: Notification
label_must_answer: Will answer
label_poll_title: The questionnaire survey _ questionnaire page
label_question_number: 'question %{question_number}:'
label_complete_question: The answer has been completed
#end
#end
# ajax异步验证
modal_valid_passing: can be used.
@ -1642,8 +1603,6 @@ en:
label_course_empty_select: You have not selected course！
label_enterprise_page_made: enterprise_page
label_add_tag: Add Tag
#api
label_recently_updated_notification: Recently updated notification
label_recently_updated_homework: Recently updated the homework

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

@ -26,8 +26,6 @@ en:
label_my_account: My account
label_my_photo: My photo
label_information_plural: Information
label_account_identity_teacher: Teacher
label_account_identity_student: Student

2
config/locales/my/zh.yml
Unescape View File

@ -24,8 +24,6 @@ zh:
label_my_account: 我的帐号
label_my_photo: 我的头像
label_information_plural: 信息
label_account_identity_choose: --请选择身份--
label_account_identity_teacher: 教师

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

@ -52,10 +52,31 @@ en:
project_module_repository: Repository
project_module_create_repository: New Repository
project_module_news: News
project_module_wiki: Wiki
project_module_code_review: Code Review
project_module_calendar: Calendar
project_module_gantt: Gantt
project_module_documents: Documents
label_project_tool_response: Response
label_module_share: DTS Test Tool
label_project_overview: "Profile:"
label_expend_information: More Information
#
# 项目托管平台
#
# 项目配置
#
label_module_plural: Modules
label_version_plural: Versions
label_issue_category_plural: Issue categories
label_repository_plural: Repositories
enumeration_activities: Activities
#
# 项目托管平台
@ -66,7 +87,7 @@ en:
field_name: Name
field_description: Description
field_identifier: Identifier
field_enterprise_name: Eterprise
field_enterprise_name: Enterprise
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."

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

@ -15,11 +15,6 @@ zh:
label_join_project: 加入项目
#
# 项目托管平台主页
#
@ -60,7 +55,6 @@ zh:
project_module_repository: 版本库
project_module_create_repository: 创建版本库
label_settings: 配置
project_module_news: 新闻
project_module_wiki: Wiki
project_module_code_review: 代码审查
@ -80,10 +74,13 @@ zh:
#
# 项目配置
#
label_module_plural: 模块
label_version_plural: 版本
label_issue_category_plural: 问题类别
label_repository_plural: 版本库
enumeration_activities: 活动（时间跟踪）
#
# 项目托管平台
#

257
config/locales/zh.yml
View File

File diff suppressed because it is too large Load Diff

7
plugins/redmine_code_review/config/locales/zh.yml
Unescape View File

@ -55,10 +55,11 @@ zh:
label_auto_assign_settings: 自动分派
label_candidates_of_reviewer: 候选评审员
label_auto_assignment_filters: 过滤器
auto_assign_filter_expression: '路径(Regular expression:ex. "/src/.*\.java$")'
auto_assign_filter_expression: '路径(正则表达式:ex. "/src/.*\.java$")'
auto_assign_filter_assign: 指派
auto_assign_filter_drop: 移除
label_parent_suggestion: Maybe "%{issue_id}" ?
label_parent_suggestion: "可能是 '%{issue_id}' ?"
label_assign_review: "分配给"
label_assign_review: "分配给"
field_tracker_in_review_dialog: "允许创建代码审查时选择跟踪者?"
Write Preview
Loading…
Cancel
Save