diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb index a90a084414f..6ec0cf2d5a8 100644 --- a/app/decorators/user_decorator.rb +++ b/app/decorators/user_decorator.rb @@ -40,7 +40,6 @@ def lockout_time_remaining_in_words current_time + lockout_time_remaining, true, highest_measures: 2, - two_words_connector: " #{I18n.t('datetime.dotiw.two_words_connector')} ", ) end @@ -60,7 +59,6 @@ def confirmation_period current_time + Devise.confirm_within, true, accumulate_on: :hours, - two_words_connector: " #{I18n.t('datetime.dotiw.two_words_connector')} ", ) end diff --git a/app/helpers/session_timeout_warning_helper.rb b/app/helpers/session_timeout_warning_helper.rb index 870bffb9046..a2ef3f57dff 100644 --- a/app/helpers/session_timeout_warning_helper.rb +++ b/app/helpers/session_timeout_warning_helper.rb @@ -19,11 +19,7 @@ def timeout_refresh_path end def time_left_in_session - distance_of_time_in_words( - session_timeout_warning, - 0, - two_words_connector: " #{I18n.t('datetime.dotiw.two_words_connector')} ", - ) + distance_of_time_in_words(session_timeout_warning, 0) end def session_modal diff --git a/app/presenters/account_reset/pending_presenter.rb b/app/presenters/account_reset/pending_presenter.rb index 67c5e4a36d4..c93eca3a809 100644 --- a/app/presenters/account_reset/pending_presenter.rb +++ b/app/presenters/account_reset/pending_presenter.rb @@ -16,7 +16,6 @@ def time_remaining_until_granted(now: Time.zone.now) account_reset_request.requested_at + wait_time, true, highest_measures: 2, - two_words_connector: " #{I18n.t('datetime.dotiw.two_words_connector')} ", ) end end diff --git a/app/presenters/confirmation_email_presenter.rb b/app/presenters/confirmation_email_presenter.rb index b6995b10953..ba37613a0dd 100644 --- a/app/presenters/confirmation_email_presenter.rb +++ b/app/presenters/confirmation_email_presenter.rb @@ -32,7 +32,6 @@ def confirmation_period current_time + Devise.confirm_within, true, accumulate_on: :hours, - two_words_connector: " #{I18n.t('datetime.dotiw.two_words_connector')} ", ) end diff --git a/config/locales/dotiw/en.yml b/config/locales/dotiw/en.yml index f5c277acf76..19a42c76d37 100644 --- a/config/locales/dotiw/en.yml +++ b/config/locales/dotiw/en.yml @@ -2,4 +2,4 @@ en: datetime: dotiw: - two_words_connector: and + two_words_connector: ' and ' diff --git a/config/locales/dotiw/es.yml b/config/locales/dotiw/es.yml index 0c407bd25c2..b0a2e574dde 100644 --- a/config/locales/dotiw/es.yml +++ b/config/locales/dotiw/es.yml @@ -2,4 +2,4 @@ es: datetime: dotiw: - two_words_connector: y + two_words_connector: ' y ' diff --git a/config/locales/dotiw/fr.yml b/config/locales/dotiw/fr.yml index d435f590725..3892ac212e1 100644 --- a/config/locales/dotiw/fr.yml +++ b/config/locales/dotiw/fr.yml @@ -2,4 +2,4 @@ fr: datetime: dotiw: - two_words_connector: et + two_words_connector: ' et '