From db1815ba1a6d4edf650114dda39fec436d602b01 Mon Sep 17 00:00:00 2001 From: kaizheng <18763216000@163.com> Date: Sat, 10 Aug 2013 16:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/activities/index.html.erb | 2 +- app/views/avatar/_avatar_form.html.erb | 2 +- app/views/bids/_project_list.html.erb | 2 +- app/views/bids/add.js.erb | 2 +- app/views/bids/show_project.html.erb | 12 ++++----- app/views/praise_tread/_praise_tread.html.erb | 4 +-- app/views/projects/show.html.erb | 2 +- app/views/users/show.html.erb | 4 +-- app/views/users/show_old.html.erb | 2 +- app/views/users/user_activities.html.erb | 2 +- app/views/users/user_projects.html.erb | 2 +- app/views/welcome/index.html.erb | 14 +++++----- app/views/words/_message.html.erb | 4 +-- app/views/words/_new.html.erb | 8 +++--- config/locales/en.yml | 26 +++++++++++++++---- config/locales/zh.yml | 17 +++++++++++- 16 files changed, 68 insertions(+), 37 deletions(-) diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index 6cd867f83..ffee63249 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -67,7 +67,7 @@ - + diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb index 8c27a7e08..d194a2402 100644 --- a/app/views/avatar/_avatar_form.html.erb +++ b/app/views/avatar/_avatar_form.html.erb @@ -44,7 +44,7 @@ - 上传图片 + <%= l(:button_upload_photo) %> <%= file_field_tag 'avatar[image]', diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index e1a30f397..bba8dbf9e 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -1,7 +1,7 @@ <%= render_flash_messages %>
<%= h(e.project) if @project.nil? || @project != e.project %> 有了最新动态 <%= link_to format_activity_title(e.event_title), e.event_url %> <%= h(e.project) if @project.nil? || @project != e.project %> <%= l(:label_new_activity) %> <%= link_to format_activity_title(e.event_title), e.event_url %>

<%= format_activity_description(e.event_description) %>
- + <% if User.current.logged? %>
应标项目(<%= @bidding_project.count%>)<%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)
diff --git a/app/views/bids/add.js.erb b/app/views/bids/add.js.erb index aaed6524d..2458b343d 100644 --- a/app/views/bids/add.js.erb +++ b/app/views/bids/add.js.erb @@ -1,4 +1,4 @@ $('#bidding_project_list').html('<%= escape_javascript(render(:partial => 'project_list', :locals => {:bidding_project => @bidding_project})) %>'); $("#project_id").val("请选择项目"); -$("#bid_message").val("请输入应标理由"); +$("#bid_message").val("#{l(:label_bid_reason)} "); $("#put-bid-form").hide(); \ No newline at end of file diff --git a/app/views/bids/show_project.html.erb b/app/views/bids/show_project.html.erb index 2353026ba..c50be2f54 100644 --- a/app/views/bids/show_project.html.erb +++ b/app/views/bids/show_project.html.erb @@ -37,17 +37,17 @@ @@ -60,7 +60,7 @@ <% if User.current.logged? %> - +
<%= f.text_area 'user_message', :rows => 3, :cols => 65, :value => "给他留言", :onfocus => "clearInfo('new_form_user_message')", :onblur => "showInfo('new_form_user_message')", :style => "resize: none;", :class => 'noline'%><%= f.text_area 'user_message', :rows => 3, :cols => 65, :value => "#{l(:label_leave_a_message)}", :onfocus => "clearInfo('new_form_user_message','#{l(:label_leave_a_message)}')", :onblur => "showInfo('new_form_user_message','#{l(:label_leave_a_message)}')", :style => "resize: none;", :class => 'noline'%>
<%= f.text_field :reference_user_id, :style=>"display:none"%> diff --git a/config/locales/en.yml b/config/locales/en.yml index 1189c619d..48d912285 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1114,7 +1114,7 @@ en: label_user_watchered: "Followed" # huang添加的 label_user_newfeedback: "Leave a message" ## huang添加的 label_user_login: "Lastest login:" - label_user_mail: "Mail address:" + label_user_mail: "E-mail:" label_user_joinin: "Join date:" label_user_activities: "You have no activities,come and join us!" label_project_overview: "Overview" @@ -1147,7 +1147,7 @@ en: label_user_information: "My information" #Customer added！Added by nie - label_create_time: Creat time + label_create_time: Created time label_current_contributors: current contributors label_lines_of_code: lines of code label_since_last_commits: since last commit @@ -1165,10 +1165,10 @@ 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: post on label_find_all_comments: view all comments label_updated_time_on: " Updated on %{value} " - label_bid_plural: Requirement + label_bid_plural: Requirement list label_requirement_list: Requirement list label_competitive_bidding: biddings @@ -1185,4 +1185,20 @@ en: label_requirement_description: description：show you requirement>find Witkey to help you>pay the bargain money>check,pay and give comments label_requirement_bargain_money: pay the bargain money label_wrong_budget: The error format of money - label_wrong_date: wrong date format, input right date yyyy-mm-dd \ No newline at end of file + label_wrong_date: wrong date format, input right date yyyy-mm-dd + button_upload_photo: Upload photo + label_leave_me_message: leave message to me + label_leave_others_message: leave message to him/her + label_leave_a_message: Leave him/her a message： + label_new_activity: has new activity + label_create_project: has created + label_praise: praise + label_cancel_praise: cancel praise + label_bid_reason: Please show your reason + default_tracker_task: Task + label_create_new_projects: Create projects + label_call_for_bids: Call for bids + label_create_course: Create courses + label_news: News + label_milestone: Milestone + label_features: Features \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 2cfb9c63f..b7f63410e 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1195,4 +1195,19 @@ zh: label_deadline: 投资时限yyyy-mm-dd label_requirement_name: 为你的需求起个名字~~ label_requirement_description: 内容：说出你的需求>找到威客来帮你>支付担保金让威客开始工作>验收付款并评价 - label_requirement_bargain_money: 支付担保金额 \ No newline at end of file + label_requirement_bargain_money: 支付担保金额 + button_upload_photo: 上传图片 + label_leave_me_message: 给我留言了 + label_leave_others_message: 给他留言了 + label_leave_a_message: 给他（她）留言 + label_new_activity: 有了最新动态 + label_create_project: 创建了 + label_praise: 赞 + label_cancel_praise: 取消赞 + label_bid_reason: 请输入应标理由 + label_create_new_projects: 创建项目 + label_call_for_bids: 发布需求 + label_create_course: 创建课程 + label_news: 新闻 + label_milestone: 里程碑 + label_features: 特性 \ No newline at end of file