From 4c529c733909ea82e019c23f597bbe8c4afccc69 Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Mon, 17 Oct 2022 10:12:41 -0400 Subject: [PATCH 01/12] changelog: Improvements, Browser Support, Show a banner for IE11 Users that their browser will not be supported, LG-7740 --- app/assets/stylesheets/components/_banner.scss | 4 ++++ app/controllers/application_controller.rb | 5 +++++ app/views/shared/_banner.html.erb | 2 ++ app/views/shared/_banner_ie_not_supported.html.erb | 5 +++++ config/locales/shared/en.yml | 1 + 5 files changed, 17 insertions(+) create mode 100644 app/views/shared/_banner_ie_not_supported.html.erb diff --git a/app/assets/stylesheets/components/_banner.scss b/app/assets/stylesheets/components/_banner.scss index 3a3fc6a8876..df73c68d0fd 100644 --- a/app/assets/stylesheets/components/_banner.scss +++ b/app/assets/stylesheets/components/_banner.scss @@ -3,3 +3,7 @@ justify-content: center; } } +.browser-unsupported-banner { + margin-top: 0; + border-radius: 0; +} diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 27675689222..005802859f4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,6 +29,7 @@ class ApplicationController < ActionController::Base prepend_before_action :add_new_relic_trace_attributes prepend_before_action :session_expires_at prepend_before_action :set_locale + prepend_before_action :browser_is_ie11? prepend_before_action :set_x_request_url before_action :disable_caching before_action :cache_issuer_in_cookie @@ -495,6 +496,10 @@ def analytics_exception_info(exception) } end + def browser_is_ie11? + @browser_is_ie11 = BrowserCache.parse(request.user_agent).ie?(11) + end + def mobile? BrowserCache.parse(request.user_agent).mobile? end diff --git a/app/views/shared/_banner.html.erb b/app/views/shared/_banner.html.erb index 16c84fae670..28117163a08 100644 --- a/app/views/shared/_banner.html.erb +++ b/app/views/shared/_banner.html.erb @@ -55,6 +55,8 @@ + <%= render 'shared/banner_ie_not_supported' if @browser_is_ie11 %> + <%= render 'shared/no_pii_banner' if FeatureManagement.show_no_pii_banner? %>
<% if content_for?(:header) %> diff --git a/app/views/shared/_banner_ie_not_supported.html.erb b/app/views/shared/_banner_ie_not_supported.html.erb new file mode 100644 index 00000000000..50e90a0601a --- /dev/null +++ b/app/views/shared/_banner_ie_not_supported.html.erb @@ -0,0 +1,5 @@ +
+
+

<%= t('shared.banner.ie_not_supported') %>

+
+
\ No newline at end of file diff --git a/config/locales/shared/en.yml b/config/locales/shared/en.yml index 1aa16595dde..86c182a6b28 100644 --- a/config/locales/shared/en.yml +++ b/config/locales/shared/en.yml @@ -10,6 +10,7 @@ en: landmark_label: Official government website lock: Lock lock_description: A locked padlock + ie_not_supported: IE11 is not supported. Please use another browser official_site: An official website of the United States government secure_description_html: A lock (%{lock_icon}) or https:// means you’ve safely connected to the .gov From f2a5a2fd3c6ef3adc36cab274cf183658dabcd3e Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Mon, 17 Oct 2022 10:18:52 -0400 Subject: [PATCH 02/12] remove unneeded pii banner --- app/views/shared/_banner.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/shared/_banner.html.erb b/app/views/shared/_banner.html.erb index 28117163a08..14673ec41f4 100644 --- a/app/views/shared/_banner.html.erb +++ b/app/views/shared/_banner.html.erb @@ -56,7 +56,6 @@
<%= render 'shared/banner_ie_not_supported' if @browser_is_ie11 %> - <%= render 'shared/no_pii_banner' if FeatureManagement.show_no_pii_banner? %>
<% if content_for?(:header) %> From 6af5b1fc720fb53dd426c47b0a0ce00234435aae Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Tue, 25 Oct 2022 11:13:09 -0400 Subject: [PATCH 03/12] LG-7740: show ie11 not supported --- app/assets/stylesheets/components/_banner.scss | 3 +-- app/controllers/application_controller.rb | 4 ---- app/controllers/users/sessions_controller.rb | 5 +++++ app/views/devise/sessions/new.html.erb | 1 + app/views/shared/_banner.html.erb | 1 - app/views/shared/_banner_ie_not_supported.html.erb | 2 +- config/application.yml.default | 1 + config/locales/shared/en.yml | 2 +- lib/identity_config.rb | 1 + 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/components/_banner.scss b/app/assets/stylesheets/components/_banner.scss index df73c68d0fd..7bb0bbdf4a8 100644 --- a/app/assets/stylesheets/components/_banner.scss +++ b/app/assets/stylesheets/components/_banner.scss @@ -4,6 +4,5 @@ } } .browser-unsupported-banner { - margin-top: 0; - border-radius: 0; + } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 005802859f4..8a69a5f589a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -496,10 +496,6 @@ def analytics_exception_info(exception) } end - def browser_is_ie11? - @browser_is_ie11 = BrowserCache.parse(request.user_agent).ie?(11) - end - def mobile? BrowserCache.parse(request.user_agent).mobile? end diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index 5a5f13b98dc..9819ac4b3e3 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -23,6 +23,7 @@ def new @request_id = request_id_if_valid @ial = sp_session_ial + @browser_is_ie11 = browser_is_ie11? super end @@ -154,6 +155,10 @@ def remaining_session_time expires_at.to_i - Time.zone.now.to_i end + def browser_is_ie11? + BrowserCache.parse(request.user_agent).ie?(11) + end + def alive? return false unless session && expires_at session_alive = expires_at > now diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 156b94e5597..12fbe59b935 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,5 +1,6 @@ <% title t('titles.visitors.index') %> +<%= render 'shared/banner_ie_not_supported'%> <%= render 'shared/maintenance_window_alert' %> <% if decorated_session.sp_name %> diff --git a/app/views/shared/_banner.html.erb b/app/views/shared/_banner.html.erb index 14673ec41f4..16c84fae670 100644 --- a/app/views/shared/_banner.html.erb +++ b/app/views/shared/_banner.html.erb @@ -55,7 +55,6 @@
- <%= render 'shared/banner_ie_not_supported' if @browser_is_ie11 %>
<% if content_for?(:header) %> diff --git a/app/views/shared/_banner_ie_not_supported.html.erb b/app/views/shared/_banner_ie_not_supported.html.erb index 50e90a0601a..bdbb00308e9 100644 --- a/app/views/shared/_banner_ie_not_supported.html.erb +++ b/app/views/shared/_banner_ie_not_supported.html.erb @@ -1,5 +1,5 @@
-

<%= t('shared.banner.ie_not_supported') %>

+

<%= t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date)) %>

\ No newline at end of file diff --git a/config/application.yml.default b/config/application.yml.default index 57d27020f33..7b12e1509b8 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -110,6 +110,7 @@ idv_native_camera_a_b_testing_percent: 10 idv_personal_key_confirmation_enabled: true idv_send_link_attempt_window_in_minutes: 10 idv_send_link_max_attempts: 5 +ie11_support_end_date: '2022-12-31' idv_sp_required: false in_person_proofing_enabled: false in_person_enrollment_validity_in_days: 30 diff --git a/config/locales/shared/en.yml b/config/locales/shared/en.yml index 86c182a6b28..5d5f5f84dea 100644 --- a/config/locales/shared/en.yml +++ b/config/locales/shared/en.yml @@ -10,7 +10,7 @@ en: landmark_label: Official government website lock: Lock lock_description: A locked padlock - ie_not_supported: IE11 is not supported. Please use another browser + ie_not_supported: Internet Explorer 11 will not be supported after %{date} official_site: An official website of the United States government secure_description_html: A lock (%{lock_icon}) or https:// means you’ve safely connected to the .gov diff --git a/lib/identity_config.rb b/lib/identity_config.rb index 22d37d1ce81..5a305fd4d6e 100644 --- a/lib/identity_config.rb +++ b/lib/identity_config.rb @@ -190,6 +190,7 @@ def self.build_store(config_map) config.add(:idv_send_link_attempt_window_in_minutes, type: :integer) config.add(:idv_send_link_max_attempts, type: :integer) config.add(:idv_sp_required, type: :boolean) + config.add(:ie11_support_end_date, type: :timestamp) config.add(:in_person_proofing_enabled, type: :boolean) config.add(:in_person_enrollment_validity_in_days, type: :integer) config.add(:in_person_results_delay_in_hours, type: :integer) From 9e264454e33eb3c12c2e68d5b9fc39ab134a2b12 Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Wed, 26 Oct 2022 09:38:24 -0400 Subject: [PATCH 04/12] LG-7740: update ie11 to new designs --- app/assets/stylesheets/components/_banner.scss | 3 --- app/views/devise/sessions/new.html.erb | 2 +- app/views/shared/_banner_ie_not_supported.html.erb | 2 +- config/locales/shared/es.yml | 1 + config/locales/shared/fr.yml | 1 + 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/components/_banner.scss b/app/assets/stylesheets/components/_banner.scss index 7bb0bbdf4a8..3a3fc6a8876 100644 --- a/app/assets/stylesheets/components/_banner.scss +++ b/app/assets/stylesheets/components/_banner.scss @@ -3,6 +3,3 @@ justify-content: center; } } -.browser-unsupported-banner { - -} diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 12fbe59b935..498d171a2fa 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,6 +1,6 @@ <% title t('titles.visitors.index') %> -<%= render 'shared/banner_ie_not_supported'%> +<%= render 'shared/banner_ie_not_supported' %> <%= render 'shared/maintenance_window_alert' %> <% if decorated_session.sp_name %> diff --git a/app/views/shared/_banner_ie_not_supported.html.erb b/app/views/shared/_banner_ie_not_supported.html.erb index bdbb00308e9..43100229f44 100644 --- a/app/views/shared/_banner_ie_not_supported.html.erb +++ b/app/views/shared/_banner_ie_not_supported.html.erb @@ -1,4 +1,4 @@ -
+

<%= t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date)) %>

diff --git a/config/locales/shared/es.yml b/config/locales/shared/es.yml index e2b4a224859..f98b518c06a 100644 --- a/config/locales/shared/es.yml +++ b/config/locales/shared/es.yml @@ -10,6 +10,7 @@ es: landmark_label: Sitio web oficial del Gobierno lock: Candado lock_description: Un candado cerrado + ie_not_supported: Internet Explorer 11 dejará de ser compatible después del %{date} official_site: Un sitio oficial del Gobierno de Estados Unidos secure_description_html: Un candado (%{lock_icon}) o https:// significa que usted se conectó de forma segura diff --git a/config/locales/shared/fr.yml b/config/locales/shared/fr.yml index 13c50d9d242..3333be4fcce 100644 --- a/config/locales/shared/fr.yml +++ b/config/locales/shared/fr.yml @@ -10,6 +10,7 @@ fr: landmark_label: Site officiel du gouvernement lock: Serrure lock_description: Un cadenas fermé + ie_not_supported: Internet Explorer 11 ne sera pas pris en charge après le %{date} official_site: Un site web officiel du gouvernement des États-Unis secure_description_html: Un verrou (%{lock_icon}) ou https:// signifie que vous êtes connecté en toute From e87e6e28bcc6768a1fd2b302d779059b0c4908c6 Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Wed, 26 Oct 2022 09:38:46 -0400 Subject: [PATCH 05/12] show only for ie11 browser --- app/views/devise/sessions/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 498d171a2fa..3c404366faf 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,6 +1,6 @@ <% title t('titles.visitors.index') %> -<%= render 'shared/banner_ie_not_supported' %> +<%= render 'shared/banner_ie_not_supported' if @browser_is_ie11 %> <%= render 'shared/maintenance_window_alert' %> <% if decorated_session.sp_name %> From e135c5d04db66aef4fb5a3bff1b7ebbcc8dd3b9c Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Wed, 26 Oct 2022 09:41:14 -0400 Subject: [PATCH 06/12] changelog: Improvements, Broswer, Show IE11 Browser Support ending (LG-7740) From df49964211ae3f9cb7ae285ae9330ec7a5d0a7b6 Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Wed, 26 Oct 2022 09:58:46 -0400 Subject: [PATCH 07/12] use exisitng component --- app/controllers/application_controller.rb | 1 - app/views/devise/sessions/new.html.erb | 2 +- app/views/shared/_banner_ie_not_supported.html.erb | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 app/views/shared/_banner_ie_not_supported.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8a69a5f589a..27675689222 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,7 +29,6 @@ class ApplicationController < ActionController::Base prepend_before_action :add_new_relic_trace_attributes prepend_before_action :session_expires_at prepend_before_action :set_locale - prepend_before_action :browser_is_ie11? prepend_before_action :set_x_request_url before_action :disable_caching before_action :cache_issuer_in_cookie diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 3c404366faf..3b5d3c342fa 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,6 +1,6 @@ <% title t('titles.visitors.index') %> -<%= render 'shared/banner_ie_not_supported' if @browser_is_ie11 %> +<%= render AlertComponent.new(type: :warning,class: 'margin-bottom-2', message: t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date))) %> <%= render 'shared/maintenance_window_alert' %> <% if decorated_session.sp_name %> diff --git a/app/views/shared/_banner_ie_not_supported.html.erb b/app/views/shared/_banner_ie_not_supported.html.erb deleted file mode 100644 index 43100229f44..00000000000 --- a/app/views/shared/_banner_ie_not_supported.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -
-
-

<%= t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date)) %>

-
-
\ No newline at end of file From 89ec54cc6fdbab719a9f312cf8b27d319f8c1cdf Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Wed, 26 Oct 2022 10:04:48 -0400 Subject: [PATCH 08/12] add browser is ie11 check --- app/views/devise/sessions/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 3b5d3c342fa..8deabb81c05 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,6 +1,6 @@ <% title t('titles.visitors.index') %> -<%= render AlertComponent.new(type: :warning,class: 'margin-bottom-2', message: t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date))) %> +<%= render AlertComponent.new(type: :warning,class: 'margin-bottom-2', message: t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date))) if @browser_is_ie11 %> <%= render 'shared/maintenance_window_alert' %> <% if decorated_session.sp_name %> From 0795ae4d83def858915199d19f2bdf0dd7903598 Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Wed, 26 Oct 2022 11:46:00 -0400 Subject: [PATCH 09/12] normalize yaml and lint --- app/views/devise/sessions/new.html.erb | 2 +- config/locales/shared/en.yml | 2 +- config/locales/shared/es.yml | 2 +- config/locales/shared/fr.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 8deabb81c05..b6b55b6379d 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,6 +1,6 @@ <% title t('titles.visitors.index') %> -<%= render AlertComponent.new(type: :warning,class: 'margin-bottom-2', message: t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date))) if @browser_is_ie11 %> +<%= render AlertComponent.new(type: :warning, class: 'margin-bottom-2', message: t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date))) if @browser_is_ie11 %> <%= render 'shared/maintenance_window_alert' %> <% if decorated_session.sp_name %> diff --git a/config/locales/shared/en.yml b/config/locales/shared/en.yml index 5d5f5f84dea..3329b620f74 100644 --- a/config/locales/shared/en.yml +++ b/config/locales/shared/en.yml @@ -7,10 +7,10 @@ en: government organization in the United States. gov_heading: Official websites use .gov how: Here’s how you know + ie_not_supported: Internet Explorer 11 will not be supported after %{date} landmark_label: Official government website lock: Lock lock_description: A locked padlock - ie_not_supported: Internet Explorer 11 will not be supported after %{date} official_site: An official website of the United States government secure_description_html: A lock (%{lock_icon}) or https:// means you’ve safely connected to the .gov diff --git a/config/locales/shared/es.yml b/config/locales/shared/es.yml index f98b518c06a..7f78af2ea42 100644 --- a/config/locales/shared/es.yml +++ b/config/locales/shared/es.yml @@ -7,10 +7,10 @@ es: organización oficial del Gobierno de Estados Unidos. gov_heading: Los sitios web oficiales usan .gov how: Así es como usted puede verificarlo + ie_not_supported: Internet Explorer 11 dejará de ser compatible después del %{date} landmark_label: Sitio web oficial del Gobierno lock: Candado lock_description: Un candado cerrado - ie_not_supported: Internet Explorer 11 dejará de ser compatible después del %{date} official_site: Un sitio oficial del Gobierno de Estados Unidos secure_description_html: Un candado (%{lock_icon}) o https:// significa que usted se conectó de forma segura diff --git a/config/locales/shared/fr.yml b/config/locales/shared/fr.yml index 3333be4fcce..f8b3506c0ca 100644 --- a/config/locales/shared/fr.yml +++ b/config/locales/shared/fr.yml @@ -7,10 +7,10 @@ fr: organisation gouvernementale officielle des États-Unis. gov_heading: Les sites Web officiels utilisent .gov how: Voici comment vous savez + ie_not_supported: Internet Explorer 11 ne sera pas pris en charge après le %{date} landmark_label: Site officiel du gouvernement lock: Serrure lock_description: Un cadenas fermé - ie_not_supported: Internet Explorer 11 ne sera pas pris en charge après le %{date} official_site: Un site web officiel du gouvernement des États-Unis secure_description_html: Un verrou (%{lock_icon}) ou https:// signifie que vous êtes connecté en toute From 945c6dfdfd219f680439dd095ac18a5ecd91ad42 Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Wed, 26 Oct 2022 11:54:40 -0400 Subject: [PATCH 10/12] replace name --- app/views/devise/sessions/new.html.erb | 10 ++++++++-- config/locales/account/en.yml | 1 + config/locales/account/es.yml | 1 + config/locales/account/fr.yml | 1 + config/locales/shared/en.yml | 1 - config/locales/shared/es.yml | 1 - config/locales/shared/fr.yml | 1 - 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index b6b55b6379d..a4346f2f140 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,6 +1,12 @@ <% title t('titles.visitors.index') %> - -<%= render AlertComponent.new(type: :warning, class: 'margin-bottom-2', message: t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date))) if @browser_is_ie11 %> +<% if @browser_is_ie11 %> + <%= render AlertComponent.new( + type: :warning, + class: 'margin-bottom-2', + message: t('account.login.ie_not_supported', + date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date)) + ) %> +<% end %> <%= render 'shared/maintenance_window_alert' %> <% if decorated_session.sp_name %> diff --git a/config/locales/account/en.yml b/config/locales/account/en.yml index f5f5c075df3..293f5969a4d 100644 --- a/config/locales/account/en.yml +++ b/config/locales/account/en.yml @@ -71,6 +71,7 @@ en: delete_account: Delete regenerate_personal_key: Reset login: + ie_not_supported: Internet Explorer 11 will not be supported after %{date} piv_cac: Sign in with your government employee ID navigation: access_services: Access your government benefits and services from your diff --git a/config/locales/account/es.yml b/config/locales/account/es.yml index 30f02a3ca05..12440508f5d 100644 --- a/config/locales/account/es.yml +++ b/config/locales/account/es.yml @@ -72,6 +72,7 @@ es: delete_account: Eliminar regenerate_personal_key: Restablecer login: + ie_not_supported: Internet Explorer 11 dejará de ser compatible después del %{date} piv_cac: Inicie sesión con su identificación de empleado del gobierno navigation: access_services: Acceda a los beneficios y servicios de su gobierno desde su diff --git a/config/locales/account/fr.yml b/config/locales/account/fr.yml index bd0884fed08..acddec2244c 100644 --- a/config/locales/account/fr.yml +++ b/config/locales/account/fr.yml @@ -77,6 +77,7 @@ fr: delete_account: Effacer regenerate_personal_key: Réinitialiser login: + ie_not_supported: Internet Explorer 11 ne sera pas pris en charge après le %{date} piv_cac: Connectez-vous avec votre ID d’employé du gouvernement navigation: access_services: Accédez à vos avantages et services gouvernementaux depuis diff --git a/config/locales/shared/en.yml b/config/locales/shared/en.yml index 3329b620f74..1aa16595dde 100644 --- a/config/locales/shared/en.yml +++ b/config/locales/shared/en.yml @@ -7,7 +7,6 @@ en: government organization in the United States. gov_heading: Official websites use .gov how: Here’s how you know - ie_not_supported: Internet Explorer 11 will not be supported after %{date} landmark_label: Official government website lock: Lock lock_description: A locked padlock diff --git a/config/locales/shared/es.yml b/config/locales/shared/es.yml index 7f78af2ea42..e2b4a224859 100644 --- a/config/locales/shared/es.yml +++ b/config/locales/shared/es.yml @@ -7,7 +7,6 @@ es: organización oficial del Gobierno de Estados Unidos. gov_heading: Los sitios web oficiales usan .gov how: Así es como usted puede verificarlo - ie_not_supported: Internet Explorer 11 dejará de ser compatible después del %{date} landmark_label: Sitio web oficial del Gobierno lock: Candado lock_description: Un candado cerrado diff --git a/config/locales/shared/fr.yml b/config/locales/shared/fr.yml index f8b3506c0ca..13c50d9d242 100644 --- a/config/locales/shared/fr.yml +++ b/config/locales/shared/fr.yml @@ -7,7 +7,6 @@ fr: organisation gouvernementale officielle des États-Unis. gov_heading: Les sites Web officiels utilisent .gov how: Voici comment vous savez - ie_not_supported: Internet Explorer 11 ne sera pas pris en charge après le %{date} landmark_label: Site officiel du gouvernement lock: Serrure lock_description: Un cadenas fermé From c14a1af0b315b91b9821fba2a93f418d74ac66ce Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Thu, 27 Oct 2022 10:32:39 -0400 Subject: [PATCH 11/12] update linting --- app/views/devise/sessions/new.html.erb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index a4346f2f140..05b89346d5b 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,11 +1,10 @@ <% title t('titles.visitors.index') %> <% if @browser_is_ie11 %> <%= render AlertComponent.new( - type: :warning, - class: 'margin-bottom-2', - message: t('account.login.ie_not_supported', - date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date)) - ) %> + type: :warning, + class: 'margin-bottom-2', + message: t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date)), + ) %> <% end %> <%= render 'shared/maintenance_window_alert' %> From 9fadc1320b8c4e69878f1df09e600e51055d21aa Mon Sep 17 00:00:00 2001 From: Malick Diarra Date: Thu, 27 Oct 2022 11:09:50 -0400 Subject: [PATCH 12/12] use proper name --- app/views/devise/sessions/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 05b89346d5b..694c1f64bc4 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -3,7 +3,7 @@ <%= render AlertComponent.new( type: :warning, class: 'margin-bottom-2', - message: t('shared.banner.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date)), + message: t('account.login.ie_not_supported', date: I18n.l(IdentityConfig.store.ie11_support_end_date, format: :event_date)), ) %> <% end %> <%= render 'shared/maintenance_window_alert' %>