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.

Sign up for GitHub

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

Jump to bottom

AO3-6376 Remove "User" from username, password and email change page titles #4933

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

AO3-6376 Remove "User" from username, password and email change page titles #4933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8fb621
AO3-6376 Remove "User" from username, password and email change page …
phthallo Sep 28, 2024
f25624f
AO3-6376 instead override default title
phthallo Oct 2, 2024
d485001
AO3-6376 revert application layout correctly this time
phthallo Oct 2, 2024
d56d0d5
AO3-6376 revert application layout correctly this time (again)
phthallo Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ def edit
authorize @user.profile if logged_in_as_admin?
end

def change_email
@page_subtitle = t(".browser_title")
end

def change_password
@page_subtitle = t(".browser_title")
end

def change_username
@page_subtitle = t(".browser_title")
end

def changed_password
unless params[:password] && reauthenticate
render(:change_password) && return
Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<% if defined?(@page_subtitle) %>
<%= @page_subtitle %>
<% else %>
<%= controller.action_name=="index" ? "" : process_title(controller.action_name) %>
<%= controller.action_name=="index" ? process_title(controller.controller_name) : process_title(controller.controller_name.singularize) %>
<%= controller.action_name == "index" ? "" : process_title(controller.action_name) %>
<%= controller.action_name == "index" ? process_title(controller.controller_name) : process_title(controller.controller_name.singularize) %>
<% end %>
|
<%= ArchiveConfig.APP_NAME %>
Expand Down
5 changes: 5 additions & 0 deletions config/locales/views/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,8 +923,13 @@ en:
description: Recalculate the filters for this work based on the current set of tags. Use this option if wrangling seems to have gone wrong. (e.g. If you synned one of this work's tags to a canonical but it's not showing up in the tag listings, or if the wrong tags are listed in the sidebar when you drill down to a search that includes only this work.)
title: Update Work Filters
users:
change_email:
browser_title: Change Email
change_password:
browser_title: Change Password
change_username:
account_faq: Account FAQ
browser_title: Change Username
caution: Please use this feature with caution.
change_window:
one: You can change your user name once per day.
Expand Down
Loading