Add support for Great Britain language on the Say verb.

kyleconroy · kyleconroy · commit 43a6350be9e6 · 2011-11-02T16:33:03.000-07:00
diff --git a/tests/test_twiml.py b/tests/test_twiml.py
@@ -63,6 +63,13 @@ def testSayLoop(self):
         r = self.strip(r)
         self.assertEquals(r, '<?xml version="1.0" encoding="UTF-8"?><Response><Say loop="3">Hello Monkey</Say></Response>')
 
+    def testSayLoopGreatBritian(self):
+        """should say have a woman say hello monkey and loop 3 times"""
+        r = Response()
+        r.append(twiml.Say("Hello Monkey", language="en-gb"))
+        r = self.strip(r)
+        self.assertEquals(r, '<?xml version="1.0" encoding="UTF-8"?><Response><Say language="en-gb">Hello Monkey</Say></Response>')
+
     def testSayLoopWoman(self):
         """should say have a woman say hello monkey and loop 3 times"""
         r = Response()
diff --git a/twilio/twiml.py b/twilio/twiml.py
@@ -188,7 +188,7 @@ class Say(Verb):
     :param language: allows you pick a voice with a specific language's accent
                      and pronunciations. Twilio currently supports languages
                      'en' (English), 'es' (Spanish), 'fr' (French), and 'de'
-                     (German).
+                     (German), 'en-gb' (English Great Britain").
 
     :param loop: specifies how many times you'd like the text repeated.
                  Specifying '0' will cause the the :class:`Say` verb to loop
@@ -198,6 +198,7 @@ class Say(Verb):
     WOMAN = 'woman'
 
     ENGLISH = 'en'
+    BRITISH = 'en-gb'
     SPANISH = 'es'
     FRENCH = 'fr'
     GERMAN = 'de'
@@ -206,14 +207,6 @@ def __init__(self, text, voice=None, language=None, loop=None, **kwargs):
         Verb.__init__(self, voice=voice, language=language, loop=loop,
             **kwargs)
         self.body = text
-        if voice and voice not in [self.MAN, self.WOMAN]:
-            raise TwimlException(
-                "Invalid Say voice parameter, must be 'man' or 'woman'")
-        if language and language not in \
-                [self.ENGLISH, self.SPANISH, self.FRENCH, self.GERMAN]:
-            raise TwimlException(
-                "Invalid Say language parameter, must be "
-                "'en', 'es', 'fr', or 'de'")
 
 class Play(Verb):
     """Play an audio file at a URL
