diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 5fc0b0a28c1..6530611508d 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -1,8 +1,11 @@ class HelpController < ApplicationController HELP_ACTIONS = %i[ collectibles_add_to_collection + collections_name first_login html + icon_alt_text + icon_comment_text preferences_collection preferences_comment preferences_display diff --git a/app/views/collections/_form.html.erb b/app/views/collections/_form.html.erb index 1f372b588d6..6faaa0c955a 100644 --- a/app/views/collections/_form.html.erb +++ b/app/views/collections/_form.html.erb @@ -18,7 +18,7 @@
<%= collection_form.label :name, ts("Collection name" + "*") %> - <%= link_to_help "collection-name" %> + <%= link_to_help_modal(help_collections_name_path, t(".collections_name_help_title")) %>
<%= collection_form.text_field :name, "aria-describedby" => "name-field-notes" %> @@ -87,7 +87,7 @@
<%= collection_form.label :icon_alt_text, ts("Icon alt text") %> - <%= link_to_help "icon-alt-text" %> + <%= link_to_help_modal(help_icon_alt_text_path, t(".icon_alt_text_help_title")) %>
<%= collection_form.text_field :icon_alt_text, class: "observe_textlength" %> @@ -96,7 +96,7 @@
<%= collection_form.label :icon_comment_text, ts("Icon comment text") %> - <%= link_to_help "pseud-icon-comment" %> + <%= link_to_help_modal(help_icon_comment_text_path, t(".icon_comment_text_help_title")) %>
<%= collection_form.text_field :icon_comment_text, class: "observe_textlength" %> diff --git a/app/views/help/collections_name.html.erb b/app/views/help/collections_name.html.erb new file mode 100644 index 00000000000..1a14103baff --- /dev/null +++ b/app/views/help/collections_name.html.erb @@ -0,0 +1,4 @@ +

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

+ +

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

+

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

diff --git a/app/views/help/icon_alt_text.html.erb b/app/views/help/icon_alt_text.html.erb new file mode 100644 index 00000000000..3ef06f4b0ae --- /dev/null +++ b/app/views/help/icon_alt_text.html.erb @@ -0,0 +1,5 @@ +

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

+ +

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

+ +

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

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

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

+ +

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

diff --git a/app/views/pseuds/_pseuds_form.html.erb b/app/views/pseuds/_pseuds_form.html.erb index ff4c5743db7..c9da35a04fc 100644 --- a/app/views/pseuds/_pseuds_form.html.erb +++ b/app/views/pseuds/_pseuds_form.html.erb @@ -42,7 +42,7 @@
<%= f.label :icon_alt_text, t(".icon_alt") %> - <%= link_to_help "icon-alt-text" %> + <%= link_to_help_modal(help_icon_alt_text_path, t(".icon_alt_text_help_title")) %>
<%= f.text_field :icon_alt_text, class: "observe_textlength", disabled: logged_in_as_admin? %> @@ -51,7 +51,7 @@
<%= f.label :icon_comment_text, t(".icon_comment") %> - <%= link_to_help("pseud-icon-comment") %> + <%= link_to_help_modal(help_icon_comment_text_path, t(".icon_comment_text_help_title")) %>
<%= f.text_field :icon_comment_text, class: "observe_textlength", disabled: logged_in_as_admin? %> diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index a93ff354ba4..9d0e95235ac 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -858,11 +858,14 @@ en: no_challenge: No Challenge prompt_meme: Prompt Meme Challenge form: + collections_name_help_title: Collection name help header_image_url: footnote: PNG, JPEG, GIF label: Custom header URL icon: delete: Delete collection icon and revert to our default. This will also remove the icon alt text and comment text. + icon_alt_text_help_title: Icon alt text help + icon_comment_text_help_title: Icon comment text help multifandom: footnote: Use this if your collection is not fandom-specific. label: Multifandom @@ -1212,6 +1215,10 @@ en: moderated_and_anonymous_collections: 'Also note: if the collection you are submitting to is moderated, and you aren''t a member, your story will not be added to the collection automatically - it will have to be approved by one of the collection''s moderators. If this is an anonymous and/or unrevealed collection your work will be anonymous and/or hidden as soon as you post it, including while it''s waiting for approval. If your work is rejected, it will remain anonymous and/or unrevealed until you edit it to remove it from the collection or until the moderator removes it.' page_heading: Adding To Collections removing_from_collection: If you change your mind about having an item in a collection, you can either edit the list of collections when editing it, or you can manage all your collected items under the "My Collections" page in your account. + collections_name: + changing_collection_name: The name of the collection can be changed at a later point, but that will break links to the collection. + collection_name_rules: The name can consist only of ASCII letters (a-z, A-Z), numbers and underscores, and cannot contain spaces. + page_heading: Collection Name first_login: additional_info: header: Additional Browsing Information @@ -1349,6 +1356,13 @@ en: unwanted_larger_text: If one bit of your text shows up larger than the rest, probably our formatter couldn't figure out to put paragraph tags around it. You can fix this by manually putting in the paragraph tags around that one bit. unwilling_to_break: If you have put in some custom HTML (eg a list of items inside a