Skip to content

Set two_words_connector at locale string data #5312

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

Merged
aduth merged 1 commit into from
Aug 19, 2021
Merged

Set two_words_connector at locale string data #5312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions app/decorators/user_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
6 changes: 1 addition & 5 deletions app/helpers/session_timeout_warning_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion app/presenters/account_reset/pending_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion app/presenters/confirmation_email_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion config/locales/dotiw/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
en:
datetime:
dotiw:
two_words_connector: and
two_words_connector: ' and '
2 changes: 1 addition & 1 deletion config/locales/dotiw/es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
es:
datetime:
dotiw:
two_words_connector: y
two_words_connector: ' y '
2 changes: 1 addition & 1 deletion config/locales/dotiw/fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
fr:
datetime:
dotiw:
two_words_connector: et
two_words_connector: ' et '