Skip to content

Commit

Permalink
AO3-4696 Adjust wording of description of canonical fandom tags (#4776)
Browse files Browse the repository at this point in the history
* AO3-4696 Change wording of fandom relationship sentence

* AO3-4696 Move canonical explanation to locale file

* AO3-4696 Move canonical explanation to locale file

* AO3-4696 Reviewdog

* AO3-4696 Whitespace

* AO3-4696 Review fixes

* AO3-4696 Change all links to use path helpers

* AO3-4696 Reviewdog
  • Loading branch information
Bilka2 authored Apr 1, 2024
1 parent 2a99025 commit ee9a878
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
15 changes: 8 additions & 7 deletions app/views/tags/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<% if @tag.canonical || @tag.merger || can_wrangle? %>
<ul class="navigation actions" role="navigation">
<% if @tag.canonical || @tag.merger %>
<li><%= link_to ts('Works'), {:controller => :works, :action => :index, :tag_id => @tag} %></li>
<li><%= link_to ts('Bookmarks'), {:controller => :bookmarks, :action => :index, :tag_id => @tag} %></li>
<li><%= link_to ts("Works"), tag_works_path(@tag) %></li>
<li><%= link_to ts("Bookmarks"), tag_bookmarks_path(@tag) %></li>
<% end %>
<% if can_wrangle? %>
<li><%= link_to ts('Edit'), {:controller => :tags, :action => :edit, :id => @tag} %> </li>
<li><%= tag_comment_link(@tag) %></li>
<li><%= link_to ts("Edit"), edit_tag_path(@tag) %> </li>
<li><%= tag_comment_link(@tag) %></li>
<li class="reindex"><%= link_to ts("Troubleshoot"), tag_troubleshooting_path(@tag) %> </li>
<% end %>
</ul>
Expand All @@ -24,12 +24,13 @@
<!--main content-->
<p><%= ts("This tag belongs to the %{tag_class} Category.", :tag_class => @tag.class::NAME) %>
<% if @tag.canonical %>
<%= t(".canonical_html",
canonical_tag_link: link_to(t(".canonical_tag"), archive_faq_path("glossary", anchor: "canonicaldef")),
filter_works_link: link_to(t(".filter_works"), tag_works_path(@tag)),
filter_bookmarks_link: link_to(t(".filter_bookmarks"), tag_bookmarks_path(@tag))) %>
<% if @tag.is_a?(Fandom) %>
<%= t(".list_fandom_tags_html", fandom_relationship_tags_link: link_to(t(".fandom_relationship_tags"), fandom_path(@tag.name))) %>
<% end %>
<%= ts("It's a common tag. You can use it to ") %>
<%= link_to ts('filter works'), {:controller => :works, :action => :index, :tag_id => @tag} %> <%= ts('and to') %>
<%= link_to ts('filter bookmarks'), {:controller => :bookmarks, :action => :index, :tag_id => @tag} %>.
<% end %>
</p>

Expand Down
6 changes: 5 additions & 1 deletion config/locales/views/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -734,8 +734,12 @@ en:
random_in_collection: These are some random tags used in the collection.
search_tags: try our tag search
show:
canonical_html: It's a %{canonical_tag_link}. You can use it to %{filter_works_link} and to %{filter_bookmarks_link}.
canonical_tag: canonical tag
fandom_relationship_tags: Relationship tags in this fandom
list_fandom_tags_html: A list of all the %{fandom_relationship_tags_link} is available.
filter_bookmarks: filter bookmarks
filter_works: filter works
list_fandom_tags_html: You can also access a list of %{fandom_relationship_tags_link}.
time:
formats:
date_short_html: <abbr class="day" title="%A">%a</abbr> <span class="date">%d</span> <abbr class="month" title="%B">%b</abbr> <span class="year">%Y</span>
Expand Down

0 comments on commit ee9a878

Please sign in to comment.