diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 5fc0b0a28c1..8194ceeb1d1 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -18,6 +18,9 @@ class HelpController < ApplicationController skins_creating skins_parents symbols_key + tag_sets_about + tag_sets_associations + tag_sets_batch_load tags_additional tags_categories tags_characters diff --git a/app/views/help/tag_sets_about.html.erb b/app/views/help/tag_sets_about.html.erb new file mode 100644 index 00000000000..acb12bd7635 --- /dev/null +++ b/app/views/help/tag_sets_about.html.erb @@ -0,0 +1,9 @@ +

<%= t(".page_heading") %>

+ +

<%= t(".what_are_tag_sets") %>

+ +

<%= t(".who_manages_tag_sets") %>

+ +

<%= t(".where_to_find_tag_sets") %>

+ +

<%= t(".sharing_tag_sets_html", delete_tag_set_warning_strong: tag.strong(t(".delete_tag_set_warning_strong"))) %>

diff --git a/app/views/help/tag_sets_associations.html.erb b/app/views/help/tag_sets_associations.html.erb new file mode 100644 index 00000000000..ef44eac8542 --- /dev/null +++ b/app/views/help/tag_sets_associations.html.erb @@ -0,0 +1,7 @@ +

<%= t(".page_heading") %>

+ +

<%= t(".what_are_tag_set_associations") %>

+ +

<%= t(".note_about_tag_set_associations") %>

+ +

<%= t(".tip") %>

diff --git a/app/views/help/tag_sets_batch_load.html.erb b/app/views/help/tag_sets_batch_load.html.erb new file mode 100644 index 00000000000..37de98b9610 --- /dev/null +++ b/app/views/help/tag_sets_batch_load.html.erb @@ -0,0 +1,19 @@ +

<%= t(".page_heading") %>

+ + diff --git a/app/views/owned_tag_sets/_tag_set_form.html.erb b/app/views/owned_tag_sets/_tag_set_form.html.erb index ebe70fb23c5..8e17e34bcf9 100755 --- a/app/views/owned_tag_sets/_tag_set_form.html.erb +++ b/app/views/owned_tag_sets/_tag_set_form.html.erb @@ -29,7 +29,7 @@
- Tags In Set <% unless @tag_set.new_record? || !@tag_set.tag_set || @tag_set.tag_set.tags.empty? %><%= ts('(check to remove)') %><% end %> + Tags In Set <% unless @tag_set.new_record? || !@tag_set.tag_set || @tag_set.tag_set.tags.empty? %><%= t(".check_to_remove") %><% end %>

<%= ts('Tags in Set') %>

<% @tag_set.build_tag_set unless @tag_set.tag_set %> <%= tag_set_form.fields_for :tag_set do |internal_tag_set_form| %> @@ -44,7 +44,7 @@
<% associations_for_remove = @tag_set.tag_set_associations.reject {|assoc| assoc.new_record?} %> <% associations_for_add = @tag_set.tag_set_associations.select {|assoc| assoc.new_record?} %> - Tag Associations <%= associations_for_remove.empty? ? '' : ts('(check to remove)') %> <%= link_to_help('tagset-tag-associations')%> + Tag Associations <%= associations_for_remove.empty? ? "" : t(".check_to_remove") %><%= link_to_help_modal(help_tag_sets_associations_path, t(".tag_sets_associations_help_title")) %>

<%= ts('Tag Associations') %>

<% unless associations_for_remove.empty? %> diff --git a/app/views/owned_tag_sets/batch_load.html.erb b/app/views/owned_tag_sets/batch_load.html.erb index ec2129d60ae..50b1a8d127e 100644 --- a/app/views/owned_tag_sets/batch_load.html.erb +++ b/app/views/owned_tag_sets/batch_load.html.erb @@ -1,7 +1,7 @@
-

<%= ts('Batch Loading') %> <%= link_to_help "tagset-batch-load" %>

+

<%= t(".page_heading") %> <%= link_to_help_modal(help_tag_sets_batch_load_path, t(".tag_sets_batch_load_help_title")) %>

@@ -21,10 +21,10 @@
<%= label_tag "batch_do_relationships", ts('Relationships instead?') %>
<%= check_box_tag "batch_do_relationships" %>
-
<%= ts('Submit') %>
-
<%= form.submit ts('Submit') %>
+
<%= t(".submit") %>
+
<%= form.submit t(".submit") %>
- + <% end %> \ No newline at end of file diff --git a/app/views/owned_tag_sets/index.html.erb b/app/views/owned_tag_sets/index.html.erb index 44c78ccb71b..3ab621837ea 100755 --- a/app/views/owned_tag_sets/index.html.erb +++ b/app/views/owned_tag_sets/index.html.erb @@ -3,13 +3,13 @@

<% if @user %> - <%= ts('%{user_name}\'s Tag Sets', :user_name => @user.login) %> <%= link_to_help 'tagset-about' %> + <%= t(".page_heading_user", user_name: @user.login) %> <%= link_to_help_modal(help_tag_sets_about_path, t(".tag_sets_about_help_title")) %> <% elsif @restriction %> - <%= ts('Tag Sets Used In This Challenge') %> + <%= t(".page_heading_challenge") %> <% elsif @query %> - <%= search_header @tag_sets, nil, ts('Tag Set') %> <%= link_to_help 'tagset-about' %> + <%= search_header @tag_sets, nil, t(".page_heading_query") %> <%= link_to_help_modal(help_tag_sets_about_path, t(".tag_sets_about_help_title")) %> <% else %> - <%= ts('Tag Sets') %> <%= link_to_help 'tagset-about' %> <%= ts('in the %{archive_name}', :archive_name => ArchiveConfig.APP_NAME) %> + <%= t(".page_heading_default") %> <%= link_to_help_modal(help_tag_sets_about_path, t(".tag_sets_about_help_title")) %> <%= t(".in_archive_name", archive_name: ArchiveConfig.APP_NAME) %> <% end %>

@@ -17,29 +17,29 @@ <% if @tag_sets.empty? %> -

<%= ts('No tag sets found.') %>

+

<%= t(".no_tag_sets_found") %>

<% else %> <% if @tag_sets.respond_to?(:total_pages) %> <%= will_paginate @tag_sets %> <% end %> -

<%= ts('Listing Tag Sets') %>

+

<%= t(".listing_tag_sets_heading") %>