diff --git a/app/models/scheduled_status.rb b/app/models/scheduled_status.rb index 1f4f04268d4..b241790d769 100644 --- a/app/models/scheduled_status.rb +++ b/app/models/scheduled_status.rb @@ -31,10 +31,10 @@ class ScheduledStatus < ApplicationRecord end def validate_total_limit - errors.add(:base, I18n.t('scheduled_statuses.over_total_limit', limit: TOTAL_LIMIT)) if account.scheduled_statuses.count >= TOTAL_LIMIT + errors.add(:base, I18n.t('scheduled_statuses.over_total_limit', count: TOTAL_LIMIT)) if account.scheduled_statuses.count >= TOTAL_LIMIT end def validate_daily_limit - errors.add(:base, I18n.t('scheduled_statuses.over_daily_limit', limit: DAILY_LIMIT)) if account.scheduled_statuses.where('scheduled_at::date = ?::date', scheduled_at).count >= DAILY_LIMIT + errors.add(:base, I18n.t('scheduled_statuses.over_daily_limit', count: DAILY_LIMIT)) if account.scheduled_statuses.where('scheduled_at::date = ?::date', scheduled_at).count >= DAILY_LIMIT end end diff --git a/app/views/admin_mailer/_new_trending_links.text.erb b/app/views/admin_mailer/_new_trending_links.text.erb index 0e2a6a20a6d..8a0ff57371d 100644 --- a/app/views/admin_mailer/_new_trending_links.text.erb +++ b/app/views/admin_mailer/_new_trending_links.text.erb @@ -2,7 +2,7 @@ <% new_trending_links.each do |link| %> - <%= link.title %> · <%= link.url %> - <%= standard_locale_name(link.language) %> · <%= raw t('admin.trends.links.usage_comparison', today: link.history.get(Time.now.utc).accounts, yesterday: link.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: link.trend.score.round(2)) %> + <%= standard_locale_name(link.language) %> · <%= raw t('admin.trends.links.usage_comparison', count: link.history.get(Time.now.utc).accounts, yesterday: link.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: link.trend.score.round(2)) %> <% end %> <%= raw t('application_mailer.view')%> <%= admin_trends_links_url %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 3bdd50c8c65..8133b30b9b4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1028,8 +1028,8 @@ en: other: Shared by %{count} people over the last week title: Trending links usage_comparison: - one: Shared %{today} time today, compared to %{yesterday} yesterday - other: Shared %{today} times today, compared to %{yesterday} yesterday + one: Shared %{count} time today, compared to %{yesterday} yesterday + other: Shared %{count} times today, compared to %{yesterday} yesterday not_allowed_to_trend: Not allowed to trend only_allowed: Only allowed pending_review: Pending review @@ -1075,8 +1075,8 @@ en: trending_rank: 'Trending #%{rank}' usable: Can be used usage_comparison: - one: Used %{today} time today, compared to %{yesterday} yesterday - other: Used %{today} times today, compared to %{yesterday} yesterday + one: Used %{count} time today, compared to %{yesterday} yesterday + other: Used %{count} times today, compared to %{yesterday} yesterday used_by_over_week: one: Used by one person over the last week other: Used by %{count} people over the last week @@ -1763,11 +1763,11 @@ en: tag: 'Public posts tagged #%{hashtag}' scheduled_statuses: over_daily_limit: - one: You have exceeded the limit of %{limit} scheduled post for today - other: You have exceeded the limit of %{limit} scheduled posts for today + one: You have exceeded the limit of %{count} scheduled post for today + other: You have exceeded the limit of %{count} scheduled posts for today over_total_limit: - one: You have exceeded the limit of %{limit} scheduled post - other: You have exceeded the limit of %{limit} scheduled posts + one: You have exceeded the limit of %{count} scheduled post + other: You have exceeded the limit of %{count} scheduled posts too_soon: The scheduled date must be in the future self_destruct: lead_html: Unfortunately, %{domain} is permanently closing down. If you had an account there, you will not be able to continue using it, but you can still request a backup of your data.