稍该国际化

app/views/issues/index.html.erb

@@ -19,7 +19,7 @@
 <div id="query_form_content" class="hide-when-print">
 	<fieldset id="filters" style="width:650px;" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
 		<legend onclick="toggleFieldset(this);">
-			<%= l(:label_filter_plural) %>
+			<%= l(:label_issue_query_condition) %>
 		</legend>
 		<div style="<%= @query.new_record? ? "" : "display: none;" %>">
 			<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
@@ -53,8 +53,8 @@
 </div>
 <p class="buttons hide-when-print">
 
-	<%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+	<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
-	<%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>	
+	<%= link_to l(:label_issue_cancel_query), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>	
 	<% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
 	<%= link_to_function l(:button_save),
 	"$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }'); submit_query_form('query_form')",

app/views/layouts/left.html.erb

@@ -1,13 +1,13 @@
 <div class="tags_left">
 	<ul>
 		<li>
-			Selected Tags
+			<%= l(:label_tags_selected) %>
 		</li>
 		<div id="selected_tags">		
 			 <%= render :partial => "selected_tags",:locals => {:selected_tags => $selected_tags }%>		
 		</div>
 		<li>
-			Related Tags
+			<%= l(:label_tags_related) %>
 		</li>
 		<div id="related_tags">		
 			 <%= render :partial => "related_tags",:locals => {:related_tags => $related_tags }%>		

app/views/tags/_show_bids.html.erb

@@ -11,8 +11,3 @@
 	<% end %>
 	<% end %>
 </div>
-<div class="pagination" style="float:right;">
-	<ul>
-		<%= pagination_links_full @obj_pages %>
-		<ul>
-</div>

app/views/tags/_show_issues.html.erb

@@ -12,8 +12,4 @@
 
 	<% end %>
 </div>
-<div class="pagination" style="float:right;">
+
-	<ul>
-		<%= pagination_links_full @obj_pages %>
-		<ul>
-</div>

app/views/tags/_show_projects.html.erb

@@ -13,8 +13,3 @@
 <% end %>
 <% end %>
 </div>
-<div class="pagination" style="float:right;">
-	<ul>
-		<%= pagination_links_full @obj_pages %>
-		<ul>
-</div>

app/views/tags/_show_users.html.erb

@@ -12,8 +12,3 @@
 	<% end %>
 	<% end %>
 </div>
-<div class="pagination" style="float:right;">
-	<ul>
-		<%= pagination_links_full @obj_pages %>
-		<ul>
-</div>

app/views/tags/_tag.html.erb

@@ -44,7 +44,7 @@
 	<%= f.text_field :name ,:id => "name",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length %>
 	<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
 	<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
-	<%= f.submit "add"%>
+	<%= f.submit "#{l(:button_project_tags_add)}"%>
 	<%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();'%>
 	<% end %>
 </div>

app/views/tags/_tag_search_results.html.erb

@@ -23,3 +23,8 @@
 	<span>no data.</span>
 	<% end %>
 </ul>
+<div class="pagination" style="float:right;">
+	<ul>
+		<%= pagination_links_full @obj_pages %>
+		<ul>
+</div>

app/views/tags/add_tag.js.erb

@@ -4,6 +4,6 @@ $('#related_tags').html('<%= j(render :partial => "related_tags",
   :locals => {:related_tags => $related_tags ,:show_flag => @show_flag })%>')
 
 $('#show_results').html('<%= j(render :partial => "tag_search_results",:locals => {:issues_results => @issues_results,
-    	 	:projects_results => @projects_results,:users_results => @users_results,:show_flag => @show_flag })%>')
+    	 	:projects_results => @projects_results,:users_results => @users_results,:bids_results => @bids_results ,:show_flag => @show_flag })%>')
   
   

app/views/tags/delete_tag.js.erb

@@ -4,5 +4,5 @@ $('#related_tags').html('<%= j(render :partial => "related_tags",
 :locals => {:related_tags => $related_tags,:show_flag => @show_flag })%>')
 
 $('#show_results').html('<%= j(render :partial => "tag_search_results",:locals => {:issues_results => @issues_results,
-:projects_results => @projects_results,:users_results => @users_results,:show_flag => @show_flag })%>')
+:projects_results => @projects_results,:users_results => @users_results,:bids_results => @bids_results ,:show_flag => @show_flag })%>')
 

app/views/tags/index.html.erb

@@ -1,11 +1,11 @@
 <% content_for :sidebar do %>
 <div>
-		<h3><strong>Selected Tags</strong></h3>
+		<h3><strong><%= l(:label_tags_selected) %></strong></h3>
 		<div id="selected_tags">		
 			 <%= render :partial => "selected_tags",:locals => {:selected_tags => $selected_tags,:show_flag => @obj_flag}%>		
 		</div>
 		
-		<h3><strong>Related Tags</strong></h3>
+		<h3><strong><%= l(:label_tags_related) %></strong></h3>
 		<div id="related_tags">		
 			 <%= render :partial => "related_tags",:locals => {:related_tags => $related_tags,:show_flag => @obj_flag }%>		
 		</div>

config/locales/en.yml

@@ -652,7 +652,7 @@ en:
   label_query_plural: Custom queries
   label_query_new: New query
   label_my_queries: My custom queries
-  label_filter_add: Add filter
+  label_filter_add: Add query condition
   label_filter_plural: Filters
   label_equals: is
   label_not_equals: is not
@@ -913,8 +913,8 @@ en:
   button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
   button_add: Add
   button_change: Change
-  button_apply: Query
+  button_apply: Apply
-  button_clear: Cancel query
+  button_clear: Clear
   button_lock: Lock
   button_unlock: Unlock
   button_download: Download
@@ -1279,3 +1279,9 @@ en:
   field_occupation: Occupation
   field_work_experience: Work experience(year)
   field_zip_code: Zip code
+  label_issue_query_condition: Query condition
+  label_issue_query: Query
+  label_issue_cancel_query: Cancel query
+  label_tags_selected: Selected Tags
+  label_tags_related: Related Tags
+  button_project_tags_add: Add

config/locales/zh.yml

@@ -618,7 +618,7 @@ zh:
   label_query: 自定义查询
   label_query_plural: 自定义查询
   label_query_new: 新建查询
-  label_filter_add: 增加过滤器
+  label_filter_add: 增加查询条件
 
   label_filter_plural: 过滤器
   label_equals: 等于
@@ -1300,4 +1300,9 @@ zh:
   field_occupation: 学校/公司
   field_work_experience: 工作经验(年)
   field_zip_code: 邮编
-
+  label_issue_query_condition: 查询条件
+  label_issue_query: 查询
+  label_issue_cancel_query: 取消查询
+  label_tags_selected: 已选标签
+  label_tags_related: 相关标签
+  button_project_tags_add: 增加