fix number translation in notifications

fixes CNVS-29235

Test Plan:
- Send all types of notifications
- Notice all dates, numbers,ect are
  translated

Change-Id: Ia52a3d08ac2f5ca533439d40bc62cf4d9b53b2d8
Reviewed-on: https://gerrit.instructure.com/100380
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
Tested-by: Jenkins
Product-Review: Steven Burnett <sburnett@instructure.com>
QA-Review: Steven Burnett <sburnett@instructure.com>
This commit is contained in:
Steven Burnett 2017-01-24 14:39:23 -07:00
parent 8367cadf16
commit 7cea14b150
10 changed files with 22 additions and 22 deletions

View File

@ -16,13 +16,13 @@
<%=
case criterion.criterion_type
when 'Interaction'
t('interaction_description', 'No student/teacher interaction for %{count} days', :count => criterion.threshold)
t('interaction_description', 'No student/teacher interaction for %{count} days', :count => n(criterion.threshold))
when 'UngradedCount'
t('ungraded_count_description', '%{count} or more submissions have not been graded', :count => criterion.threshold)
t('ungraded_count_description', '%{count} or more submissions have not been graded', :count => n(criterion.threshold))
when 'UngradedTimespan'
t('ungraded_timespan_description', 'A submission has been left ungraded for %{count} days', :count => criterion.threshold)
t('ungraded_timespan_description', 'A submission has been left ungraded for %{count} days', :count => n(criterion.threshold))
when 'UserNote'
t('usernote_description', 'No faculty journal entries for %{count} days', :count => criterion.threshold)
t('usernote_description', 'No faculty journal entries for %{count} days', :count => n(criterion.threshold))
end
%>
<% end %>

View File

@ -26,13 +26,13 @@
<p><em style="color: #ff0000;"><%=
case criterion.criterion_type
when 'Interaction'
t('interaction_description', 'No student/teacher interaction for %{count} days', :count => criterion.threshold)
t('interaction_description', 'No student/teacher interaction for %{count} days', :count => n(criterion.threshold))
when 'UngradedCount'
t('ungraded_count_description', '%{count} or more submissions have not been graded', :count => criterion.threshold)
t('ungraded_count_description', '%{count} or more submissions have not been graded', :count => n(criterion.threshold))
when 'UngradedTimespan'
t('ungraded_timespan_description', 'A submission has been left ungraded for %{count} days', :count => criterion.threshold)
t('ungraded_timespan_description', 'A submission has been left ungraded for %{count} days', :count => n(criterion.threshold))
when 'UserNote'
t('usernote_description', 'No faculty journal entries for %{count} days', :count => criterion.threshold)
t('usernote_description', 'No faculty journal entries for %{count} days', :count => n(criterion.threshold))
end
%></em></p>
<% end %>

View File

@ -16,13 +16,13 @@
<%=
case criterion.criterion_type
when 'Interaction'
t('interaction_description', {:one => 'No student/teacher interaction for one day', :other =>'No student/teacher interaction for %{count} or more days'},:count => criterion.threshold)
t('interaction_description', {:one => 'No student/teacher interaction for one day', :other =>'No student/teacher interaction for %{count} or more days'},:count => n(criterion.threshold))
when 'UngradedCount'
t('ungraded_count_description', {:one => 'One or more assignments have not been graded', :other =>'%{count} or more assignments have not been graded'}, :count => criterion.threshold)
t('ungraded_count_description', {:one => 'One or more assignments have not been graded', :other =>'%{count} or more assignments have not been graded'}, :count => n(criterion.threshold))
when 'UngradedTimespan'
t('ungraded_timespan_description', {:one => 'One or more submissions have been left ungraded for one or more days', :other =>'One or more submissions have been left ungraded for %{count} or more days'}, :count => criterion.threshold)
t('ungraded_timespan_description', {:one => 'One or more submissions have been left ungraded for one or more days', :other =>'One or more submissions have been left ungraded for %{count} or more days'}, :count => n(criterion.threshold))
when 'UserNote'
t('usernote_description', {:one => 'No faculty journal entries for a day or more', :other =>'No faculty journal entries for %{count} or more days'}, :count => criterion.threshold)
t('usernote_description', {:one => 'No faculty journal entries for a day or more', :other =>'No faculty journal entries for %{count} or more days'}, :count => n(criterion.threshold))
end
%>
<% end %>

View File

@ -4,11 +4,11 @@
<% define_content :subject do %>
<%= t('subject', '%{count} new files added for the course, %{name}:',
:count => data.count,
:count => n(data.count),
:name => asset.context.name) %>
<% end %>
<%= t('body', '%{count} new files have been added for the course, %{name}:',
:count => data.count,
:count => n(data.count),
:name => asset.context.name) %>
<%= t 'link', 'You can view them here' %>

View File

@ -4,7 +4,7 @@
<% define_content :subject do %>
<%= t('subject', '%{count} new files added for the course, %{name}:',
:count => data.count,
:count => n(data.count),
:name => asset.context.name) %>
<% end %>
@ -15,5 +15,5 @@
<% end %>
<p><%= t('body', '%{count} new files have been added for the course, %{name}:',
:count => data.count,
:count => n(data.count),
:name => asset.context.name) %></p>

View File

@ -2,6 +2,6 @@
<%= polymorphic_url([asset.context, :files]) %>
<% end -%>
<%= t('body', '%{count} new files added for %{name}.',
:count => data.count,
:count => n(data.count),
:name => asset.context.name) %>
<%= t('link', 'More info at %{link}', :link => content(:link)) %>

View File

@ -3,11 +3,11 @@
<% end %>
<% define_content :subject do %>
<%= t('subject', '%{count} new files added for the course, %{name}:',
:count => data.count,
:count => n(data.count),
:name => asset.context.name) %>
<% end %>
<%= t('body', '%{count} new files added for %{name}.',
:count => data.count,
:count => n(data.count),
:name => asset.context.name) %>
<%= t 'link', 'You can view them here' %>

View File

@ -2,5 +2,5 @@
<%= polymorphic_url([asset.context, :files]) %>
<% end -%>
<%= t('body', 'Canvas Alert - %{count} new files for %{name}',
:count => data.count,
:count => n(data.count),
:name => asset.context.name) %>

View File

@ -1,4 +1,4 @@
<% define_content :link do -%>
<%= communication_profile_url %>
<% end %>
<%= t :notifications_sms, "%{notifications_count} new notifications at %{url}", :notifications_count => delayed_messages.length, :url => content(:link) %>
<%= t :notifications_sms, "%{notifications_count} new notifications at %{url}", :notifications_count => n(delayed_messages.length), :url => content(:link) %>

View File

@ -1,4 +1,4 @@
<% define_content :link do -%>
<%= communication_profile_url %>
<% end %>
<%= t :tweet, "Canvas Alert - %{notification_count} new notifications", :notification_count => delayed_messages.length %>
<%= t :tweet, "Canvas Alert - %{notification_count} new notifications", :notification_count => n(delayed_messages.length) %>