Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AO3-5050 Modified collections page subtitle to match other controllers. #2991

Merged
merged 1 commit into from Sep 19, 2017

Conversation

MaxwellDaemon
Copy link
Contributor

Issue

https://otwarchive.atlassian.net/browse/AO3-5050

Purpose

Adjusts the collections page subtitle to match other pages like bookmarks, works, etc ([username] - Collections).

Testing

I don't think this is necessary, it's a simple string change. No functionality was added or removed.

References

No

Credit

What name do you want us to use to credit your work in the Archive of Our Own's Release Notes?
MaxwellsDaemon

What pronouns do you prefer (she/her, he/him, zie/hir etc)?

Him

@@ -30,7 +30,7 @@ def index
@collections = @collection.children.by_title.includes(:parent, :moderators, :children, :collection_preference, owners: [:user]).paginate(page: params[:page])
elsif params[:user_id] && (@user = User.find_by(login: params[:user_id]))
@collections = @user.maintained_collections.by_title.includes(:parent, :moderators, :children, :collection_preference, owners: [:user]).paginate(page: params[:page])
@page_subtitle = ts("created by ") + @user.login
@page_subtitle = ts("%{username} - Collections", username: @user.login)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer annotated tokens (like %s) over template tokens (like %{foo}).

@MaxwellDaemon
Copy link
Contributor Author

Sorry, please ignore accidental close.

Copy link
Member

@scottsds scottsds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@sarken sarken merged commit a9c2fe8 into otwcode:master Sep 19, 2017
sarken added a commit that referenced this pull request Sep 22, 2017
elzj pushed a commit that referenced this pull request Sep 22, 2017
…#3073)

* Revert "Update nokogiri (#3071)"

This reverts commit 27c45c9.

* Revert "A03-5042 Add only_path:false to byline calls in download partials (#3070)"

This reverts commit f6fff7d.

* Revert "AO3-5176: Add more indexes to tag nominations (#3066)"

This reverts commit 912e6bc.

* Revert "AO3-4952 REDIS AUTOCOMPLETE missing lib files (#3068)"

This reverts commit 1733fb5.

* Revert "AO3-4748 Give the date on unposted prompt meme claims the proper margin to avoid the icon (#2649)"

This reverts commit aae900b.

* Revert "AO3-5178: Fix slow tag set callback (#3067)"

This reverts commit 80515a9.

* Revert "AO3-4533 Make AO3 logo alt text shorter (too long for screen readers) (#2642)"

This reverts commit 923f342.

* Revert "AO3-4729 Accept 5 abuse reports per profile per month (#2906)"

This reverts commit 73c2bc6.

* Revert "AO3-4952 Move autocomplete to its own Redis instance (#2889)"

This reverts commit c27d54c.

* Revert "AO3-5011 Reorder FAQ intro information (#2909)"

This reverts commit 827b37d.

* Revert "AO3-5091: Fix 500 error on claims page caused by deleted users (#2982)"

This reverts commit fe2cf53.

* Revert "AO3-5050 Modified collections page subtitle to match other controllers. (#2991)"

This reverts commit a9c2fe8.

* Revert "AO3-2556 Cascade comment destruction to parent placeholders. (#2859)"

This reverts commit 27e18a5.

* Revert "AO3-5042 Use _url for absolute links in bylines and download afterword (#3052)"

This reverts commit 4837394.

* Revert "AO3-5065 Fix error where posting chapter would not post work (#2961)"

This reverts commit e66234a.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants