diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 8294c6562..b11cacd52 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -19,7 +19,7 @@
"> - <%= l(:label_filter_plural) %> + <%= l(:label_issue_query_condition) %>
"> <%= render :partial => 'queries/filters', :locals => {:query => @query} %> @@ -53,8 +53,8 @@

- <%= link_to_function l(:button_apply), '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_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %> + <%= 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')", diff --git a/app/views/layouts/left.html.erb b/app/views/layouts/left.html.erb index 0dfea4181..1f172f924 100644 --- a/app/views/layouts/left.html.erb +++ b/app/views/layouts/left.html.erb @@ -1,13 +1,13 @@

  • - Selected Tags + <%= l(:label_tags_selected) %>
    • <%= render :partial => "selected_tags",:locals => {:selected_tags => $selected_tags }%>
  • - Related Tags + <%= l(:label_tags_related) %>
    • - \ No newline at end of file diff --git a/app/views/tags/_show_issues.html.erb b/app/views/tags/_show_issues.html.erb index 32654e402..ab98cc351 100644 --- a/app/views/tags/_show_issues.html.erb +++ b/app/views/tags/_show_issues.html.erb @@ -12,8 +12,4 @@ <% end %>
- + diff --git a/app/views/tags/_show_projects.html.erb b/app/views/tags/_show_projects.html.erb index 7e706ddde..6186b6869 100644 --- a/app/views/tags/_show_projects.html.erb +++ b/app/views/tags/_show_projects.html.erb @@ -13,8 +13,3 @@ <% end %> <% end %>
- \ No newline at end of file diff --git a/app/views/tags/_show_users.html.erb b/app/views/tags/_show_users.html.erb index 81f03c053..bee210b2e 100644 --- a/app/views/tags/_show_users.html.erb +++ b/app/views/tags/_show_users.html.erb @@ -12,8 +12,3 @@ <% end %> <% end %> - \ No newline at end of file diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index 123e9ef33..0e03479fc 100644 --- a/app/views/tags/_tag.html.erb +++ b/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 %> diff --git a/app/views/tags/_tag_search_results.html.erb b/app/views/tags/_tag_search_results.html.erb index bb584c919..2ae4e66f5 100644 --- a/app/views/tags/_tag_search_results.html.erb +++ b/app/views/tags/_tag_search_results.html.erb @@ -22,4 +22,9 @@ <% else %> no data. <% end %> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/tags/add_tag.js.erb b/app/views/tags/add_tag.js.erb index b8226ccb4..5401a34ca 100644 --- a/app/views/tags/add_tag.js.erb +++ b/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 })%>') \ No newline at end of file diff --git a/app/views/tags/delete_tag.js.erb b/app/views/tags/delete_tag.js.erb index 60a7d7361..8483eee22 100644 --- a/app/views/tags/delete_tag.js.erb +++ b/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 })%>') diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb index 916e1bb65..8ef79caab 100644 --- a/app/views/tags/index.html.erb +++ b/app/views/tags/index.html.erb @@ -1,11 +1,11 @@ <% content_for :sidebar do %>
-

Selected Tags

+

<%= l(:label_tags_selected) %>

<%= render :partial => "selected_tags",:locals => {:selected_tags => $selected_tags,:show_flag => @obj_flag}%>
-

Related Tags

+

<%= l(:label_tags_related) %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index a19d8b847..fca26b421 100644 --- a/config/locales/en.yml +++ b/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_clear: Cancel query + button_apply: Apply + 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 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 42a71075d..f6e38a8c3 100644 --- a/config/locales/zh.yml +++ b/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: 增加