# HG changeset patch
# User Chris Cannam
# Date 1340805374 -3600
# Node ID 027cc0f5d4a2501e1055584e65426f1fa524ce9a
# Parent 18beae6cb22658192982722025dd14001963f39a# Parent 2187198b6209d1cf3c4ef932d37f919f43f1b294
Merge from branch "luisf"
diff -r 18beae6cb226 -r 027cc0f5d4a2 vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb
--- a/vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb Tue Mar 13 16:34:52 2012 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb Wed Jun 27 14:56:14 2012 +0100
@@ -1,8 +1,11 @@
<% fields_for :project, project, :builder => TabularFormBuilder do |f| -%>
-
<%= f.text_field :tag_list, :label => :tags, :size => 60, :class => 'hol' %>
+
<%= f.text_field :tag_list, :label => :tags, :size => 60, :class => 'hol' %>
+
+ <%= l(:text_tags_info) %>
+
<%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %>
- <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}', false)" %>
+ <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}', false)" %>
<% end -%>
\ No newline at end of file
diff -r 18beae6cb226 -r 027cc0f5d4a2 vendor/plugins/redmine_tags/config/locales/en.yml
--- a/vendor/plugins/redmine_tags/config/locales/en.yml Tue Mar 13 16:34:52 2012 +0000
+++ b/vendor/plugins/redmine_tags/config/locales/en.yml Wed Jun 27 14:56:14 2012 +0100
@@ -39,3 +39,7 @@
project_filtering_q_label: "Search for text:"
project_filter_no_results: "No matching projects found"
button_filter: "Filter"
+
+ text_tags_info: "A tag can be any text you like, but they're most useful if you choose tags that are already being used for the same thing by other projects (where possible).