From 2928ce6ca15b89a958e9d62db20cc2febda2386b Mon Sep 17 00:00:00 2001
From: Vikhyat Korrapati <vikhyatk@gmail.com>
Date: Fri, 11 Apr 2014 08:41:37 +0530
Subject: [PATCH] Remove the colon from the poll prefix, drop regex support.

This is needed to make it possible to programmatically toggle between
open and closed polls.
---
 plugins/poll/config/locales/server.en.yml  | 4 ++--
 plugins/poll/config/locales/server.es.yml  | 4 ++--
 plugins/poll/config/locales/server.fr.yml  | 4 ++--
 plugins/poll/config/locales/server.it.yml  | 4 ++--
 plugins/poll/poll.rb                       | 2 +-
 plugins/poll/spec/poll_plugin/poll_spec.rb | 8 ++++----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/poll/config/locales/server.en.yml b/plugins/poll/config/locales/server.en.yml
index 143aac27f3..3a74435068 100644
--- a/plugins/poll/config/locales/server.en.yml
+++ b/plugins/poll/config/locales/server.en.yml
@@ -13,5 +13,5 @@ en:
     must_contain_poll_options: "must contain a list of poll options"
     cannot_have_modified_options: "cannot be modified after the first five minutes. Contact a moderator if you need to change them."
     cannot_add_or_remove_options: "can only be edited, not added or removed. If you need to add or remove options you should lock this topic and create a new one."
-    prefix: "Poll:"
-    closed_prefix: "Closed Poll:"
+    prefix: "Poll"
+    closed_prefix: "Closed Poll"
diff --git a/plugins/poll/config/locales/server.es.yml b/plugins/poll/config/locales/server.es.yml
index f4b8e77101..bc6c0bb2a7 100644
--- a/plugins/poll/config/locales/server.es.yml
+++ b/plugins/poll/config/locales/server.es.yml
@@ -13,5 +13,5 @@ es:
     must_contain_poll_options: "debe que contener una lista con las respuestas de la encuesta"
     cannot_have_modified_options: "no se pueden modificar las respuestas de la encuesta pasados 5 minutos"
     cannot_add_or_remove_options: "solo se puede modificar, no se pueden añadir o quitar. Si necesitas añadir o quitar respuestas debes bloquear este tema y crear una encuesta nueva."
-    prefix: "Encuesta:"
-    closed_prefix: "Encuesta Cerrada:"
+    prefix: "Encuesta"
+    closed_prefix: "Encuesta Cerrada"
diff --git a/plugins/poll/config/locales/server.fr.yml b/plugins/poll/config/locales/server.fr.yml
index fc857f72d1..0372d6abe0 100644
--- a/plugins/poll/config/locales/server.fr.yml
+++ b/plugins/poll/config/locales/server.fr.yml
@@ -19,5 +19,5 @@ fr:
     must_contain_poll_options: "doit contenir une liste d'options pour le sondage"
     cannot_have_modified_options: "ne peuvent pas être modifiés après 5 minutes. Merci de contacter un moderateur, si vous souhaitez les modifier"
     cannot_add_or_remove_options: "peuvent seulement être modifiés. Si vous souhaitez en supprimer ou en ajouter, veuillez créer un nouveau sujet."
-    prefix: "Sondage\\s?:"
-    closed_prefix: "Sondage fermé\\s?:"
+    prefix: "Sondage "
+    closed_prefix: "Sondage fermé "
diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml
index 0d92f3bf3e..096fae740e 100644
--- a/plugins/poll/config/locales/server.it.yml
+++ b/plugins/poll/config/locales/server.it.yml
@@ -13,5 +13,5 @@ it:
     must_contain_poll_options: "deve contenere una lista di opzioni per il sondaggio"
     cannot_have_modified_options: "non possono essere modificate dopo i primi cinque minuti. Contatta un moderatore se hai bisogno di cambiarle."
     cannot_add_or_remove_options: "non possono essere modificate, aggiunte o rimosse. Se vuoi aggiungere o rimuovere opzioni al sondaggio, devi bloccare questo topice crearne uno nuovo."
-    prefix: "Sondaggio:"
-    closed_prefix: "Sondaggio Chiuso:"
+    prefix: "Sondaggio"
+    closed_prefix: "Sondaggio Chiuso"
diff --git a/plugins/poll/poll.rb b/plugins/poll/poll.rb
index 5fec929658..57d8632cf3 100644
--- a/plugins/poll/poll.rb
+++ b/plugins/poll/poll.rb
@@ -21,7 +21,7 @@ module ::PollPlugin
         return false
       end
 
-      topic.title =~ /^(#{I18n.t('poll.prefix')}|#{I18n.t('poll.closed_prefix')})/i
+      topic.title =~ /^(#{I18n.t('poll.prefix').strip}|#{I18n.t('poll.closed_prefix').strip})\s?:/i
     end
 
     def has_poll_details?
diff --git a/plugins/poll/spec/poll_plugin/poll_spec.rb b/plugins/poll/spec/poll_plugin/poll_spec.rb
index 1c32d87fb5..caa1c45236 100644
--- a/plugins/poll/spec/poll_plugin/poll_spec.rb
+++ b/plugins/poll/spec/poll_plugin/poll_spec.rb
@@ -14,12 +14,12 @@ describe PollPlugin::Poll do
     expect(poll.is_poll?).to be_false
   end
 
-  it "allows the prefix translation to contain regular expressions" do
-    topic.title = "Poll : This might be a poll"
+  it "strips whitespace from the prefix translation" do
+    topic.title = "Polll: This might be a poll"
     topic.save
     expect(PollPlugin::Poll.new(post).is_poll?).to be_false
-    I18n.expects(:t).with('poll.prefix').returns("Poll\\s?:")
-    I18n.expects(:t).with('poll.closed_prefix').returns("Closed Poll\\s?:")
+    I18n.expects(:t).with('poll.prefix').returns("Polll ")
+    I18n.expects(:t).with('poll.closed_prefix').returns("Closed Poll ")
     expect(PollPlugin::Poll.new(post).is_poll?).to be_true
   end