quiz: stop quizzes and timers on cleanup

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / poll.rb

diff --git a/data/rbot/plugins/poll.rb b/data/rbot/plugins/poll.rb
index 79f663f155df7e9c3e83ccf9797fd06d63e37310..814b2673ff67390a65dbb346d7475c10734672eb 100644 (file)
--- a/data/rbot/plugins/poll.rb
+++ b/data/rbot/plugins/poll.rb
@@ -67,6 +67,7 @@ class ::Poll
       @voters[voter] = choice
 
       return _("recorded your vote for %{choice}: %{value}") % {
+        :choice => choice,
         :value => @answers[choice][:value]
       }
     else
@@ -87,7 +88,7 @@ class ::Poll
   end
 
   def options
-    options = _("options are: ")
+    options = _("options are: ").dup
     @answers.each { |letter, info|
       options << "#{Bold}#{letter}#{NormalText}) #{info[:value]} "
     }
@@ -201,7 +202,7 @@ class PollPlugin < Plugin
     command = _("poll vote %{id} <SINGLE-LETTER>") % {
       :id => poll.id
     }
-    instructions = _("you have %{duration}, vote with ")
+    instructions = _("you have %{duration}, vote with ").dup
     instructions << _("%{priv} or %{public}")
     m.reply instructions % {
       :duration => "#{Bold}#{target_duration}#{Bold}",
@@ -327,12 +328,12 @@ class PollPlugin < Plugin
       outcome << " #{poll.outcome}"
     end
 
-    m.reply (to_reply % {
+    m.reply((to_reply % {
       :bold => Bold,
       :id => poll.id, :author => poll.author, :channel => poll.channel,
       :started => poll.started,
       :end => poll.ends_at
-    }) + options + outcome
+    }) + options + outcome)
   end
 
   def help(plugin,topic="")