- | <%= l(:label_bid_plural)%> |
+ <%= l(:label_call_list)%> |
<% if User.current.logged? %>
- <%= toggle_link l(:button_new_bid), 'put-bid-form', {:focus => 'project_id'} %>
+ <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %>
<% end %> |
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 6b6bfcf86..515e43cdc 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -119,7 +119,7 @@
<% if @project.identifier == 'trustie' %>
<%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
- <%= link_to l(:label_user_response) ,project_feedback_path(@project) %>
+ <%= link_to l(:label_project_tool_response) ,project_feedback_path(@project) %>
|
<% else %>
<% end %>
diff --git a/app/views/praise_tread/_praise_tread.html.erb b/app/views/praise_tread/_praise_tread.html.erb
index b6dee9319..fbdb6f8b9 100644
--- a/app/views/praise_tread/_praise_tread.html.erb
+++ b/app/views/praise_tread/_praise_tread.html.erb
@@ -8,14 +8,14 @@
<% if @flag == 1 %>
- | <%= image_tag "/images/praise_tread/praise_true.png" ,:title => '已顶！'%> |
+ <%= image_tag "/images/praise_tread/praise_true.png" ,:title => l(:label_issue_praise_over) %> |
| <%= get_praise_num(obj)%> |
- | <%= image_tag "/images/praise_tread/tread_false.png",:title => "已评价！" %> |
+ <%= image_tag "/images/praise_tread/tread_false.png",:title => l(:label_issue_appraise_over) %> |
@@ -23,14 +23,14 @@
- | <%= image_tag "/images/praise_tread/praise_false.png", :title => '已评价！'%> |
+ <%= image_tag "/images/praise_tread/praise_false.png", :title => l(:label_issue_appraise_over) %> |
| <%= get_praise_num(obj)%> |
- | <%= image_tag "/images/praise_tread/tread_true.png",:title => '已踩！' %> |
+ <%= image_tag "/images/praise_tread/tread_true.png",:title => l(:label_issue_tread_over) %> |
<% end %>
@@ -39,14 +39,14 @@
- | <%= link_to image_tag("/images/praise_tread/praise_false.png",:title => '好问题，顶！'),
+ | <%= link_to image_tag("/images/praise_tread/praise_false.png",:title => l(:label_issue_praise)),
:controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class%> |
| <%= get_praise_num(obj)%> |
- | <%= link_to image_tag("/images/praise_tread/tread_false.png",:title => '烂问题，踩！'),:controller=>"praise_tread",
+ | <%= link_to image_tag("/images/praise_tread/tread_false.png",:title => l(:label_issue_tread)),:controller=>"praise_tread",
:action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class %> |
diff --git a/app/views/tags/_show_users.html.erb b/app/views/tags/_show_users.html.erb
index 552b7b6ba..81f03c053 100644
--- a/app/views/tags/_show_users.html.erb
+++ b/app/views/tags/_show_users.html.erb
@@ -3,7 +3,7 @@
<% users_results.each do |user| %>
- <%= l(:label_username) %><%= link_to ("#{user.firstname+user.lastname}"),
+ <%= l(:label_tags_user_name) %><%= link_to ("#{user.firstname+user.lastname}"),
:controller => "users",:action => "show",:id => user.id%>
<%= l(:label_tags_user_mail) %><%= mail_to(h(user.mail)) %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 8e65d92eb..916e1bb65 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -13,13 +13,13 @@
<% end %>
<% content_for :content do %>
-
Search Results
+
<%= l(:label_tags_search_result) %>
<%= l(:label_tags_numbers) %>
<%= l(:label_issue_plural) %>(<%= @issues_tags_num %>)|
<%= l(:label_project_plural) %>(<%= @projects_tags_num %>)|
<%= l(:label_user_plural) %>(<%= @users_tags_num %>)|
- <%= l(:label_bid_plural)%>(<%= @bids_tags_num %>)
+ <%= l(:label_tags_call)%>(<%= @bids_tags_num %>)
<%= render :partial => "tag_search_results",:locals => {:issues_results => @issues_results,
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9e8911505..aea34195e 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -13,9 +13,9 @@
<% when 'Bid' %>
<% if e.user == User.current%>
- | <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_bid_plural)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> |
+ <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> |
<% else %>
- <%= link_to(h(e.user), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_bid_plural)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> |
+ <%= link_to(h(e.user), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> |
<% end %>
diff --git a/app/views/users/watch_bids.html.erb b/app/views/users/watch_bids.html.erb
index b0c29c9f1..90823826b 100644
--- a/app/views/users/watch_bids.html.erb
+++ b/app/views/users/watch_bids.html.erb
@@ -18,7 +18,7 @@
| <%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%> |
- (<%= bid.biding_projects.count%>)<%= l(:label_competitive_bidding) %> |
+ (<%= bid.biding_projects.count%>)<%= l(:label_biding_project) %> |
(<%= bid.commit %>)<%= l(:label_responses) %> |
(<%= bid.watcher_users.count%>)<%= l(:label_followers) %> |
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index dc3a7ff4c..3004ad06e 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -253,12 +253,12 @@ software development and software crowdsourcing.
- | <%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "我要反馈", :onfocus => "clearInfo('new_form_project_message','我要反馈')", :onblur => "showInfo('new_form_project_message','我要反馈')", :style => "resize: none;", :class => 'noline'%> |
+ <%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "#{l(:label_welcome_my_respond)}", :onfocus => "clearInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')", :onblur => "showInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')", :style => "resize: none;", :class => 'noline'%> |
- | <%= submit_tag l(:label_responses), :name => nil , :class => "bid_btn" %> |
+ <%= submit_tag l(:button_submit), :name => nil , :class => "bid_btn" %> |
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9f7fa1990..237e3ad4a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -653,7 +653,7 @@ en:
label_query_new: New query
label_my_queries: My custom queries
label_filter_add: Add filter
- label_filter_plural: Filters
+ label_filter_plural: Query condition
label_equals: is
label_not_equals: is not
label_in_less_than: in less than
@@ -913,8 +913,8 @@ en:
button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
button_add: Add
button_change: Change
- button_apply: Apply
- button_clear: Clear
+ button_apply: Query
+ button_clear: Cancel query
button_lock: Lock
button_unlock: Unlock
button_download: Download
@@ -1090,9 +1090,9 @@ en:
#modify by mkz
#by young
- label_requirement: Requirement
+ label_requirement: Calls
label_requirement_focus: Requirement focus
- label_developer: User
+ label_developer: Users
label_investor: Investor：
label_theme: Theme
label_logged_as_new: Current user
@@ -1137,6 +1137,10 @@ en:
button_follow: Follow
label_delete_confirm: Confirm delete？
label_more_tags: More
+ label_tags_bid: call name
+ label_tags_bid_description: call description
+ label_tags_issue_description: issue description
+ label_tags_all_objects: all objects
#fq
button_leave_meassge: Submit
@@ -1148,7 +1152,8 @@ en:
label_user_response: User responses
label_bidding_project: bid projects
button_bidding: I want to be the bid
- button_new_bid: New bid
+ button_new_bid: New call
+ label_new_call: New call
label_user_information: "My information"
#Customer added！Added by nie
@@ -1170,14 +1175,14 @@ en:
label_member_list: Member list
label_author_name: Posted by %{author_name}
label_comments_count: (%{count} numbers of comments)
- label_post_on: post on
+ label_post_on: posts on
label_find_all_comments: view all comments
label_updated_time_on: " Updated on %{value} "
- label_bid_plural: Requirement list
+ label_call_list: Call list
label_requirement_list: Requirement list
- label_competitive_bidding: biddings
- label_responses: responses
+ label_biding_project: projects
+ label_responses: comments
label_followers: followers
label_price: price：
label_RMB_sign: ￥
@@ -1242,6 +1247,7 @@ en:
label_tags_project_name: Project name：
label_tags_project_description: Project description：
label_tags_user_mail: User E-mail：
+ label_tags_user_name: User Name：
label_tags_numbers: Tag numbers：
label_max_number: Must be at most 25 characters long.
label_all_revisions: All revisions：
@@ -1249,5 +1255,27 @@ en:
label_upassword_info: The password can be shared in the group
label_how_commit_code: How to commit code：
label_how_commit_code_chinese: Chinese
- label_welcome_leave_message: Friend,the system continues to improve,with the suggestion please
+ label_welcome_leave_message: Friends！System is currently being beta，there are comments and suggestions please
label_welcome_click_me: Click me
+ label_issue_praise: Good question，praise！
+ label_issue_tread: Poor question，tread！
+ label_issue_praise_over: Praised over！
+ label_issue_tread_over: Treaded over！
+ label_issue_appraise_over: Appraised over！
+ label_welcome_my_respond: My respond：
+ 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_tags_search_result: Search Results
+ label_active_call: call
+ label_tags_call: Calls
+ label_user_extensions: Other information
+ label_boy: Man
+ label_girl: Woman
+ field_gender:Gender
+ field_birthday: Birthday
+ field_brief_introduction: Info
+ field_location: Location
+ field_occupation: Occupation
+ field_work_experience: Work experience(year)
+ field_zip_code: Zip code
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f5b33c5b4..a4720b5c0 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -619,7 +619,8 @@ zh:
label_query_plural: 自定义查询
label_query_new: 新建查询
label_filter_add: 增加过滤器
- label_filter_plural: 过滤器
+
+ label_filter_plural: 查询条件
label_equals: 等于
label_not_equals: 不等于
label_in_less_than: 剩余天数小于
@@ -853,8 +854,9 @@ zh:
button_edit_associated_wikipage: "编辑相关wiki页面: %{page_title}"
button_add: 新增
button_change: 修改
- button_apply: 应用
- button_clear: 清除
+
+ button_apply: 查询
+ button_clear: 取消查询
button_lock: 锁定
button_unlock: 解锁
button_download: 下载
@@ -1163,7 +1165,7 @@ zh:
label_post_on: 发表了
label_find_all_comments: 查看所有评论
label_updated_time_on: " 更新于 %{value} "
- label_bid_plural: 需求
+ label_call_list: 需求列表
#added by liuping
button_unfollow: 取消关注
button_follow: 关注
@@ -1174,17 +1176,7 @@ zh:
label_tags_issue_description: 问题描述
label_tags_all_objects: 所有
- label_user_extensions: 其他信息
- label_boy: 男
- label_girl: 女
- field_gender: 性别
- field_birthday: 生日
- field_brief_introduction: 个人简介
- field_location: 现住址
- field_occupation: 学校/公司
- field_work_experience: 工作经验(年)
- field_zip_code: 邮编
-
+
#fq
button_leave_meassge: 留言
label_leave_message_to: 给用户 %{name}留言
@@ -1195,7 +1187,8 @@ zh:
label_user_response: 用户反馈
label_bidding_project: 应标项目
button_bidding: 我要应标
- button_new_bid: 发布需求
+
+ label_new_call: 发布需求
label_user_information: "与我相关"
label_bid_succeed: "需求发布成功"
label_wrong_budget: 错误的金额格式
@@ -1204,8 +1197,9 @@ zh:
label_bidding_fail: 应标失败，该项目已经应标
label_requirement_list: 需求列表
- label_competitive_bidding: 应标
- label_responses: 反馈
+
+ label_biding_project: 项目
+ label_responses: 留言
label_followers: 关注
label_price: 悬赏：
label_RMB_sign: ￥
@@ -1278,6 +1272,30 @@ zh:
label_upassword_info: 该密码在项目组内可共享
label_how_commit_code: 如何提交代码：
label_how_commit_code_chinese: 中文
- label_welcome_leave_message: 朋友，系统仍在不断完善，有意见和建议请
+
+ label_welcome_leave_message: 您好！系统目前正在内测，有意见和建议请
label_welcome_click_me: 点击我
- label_mail_attention: qq邮箱可能收不到此邮件，其他邮箱如果没有收到可能在垃圾邮件中
+
+ label_issue_praise: 好问题，顶！
+ label_issue_tread: 烂问题，踩！
+ label_issue_praise_over: 已顶！
+ label_issue_tread_over: 已踩！
+ label_issue_appraise_over: 已评价！
+ label_welcome_my_respond: 我要反馈：
+ label_no_current_fans: 该用户暂无粉丝
+ label_no_current_watchers: 该用户暂未关注其他用户
+ label_project_tool_response: 用户反馈
+ label_tags_search_result: 搜索结果
+ label_active_call: 需求
+ label_tags_call: 需求
+ label_user_extensions: 其他信息
+ label_boy: 男
+ label_girl: 女
+ field_gender: 性别
+ field_birthday: 生日
+ field_brief_introduction: 个人简介
+ field_location: 现住址
+ field_occupation: 学校/公司
+ field_work_experience: 工作经验(年)
+ field_zip_code: 邮编
+