cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/5243'

Browse source
This commit is contained in:
Tom Hughes 2024-09-30 19:15:10 +01:00
commit edd04ef67a
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/i18n-tasks.yml
View file

@ -132,6 +132,8 @@ ignore_unused:
- 'reports.new.categories.*' # double interpolation in reports_helper - 'reports.new.categories.*' # double interpolation in reports_helper
- 'shared.pagination.*' - 'shared.pagination.*'
- 'auth.providers.*' - 'auth.providers.*'
- 'time.formats.blog' # used for formatting blog dates
- 'time.formats.friendly' # used for formatting dates / times in a friendly way
# - '{devise,kaminari,will_paginate}.*' # - '{devise,kaminari,will_paginate}.*'
# - 'simple_form.{yes,no}' # - 'simple_form.{yes,no}'
# - 'simple_form.{placeholders,hints,labels}.*' # - 'simple_form.{placeholders,hints,labels}.*'

2
config/locales/en.yml
View file

@ -1844,7 +1844,6 @@ en:
failure: Couldn't update profile. failure: Couldn't update profile.
sessions: sessions:
new: new:
title: "Log in"
tab_title: "Log in" tab_title: "Log in"
login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}." login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
email or username: "Email Address or Username" email or username: "Email Address or Username"
@ -2292,7 +2291,6 @@ en:
welcome_mat_url: https://welcome.openstreetmap.org/ welcome_mat_url: https://welcome.openstreetmap.org/
sidebar: sidebar:
search_results: Search Results search_results: Search Results
close: Close
search: search:
search: Search search: Search
get_directions_title: "Find directions between two points" get_directions_title: "Find directions between two points"

2
test/system/issues_test.rb
View file

@ -5,7 +5,7 @@ class IssuesTest < ApplicationSystemTestCase
def test_view_issues_not_logged_in def test_view_issues_not_logged_in
visit issues_path visit issues_path
assert_content I18n.t("sessions.new.title") assert_content "Log in"
end end
def test_view_issues_normal_user def test_view_issues_normal_user