diff --git a/app/views/tags/edit.html.erb b/app/views/tags/edit.html.erb
index b41cc9cf880..349e0df2915 100644
--- a/app/views/tags/edit.html.erb
+++ b/app/views/tags/edit.html.erb
@@ -10,154 +10,155 @@
<%= form_for @tag, :as => :tag, :url => { :action => "update", :id => @tag}, :html => { :method => :put } do |f| %>
-
-<% if (Tag::USER_DEFINED + ['Media']).include?(@tag[:type]) %>
-
-
-
- <% @tag.parent_types.each do |tag_type| %>
- <% if tag_type == 'Fandom' && !@suggested_fandoms.blank? %>
- - <%= ts("Suggested Fandoms") %>:
- -
- <% @suggested_fandoms[0..19].in_groups(2, false) do |fandom_list| %>
-
+ <% if Tag::USER_DEFINED.include?(@tag[:type]) %>
+
- <%= f.label :syn_string, ts('Synonym of') %>
+ -
+ <%= f.text_field :syn_string, autocomplete_options("tag?type=#{@tag.type.downcase}", :class => 'autocomplete tags', :autocomplete_token_limit => 1) %>
+
<%= ts("Choose an existing tag or add a new tag name here to create a new canonical and associate this tag with it.") %>
+ <% if @tag.merger %>
+ <%= ts("Edit") %> <%= link_to_edit_tag(@tag.merger) %>
+ <% elsif @tag.canonical? %>
+
+ <%= ts("Adding a synonym to a canonical tag will make it non-canonical and move its associations to the other tag. (Be careful with this!)") %>
<% end %>
- <% if @suggested_fandoms.length > 20 %>
- <%= link_to "See all (#{@suggested_fandoms.length})", {:controller => :tags, :action => :wrangle, :id => @tag, :show => :suggested_fandoms} %>
- <% end %>
-
- <% end %>
- - <%= tag_category_name(tag_type) %>
- -
-
- <% if @parents[tag_type].present? %>
-
<%= ts("Check to remove: ") %>
- <%= check_all_none %>
- <%= checkbox_section(f, "associations_to_remove", @parents[tag_type], :name_helper_method => "remove_tag_association_label", :extra_info_method => "link_to_edit_tag",
- :field_id => "parent_#{tag_type}_associations_to_remove", :concise => true) %>
- <%= f.label tag_type.underscore + '_string', ts("Add:") %>
- <% else %>
- <%= f.label tag_type.underscore + '_string', ts("Add %{catname}:", :catname => tag_category_name(tag_type)) %>
- <% end %>
-
- <%= f.text_field tag_type.underscore + '_string', autocomplete_options("tag?type=#{(tag_type.downcase == 'metatag' ? @tag.type.downcase : tag_type.downcase)}", :class => 'tags autocomplete') %>
-
-
- <% end %>
-
-
-
- <% if @tag.canonical? %>
-
-
- <%= link_to ts('wrangle all child tags'), {:controller => :tags, :action => :wrangle, :id => @tag} %>
-
- <% @tag.child_types.each do |tag_type| %>
- - <%= tag_category_name(tag_type) %>
- -
-
- <% if @children[tag_type].present? %>
-
<%= ts("Check to remove: ") %>
- <%= check_all_none %>
- <%= checkbox_section(f, "associations_to_remove", @children[tag_type][0..19], :name_helper_method => "remove_tag_association_label", :extra_info_method => "link_to_edit_tag",
- :field_id => "child_#{tag_type}_associations_to_remove", :concise => true) %>
- <% if @children[tag_type].length > 20 %>
-
- <%= link_to "See all (#{@tag.send(tag_type.underscore.pluralize).count})", {:controller => :tags, :action => :wrangle, :id => @tag, :show => tag_type.underscore.pluralize} %>
-
- <% end %>
- <%= f.label tag_type.underscore + '_string', ts("Add:") %>
- <% else %>
- <%= f.label tag_type.underscore + '_string', ts("Add %{catname}:", :catname => tag_category_name(tag_type)) %>
- <% end %>
-
- <%= f.text_field tag_type.underscore + '_string',
- autocomplete_options("#{tag_type == 'Merger' ? ('noncanonical_tag?type=' + @tag.type.downcase) : (tag_type == 'SubTag' ? @tag.type.downcase : tag_type.downcase)}",
- :class => 'tags autocomplete') %>
-
-
-
<% end %>
- <% end %>
+
+ <% if (Tag::USER_DEFINED + ['Media']).include?(@tag[:type]) %>
+
+
+
+ <% @tag.parent_types.each do |tag_type| %>
+ <% if tag_type == 'Fandom' && !@suggested_fandoms.blank? %>
+ - <%= ts("Suggested Fandoms") %>:
+ -
+ <% @suggested_fandoms[0..19].in_groups(2, false) do |fandom_list| %>
+
+ <% end %>
+ <% if @suggested_fandoms.length > 20 %>
+
<%= link_to ts("See all (%{fandoms_len})", :fandoms_len => @suggested_fandoms.length), {:controller => :tags, :action => :wrangle, :id => @tag, :show => :suggested_fandoms} %>
+ <% end %>
+
+ <% end %>
+ - <%= tag_category_name(tag_type) %>
+ -
+
+ <% if @parents[tag_type].present? %>
+
<%= ts("Check to remove: ") %>
+ <%= check_all_none %>
+ <%= checkbox_section(f, "associations_to_remove", @parents[tag_type], :name_helper_method => "remove_tag_association_label", :extra_info_method => "link_to_edit_tag",
+ :field_id => "parent_#{tag_type}_associations_to_remove", :concise => true) %>
+ <%= f.label tag_type.underscore + '_string', ts("Add:") %>
+ <% else %>
+ <%= f.label tag_type.underscore + '_string', ts("Add %{catname}:", :catname => tag_category_name(tag_type)) %>
+ <% end %>
+
+ <%= f.text_field tag_type.underscore + '_string', autocomplete_options("tag?type=#{(tag_type.downcase == 'metatag' ? @tag.type.downcase : tag_type.downcase)}", :class => 'tags autocomplete') %>
+
+
+
+ <% end %>
+
+
+
+ <% if @tag.canonical? %>
+
+
+ <%= link_to ts('wrangle all child tags'), {:controller => :tags, :action => :wrangle, :id => @tag} %>
+
+ <% @tag.child_types.each do |tag_type| %>
+ - <%= tag_category_name(tag_type) %>
+ -
+
+ <% if @children[tag_type].present? %>
+
<%= ts("Check to remove: ") %>
+ <%= check_all_none %>
+ <%= checkbox_section(f, "associations_to_remove", @children[tag_type][0..19], :name_helper_method => "remove_tag_association_label", :extra_info_method => "link_to_edit_tag",
+ :field_id => "child_#{tag_type}_associations_to_remove", :concise => true) %>
+ <% if @children[tag_type].length > 20 %>
+
+ <%= link_to ts("See all (%{children_count})", :children_count => @tag.send(tag_type.underscore.pluralize).count), {:controller => :tags, :action => :wrangle, :id => @tag, :show => tag_type.underscore.pluralize} %>
+
+ <% end %>
+ <%= f.label tag_type.underscore + '_string', ts("Add:") %>
+ <% else %>
+ <%= f.label tag_type.underscore + '_string', ts("Add %{catname}:", :catname => tag_category_name(tag_type)) %>
+ <% end %>
+
+ <%= f.text_field tag_type.underscore + '_string',
+ autocomplete_options("#{tag_type == 'Merger' ? ('noncanonical_tag?type=' + @tag.type.downcase) : (tag_type == 'SubTag' ? @tag.type.downcase : tag_type.downcase)}",
+ :class => 'tags autocomplete') %>
+
+
+
+ <% end %>
+
+
+ <% end %>
+
<% elsif @tag.is_a?(Media) %>
<%= link_to ts('See all fandoms'), {:controller => :tags, :action => :wrangle, :id => @tag, :show => 'fandoms'} %>
<% end %>
-
-
- <%= submit_tag ts("Save changes") %>
-
+
+
+ <%= submit_tag ts("Save changes") %>
+
<% end %>
<% if logged_in_as_admin? %>
- Last updated by <%= @tag.last_wrangler.try(:login) || '---' %> on <%= @tag.updated_at %>
+ <%= ts("Last updated by") %> <%= @tag.last_wrangler.try(:login) || '---' %> <%= ts("on") %> <%= @tag.updated_at %>
<% end %>