aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2011-07-04 15:16:08 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2011-07-04 15:16:08 +0100
commit7955f018ab4dcbc0406dd83d4b62924be68dc072 (patch)
treef7d7cfb20211db0921acefb1c684a2c79fe49a93
parent523acaf4501313b2462bb21f90f248d5d8e4d932 (diff)
Spell acknowledge correctly!
-rw-r--r--lib/mauve/notifiers/templates/email.html.erb2
-rw-r--r--lib/mauve/notifiers/templates/email.txt.erb2
-rw-r--r--lib/mauve/notifiers/templates/xmpp.txt.erb2
-rw-r--r--lib/mauve/web_interface.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/mauve/notifiers/templates/email.html.erb b/lib/mauve/notifiers/templates/email.html.erb
index 929237a..c2016fd 100644
--- a/lib/mauve/notifiers/templates/email.html.erb
+++ b/lib/mauve/notifiers/templates/email.html.erb
@@ -5,7 +5,7 @@
case alert.update_type.to_sym
when :cleared
%><%= alert.cleared_at.to_s_relative %><%
-when :acknowleged
+when :acknowledged
%><%= alert.acknowledged_at.to_s_relative %><%
else
%><%= alert.raised_at.to_s_relative %><%
diff --git a/lib/mauve/notifiers/templates/email.txt.erb b/lib/mauve/notifiers/templates/email.txt.erb
index 7f4f081..dbbd3fa 100644
--- a/lib/mauve/notifiers/templates/email.txt.erb
+++ b/lib/mauve/notifiers/templates/email.txt.erb
@@ -2,7 +2,7 @@
case alert.update_type.to_sym
when :cleared
%><%= alert.cleared_at.to_s_relative %><%
-when :acknowleged
+when :acknowledged
%><%= alert.acknowledged_at.to_s_relative %><%
else
%><%= alert.raised_at.to_s_relative %><%
diff --git a/lib/mauve/notifiers/templates/xmpp.txt.erb b/lib/mauve/notifiers/templates/xmpp.txt.erb
index c123038..331d7ef 100644
--- a/lib/mauve/notifiers/templates/xmpp.txt.erb
+++ b/lib/mauve/notifiers/templates/xmpp.txt.erb
@@ -2,7 +2,7 @@
case alert.update_type.to_sym
when :cleared
%><%= alert.cleared_at.to_s_relative %><%
-when :acknowleged
+when :acknowledged
%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by %><%
else
%><%= alert.raised_at.to_s_relative %><%
diff --git a/lib/mauve/web_interface.rb b/lib/mauve/web_interface.rb
index 29e41f7..3770924 100644
--- a/lib/mauve/web_interface.rb
+++ b/lib/mauve/web_interface.rb
@@ -324,7 +324,7 @@ EOF
alert.acknowledge!(@person, ack_until)
- flash['notice'] = "Successfully acknowleged alert <em>#{alert.alert_id}</em> from source #{alert.source}."
+ flash['notice'] = "Successfully acknowledged alert <em>#{alert.alert_id}</em> from source #{alert.source}."
redirect "/alert/#{alert.id}"
end