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

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 2ed3b2e91d41919de31ccddd9a5a2b132565e2a9..f5fec583269785a528972fa7e82c84e97f803866 100644 (file)
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -132,6 +132,8 @@ ignore_unused:
   - 'reports.new.categories.*' # double interpolation in reports_helper
   - 'shared.pagination.*'
   - '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}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 534020eba1dcffdaf0fea7de36d06eaf02ed7533..f40709e4806a436969b42e9bcb5e7d20cd48518e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1844,7 +1844,6 @@ en:
       failure: Couldn't update profile.
   sessions:
     new:
-      title: "Log in"
       tab_title: "Log in"
       login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
       email or username: "Email Address or Username"
@@ -2292,7 +2291,6 @@ en:
       welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Search Results
-      close: Close
     search:
       search: Search
       get_directions_title: "Find directions between two points"

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index eae3322ff56c7c308f890f6da2ccab533c0dc016..327b888bc4e980f7076b67b69af7f4e98ce12170 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -5,7 +5,7 @@ class IssuesTest < ApplicationSystemTestCase
 
   def test_view_issues_not_logged_in
     visit issues_path
-    assert_content I18n.t("sessions.new.title")
+    assert_content "Log in"
   end
 
   def test_view_issues_normal_user