diff --git a/app/helpers/webhooks_helper.rb b/app/helpers/webhooks_helper.rb index e0e0e3387..f3bb077c8 100644 --- a/app/helpers/webhooks_helper.rb +++ b/app/helpers/webhooks_helper.rb @@ -10,7 +10,7 @@ module WebhooksHelper card_closed: "Card moved to “Done”", card_reopened: "Card reopened", card_postponed: "Card moved to “Not Now”", - card_auto_postponed: "Card auto-closed as “Not Now”", + card_auto_postponed: "Card moved to “Not Now” due to inactivity", card_sent_back_to_triage: "Card moved back to “Maybe?”" }.with_indifferent_access.freeze diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb index ace5701bf..0c9fe3517 100644 --- a/app/models/card/eventable/system_commenter.rb +++ b/app/models/card/eventable/system_commenter.rb @@ -25,7 +25,7 @@ class Card::Eventable::SystemCommenter when "card_postponed" "#{event.creator.name} moved this to “Not Now”" when "card_auto_postponed" - "Closed as “Not Now” due to inactivity" + "Moved to “Not Now” due to inactivity" when "card_title_changed" "#{event.creator.name} changed the title from “#{event.particulars.dig('particulars', 'old_title')}” to “#{event.particulars.dig('particulars', 'new_title')}”." when "card_board_changed" diff --git a/app/models/event/description.rb b/app/models/event/description.rb index 7718a795c..672784ddb 100644 --- a/app/models/event/description.rb +++ b/app/models/event/description.rb @@ -64,7 +64,7 @@ class Event::Description when "card_postponed" %(#{creator} moved #{card_title} to "Not Now") when "card_auto_postponed" - %(#{card_title} was closed as "Not Now" due to inactivity) + %(#{card_title} moved to "Not Now" due to inactivity) when "card_resumed" "#{creator} resumed #{card_title}" when "card_title_changed" diff --git a/app/views/account/settings/_entropy.html.erb b/app/views/account/settings/_entropy.html.erb index 11ff9b326..59972e608 100644 --- a/app/views/account/settings/_entropy.html.erb +++ b/app/views/account/settings/_entropy.html.erb @@ -1,7 +1,7 @@

Auto close

-

Fizzy doesn’t let stale cards stick around forever. Cards automatically close as “Not Now” without activity for specific period of time. This is the default, global setting — you can override it on each board.

+

Fizzy doesn’t let stale cards stick around forever. Cards automatically move to “Not Now” without activity for specific period of time. This is the default, global setting — you can override it on each board.

<%= render "entropy/auto_close", model: account.entropy, url: account_entropy_path, disabled: !Current.user.admin? %> diff --git a/app/views/cards/container/_closure.html.erb b/app/views/cards/container/_closure.html.erb index 6fa2fed57..f7c69a98d 100644 --- a/app/views/cards/container/_closure.html.erb +++ b/app/views/cards/container/_closure.html.erb @@ -12,7 +12,7 @@
<% if card.entropic? && card.open? && !card.postponed? %>
- Closes as “Not Now” <%= local_datetime_tag(card.entropy.auto_clean_at, style: :indays) -%> if there’s no activity. + Moves to “Not Now” <%= local_datetime_tag(card.entropy.auto_clean_at, style: :indays) -%> if there’s no activity.
<% end %>