-
Notifications
You must be signed in to change notification settings - Fork 764
AO3-7366 AO3-7367 Fix browser title on user skins pages #5696
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
Open
0111-0222
wants to merge
7
commits into
otwcode:master
Choose a base branch
from
0111-0222:AO3-7366-AO3-7367-fix-skins-page-title
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
dd6358d
AO3-7366 AO3-7367 Fix browser title on user skins pages
0111-0222 a43a71b
AO3-7366 AO3-7367 Fix RuboCop style violation in paths.rb
0111-0222 4589b4f
Merge branch 'master' into AO3-7366-AO3-7367-fix-skins-page-title
0111-0222 9ced121
Merge remote-tracking branch 'upstream/master' into AO3-7366-AO3-7367…
0111-0222 90f88e7
AO3-7366 AO3-7367 Fix page subtitle being overwritten after merge
0111-0222 4a90b21
AO3-7366 AO3-7367 Move page subtitle out of identical conditional bra…
0111-0222 9f15501
AO3-7366 AO3-7367 Move page subtitle out of identical conditional bra…
0111-0222 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,9 +24,11 @@ def index | |
| if is_work_skin | ||
| @skins = @user.work_skins.sort_by_recent.includes(:author).with_attached_icon | ||
| @title = ts('My Work Skins') | ||
| @page_subtitle = "#{@user.login} - Work Skins" | ||
| else | ||
| @skins = @user.skins.site_skins.sort_by_recent.includes(:author).with_attached_icon | ||
| @title = ts('My Site Skins') | ||
| @page_subtitle = "#{@user.login} - Site Skins" | ||
| end | ||
| else | ||
| if is_work_skin | ||
|
|
@@ -40,8 +42,8 @@ def index | |
| end | ||
| @title = ts('Public Site Skins') | ||
| end | ||
| @page_subtitle = @title.html_safe | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Did this come in from a merge related to the other changes here? I don't know if we need to set this here anymore, given #5720 |
||
| end | ||
| @page_subtitle = @title.html_safe | ||
| end | ||
|
|
||
| # GET /skins/1 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you update this (and the one below) to extract the string for translation? More details on the GitHub wiki about that. Here, it could look like