json: Add conditionals to avoid locking if Jansson is thread safe.
[asterisk/asterisk.git] / main / say.c
index a43321a..a44ba85 100644 (file)
  * \brief Say numbers and dates (maybe words one day too)
  *
  * \author Mark Spencer <markster@digium.com>
- * 
+ *
  * \note 12-16-2004 : Support for Greek added by InAccess Networks (work funded by HOL, www.hol.gr) George Konstantoulakis <gkon@inaccessnetworks.com>
- *                                             
+ *
+ * \note 2007-02-08 : Support for Georgian added by Alexander Shaduri <ashaduri@gmail.com>,
+ *                                             Next Generation Networks (NGN).
+ * \note 2007-03-20 : Support for Thai added by Dome C. <dome@tel.co.th>,
+ *                                             IP Crossing Co., Ltd.
  */
 
-#include "asterisk.h"
+/*** MODULEINFO
+       <support_level>core</support_level>
+ ***/
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "asterisk.h"
 
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
 #include <netinet/in.h>
 #include <time.h>
 #include <ctype.h>
 #include <math.h>
-#include <stdio.h>
 
 #ifdef SOLARIS
 #include <iso/limits_iso.h>
@@ -46,26 +48,28 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
-#include "asterisk/options.h"
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
 #include "asterisk/localtime.h"
 #include "asterisk/utils.h"
+#include "asterisk/app.h"
+#include "asterisk/test.h"
 
 /* Forward declaration */
 static int wait_file(struct ast_channel *chan, const char *ints, const char *file, const char *lang);
 
 
-static int say_character_str_full(struct ast_channel *chan, const char *str, const char *ints, const char *lang, int audiofd, int ctrlfd)
+static int say_character_str_full(struct ast_channel *chan, const char *str, const char *ints, const char *lang, enum ast_say_case_sensitivity sensitivity, int audiofd, int ctrlfd)
 {
        const char *fn;
-       char fnbuf[256];
+       char fnbuf[10], asciibuf[20] = "letters/ascii";
        char ltr;
        int num = 0;
        int res = 0;
+       int upper = 0;
+       int lower = 0;
 
-       while (str[num]) {
+       while (str[num] && !res) {
                fn = NULL;
                switch (str[num]) {
                case ('*'):
@@ -117,15 +121,51 @@ static int say_character_str_full(struct ast_channel *chan, const char *str, con
                        break;
                default:
                        ltr = str[num];
-                       if ('A' <= ltr && ltr <= 'Z') ltr += 'a' - 'A';         /* file names are all lower-case */
-                       strcpy(fnbuf, "letters/X");
-                       fnbuf[8] = ltr;
+                       if ('A' <= ltr && ltr <= 'Z') {
+                               ltr += 'a' - 'A';               /* file names are all lower-case */
+                               switch (sensitivity) {
+                               case AST_SAY_CASE_UPPER:
+                               case AST_SAY_CASE_ALL:
+                                       upper = !upper;
+                               case AST_SAY_CASE_LOWER:
+                               case AST_SAY_CASE_NONE:
+                                       break;
+                               }
+                       } else if ('a' <= ltr && ltr <= 'z') {
+                               switch (sensitivity) {
+                               case AST_SAY_CASE_LOWER:
+                               case AST_SAY_CASE_ALL:
+                                       lower = !lower;
+                               case AST_SAY_CASE_UPPER:
+                               case AST_SAY_CASE_NONE:
+                                       break;
+                               }
+                       }
+
+                       if (upper) {
+                               strcpy(fnbuf, "uppercase");
+                       } else if (lower) {
+                               strcpy(fnbuf, "lowercase");
+                       } else {
+                               strcpy(fnbuf, "letters/X");
+                               fnbuf[8] = ltr;
+                       }
                        fn = fnbuf;
                }
-               res = ast_streamfile(chan, fn, lang);
-               if (!res) 
-                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-               ast_stopstream(chan);
+               if ((fn && ast_fileexists(fn, NULL, lang) > 0) ||
+                       (snprintf(asciibuf + 13, sizeof(asciibuf) - 13, "%d", str[num]) > 0 && ast_fileexists(asciibuf, NULL, lang) > 0 && (fn = asciibuf))) {
+                       res = ast_streamfile(chan, fn, lang);
+                       if (!res) {
+                               if ((audiofd  > -1) && (ctrlfd > -1))
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               else
+                                       res = ast_waitstream(chan, ints);
+                       }
+                       ast_stopstream(chan);
+               }
+               if (upper || lower) {
+                       continue;
+               }
                num++;
        }
 
@@ -140,7 +180,7 @@ static int say_phonetic_str_full(struct ast_channel *chan, const char *str, cons
        int num = 0;
        int res = 0;
 
-       while (str[num]) {
+       while (str[num] && !res) {
                fn = NULL;
                switch (str[num]) {
                case ('*'):
@@ -196,10 +236,16 @@ static int say_phonetic_str_full(struct ast_channel *chan, const char *str, cons
                        fnbuf[9] = ltr;
                        fn = fnbuf;
                }
-               res = ast_streamfile(chan, fn, lang);
-               if (!res) 
-                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-               ast_stopstream(chan);
+               if (fn && ast_fileexists(fn, NULL, lang) > 0) {
+                       res = ast_streamfile(chan, fn, lang);
+                       if (!res) {
+                               if ((audiofd  > -1) && (ctrlfd > -1))
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               else
+                                       res = ast_waitstream(chan, ints);
+                       }
+                       ast_stopstream(chan);
+               }
                num++;
        }
 
@@ -240,10 +286,14 @@ static int say_digit_str_full(struct ast_channel *chan, const char *str, const c
                        fn = fnbuf;
                        break;
                }
-               if (fn) {
+               if (fn && ast_fileexists(fn, NULL, lang) > 0) {
                        res = ast_streamfile(chan, fn, lang);
-                       if (!res) 
-                               res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                       if (!res) {
+                               if ((audiofd  > -1) && (ctrlfd > -1))
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               else
+                                       res = ast_waitstream(chan, ints);
+                       }
                        ast_stopstream(chan);
                }
                num++;
@@ -265,22 +315,25 @@ static int say_digit_str_full(struct ast_channel *chan, const char *str, const c
       \arg \b es    - Spanish, Mexican
       \arg \b fr    - French
       \arg \b he    - Hebrew
+      \arg \b is    - Icelandic
       \arg \b it    - Italian
       \arg \b nl    - Dutch
       \arg \b no    - Norwegian
-      \arg \b pl    - Polish       
+      \arg \b pl    - Polish
       \arg \b pt    - Portuguese
       \arg \b pt_BR - Portuguese (Brazil)
       \arg \b se    - Swedish
-      \arg \b tw    - Taiwanese / Chinese
+      \arg \b zh    - Taiwanese / Chinese
       \arg \b ru    - Russian
+      \arg \b ka    - Georgian
+      \arg \b hu    - Hungarian
 
  \par Gender:
  For Some languages the numbers differ for gender and plural.
  \arg Use the option argument 'f' for female, 'm' for male and 'n' for neuter in languages like Portuguese, French, Spanish and German.
  \arg use the option argument 'c' is for commune and 'n' for neuter gender in nordic languages like Danish, Swedish and Norwegian.
  use the option argument 'p' for plural enumerations like in German
+
  Date/Time functions currently have less languages supported than saynumber().
 
  \todo Note that in future, we need to move to a model where we can differentiate further - e.g. between en_US & en_UK
@@ -312,27 +365,37 @@ static int say_digit_str_full(struct ast_channel *chan, const char *str, const c
 
 /* Forward declarations of language specific variants of ast_say_number_full */
 static int ast_say_number_full_en(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
-static int ast_say_number_full_cz(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
+static int ast_say_number_full_cs(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_number_full_da(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_number_full_de(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_number_full_en_GB(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
 static int ast_say_number_full_es(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_number_full_fr(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_number_full_he(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
+static int ast_say_number_full_is(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_number_full_it(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
 static int ast_say_number_full_nl(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
 static int ast_say_number_full_no(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_number_full_pl(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_number_full_se(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
-static int ast_say_number_full_tw(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
+static int ast_say_number_full_zh(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
 static int ast_say_number_full_gr(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
+static int ast_say_number_full_ja(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
 static int ast_say_number_full_ru(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
+static int ast_say_number_full_ka(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
+static int ast_say_number_full_hu(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
+static int ast_say_number_full_th(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
+static int ast_say_number_full_ur(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
+static int ast_say_number_full_vi(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
 
 /* Forward declarations of language specific variants of ast_say_enumeration_full */
 static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
 static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
 static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
+static int ast_say_enumeration_full_he(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
+static int ast_say_enumeration_full_is(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd);
+static int ast_say_enumeration_full_vi(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd);
 
 /* Forward declarations of ast_say_date, ast_say_datetime and ast_say_time functions */
 static int ast_say_date_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
@@ -342,19 +405,29 @@ static int ast_say_date_fr(struct ast_channel *chan, time_t t, const char *ints,
 static int ast_say_date_nl(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_date_pt(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_date_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
-
-static int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_da(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_de(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_es(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_he(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_fr(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_it(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_nl(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_pl(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_pt(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_tw(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
-static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
+static int ast_say_date_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_date_ka(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_date_hu(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_date_th(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_date_he(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_date_is(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+
+static int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_es(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_he(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_fr(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_is(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_pl(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_pt(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_zh(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_th(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
+static int ast_say_date_with_format_vi(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone);
 
 static int ast_say_time_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_time_de(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
@@ -362,8 +435,13 @@ static int ast_say_time_fr(struct ast_channel *chan, time_t t, const char *ints,
 static int ast_say_time_nl(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_time_pt(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_time_pt_BR(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
-static int ast_say_time_tw(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_time_zh(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_time_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_time_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_time_ka(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_time_hu(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_time_th(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_time_he(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 
 static int ast_say_datetime_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_datetime_de(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
@@ -371,123 +449,170 @@ static int ast_say_datetime_fr(struct ast_channel *chan, time_t t, const char *i
 static int ast_say_datetime_nl(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_datetime_pt(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_datetime_pt_BR(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
-static int ast_say_datetime_tw(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_datetime_zh(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_datetime_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_datetime_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_datetime_ka(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_datetime_hu(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_datetime_th(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_datetime_he(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 
 static int ast_say_datetime_from_now_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_datetime_from_now_fr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 static int ast_say_datetime_from_now_pt(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_datetime_from_now_ka(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+static int ast_say_datetime_from_now_he(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
 
-static int wait_file(struct ast_channel *chan, const char *ints, const char *file, const char *lang) 
+static int wait_file(struct ast_channel *chan, const char *ints, const char *file, const char *lang)
 {
        int res;
-       if ((res = ast_streamfile(chan, file, lang)))
+       if ((res = ast_streamfile(chan, file, lang))) {
                ast_log(LOG_WARNING, "Unable to play message %s\n", file);
-       if (!res)
+       }
+       if (!res) {
                res = ast_waitstream(chan, ints);
+       }
        return res;
 }
 
-/*! \brief  ast_say_number_full: call language-specific functions */
-/* Called from AGI */
+/*! \brief  ast_say_number_full: call language-specific functions
+     \note Called from AGI */
 static int say_number_full(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
-       if (!strcasecmp(language,"en") ) {      /* English syntax */
-          return(ast_say_number_full_en(chan, num, ints, language, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "cz") ) {      /* Czech syntax */
-          return(ast_say_number_full_cz(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "da") ) {      /* Danish syntax */
-          return(ast_say_number_full_da(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "de") ) {      /* German syntax */
-          return(ast_say_number_full_de(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "en_GB") ) {   /* British syntax */
-          return(ast_say_number_full_en_GB(chan, num, ints, language, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "no") ) {      /* Norwegian syntax */
-          return(ast_say_number_full_no(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "es") || !strcasecmp(language, "mx")) {        /* Spanish syntax */
-          return(ast_say_number_full_es(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "fr") ) {      /* French syntax */
-          return(ast_say_number_full_fr(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "he") ) {      /* Hebrew syntax */
-          return(ast_say_number_full_he(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "it") ) {      /* Italian syntax */
-          return(ast_say_number_full_it(chan, num, ints, language, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "nl") ) {      /* Dutch syntax */
-          return(ast_say_number_full_nl(chan, num, ints, language, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "pl") ) {      /* Polish syntax */
-          return(ast_say_number_full_pl(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "pt") || !strcasecmp(language, "pt_BR")) {     /* Portuguese syntax */
-          return(ast_say_number_full_pt(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "se") ) {      /* Swedish syntax */
-          return(ast_say_number_full_se(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "tw") || !strcasecmp(language, "zh") ) {       /* Taiwanese / Chinese syntax */
-          return(ast_say_number_full_tw(chan, num, ints, language, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "gr") ) {      /* Greek syntax */
-          return(ast_say_number_full_gr(chan, num, ints, language, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "ru") ) {      /* Russian syntax */
-          return(ast_say_number_full_ru(chan, num, ints, language, options, audiofd, ctrlfd));
+       ast_test_suite_event_notify("SAYNUM", "Message: saying number %d\r\nNumber: %d\r\nChannel: %s", num, num, ast_channel_name(chan));
+       if (!strncasecmp(language, "en_GB", 5)) {     /* British syntax */
+          return ast_say_number_full_en_GB(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "en", 2)) { /* English syntax */
+          return ast_say_number_full_en(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "cs", 2)) { /* Czech syntax */
+          return ast_say_number_full_cs(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "cz", 2)) { /* deprecated Czech syntax */
+               static int deprecation_warning = 0;
+               if (deprecation_warning++ % 10 == 0) {
+                       ast_log(LOG_WARNING, "cz is not a standard language code.  Please switch to using cs instead.\n");
+               }
+               return ast_say_number_full_cs(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "da", 2)) { /* Danish syntax */
+          return ast_say_number_full_da(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "de", 2)) { /* German syntax */
+          return ast_say_number_full_de(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "es", 2)) { /* Spanish syntax */
+          return ast_say_number_full_es(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "fr", 2)) { /* French syntax */
+          return ast_say_number_full_fr(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "ge", 2)) { /* deprecated Georgian syntax */
+               static int deprecation_warning = 0;
+               if (deprecation_warning++ % 10 == 0) {
+                       ast_log(LOG_WARNING, "ge is not a standard language code.  Please switch to using ka instead.\n");
+               }
+               return ast_say_number_full_ka(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "gr", 2)) { /* Greek syntax */
+          return ast_say_number_full_gr(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "ja", 2)) { /* Japanese syntax */
+          return ast_say_number_full_ja(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "he", 2)) { /* Hebrew syntax */
+          return ast_say_number_full_he(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "hu", 2)) { /* Hungarian syntax */
+               return ast_say_number_full_hu(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "is", 2)) { /* Icelandic syntax */
+               return ast_say_number_full_is(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "it", 2)) { /* Italian syntax */
+          return ast_say_number_full_it(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "ka", 2)) { /* Georgian syntax */
+          return ast_say_number_full_ka(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "mx", 2)) { /* deprecated Mexican syntax */
+               static int deprecation_warning = 0;
+               if (deprecation_warning++ % 10 == 0) {
+                       ast_log(LOG_WARNING, "mx is not a standard language code.  Please switch to using es_MX instead.\n");
+               }
+               return ast_say_number_full_es(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "nl", 2)) { /* Dutch syntax */
+          return ast_say_number_full_nl(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "no", 2)) { /* Norwegian syntax */
+          return ast_say_number_full_no(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "pl", 2)) { /* Polish syntax */
+          return ast_say_number_full_pl(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "pt", 2)) { /* Portuguese syntax */
+          return ast_say_number_full_pt(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "ru", 2)) { /* Russian syntax */
+          return ast_say_number_full_ru(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "se", 2)) { /* Swedish syntax */
+          return ast_say_number_full_se(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "th", 2)) { /* Thai syntax */
+               return ast_say_number_full_th(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "tw", 2)) { /* deprecated Taiwanese syntax */
+               static int deprecation_warning = 0;
+               if (deprecation_warning++ % 10 == 0) {
+                       ast_log(LOG_WARNING, "tw is a standard language code for Twi, not Taiwanese.  Please switch to using zh_TW instead.\n");
+               }
+               return ast_say_number_full_zh(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "zh", 2)) { /* Taiwanese / Chinese syntax */
+          return ast_say_number_full_zh(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "ur", 2)) { /* Urdu syntax */
+               return ast_say_number_full_ur(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "vi", 2)) { /* Vietnamese syntax */
+               return ast_say_number_full_vi(chan, num, ints, language, audiofd, ctrlfd);
        }
 
        /* Default to english */
-       return(ast_say_number_full_en(chan, num, ints, language, audiofd, ctrlfd));
+       return ast_say_number_full_en(chan, num, ints, language, audiofd, ctrlfd);
 }
 
-/*! \brief  ast_say_number_full_en: English syntax */
-/* This is the default syntax, if no other syntax defined in this file is used */
+/*! \brief  ast_say_number_full_en: English syntax
+       \note This is the default syntax, if no other syntax defined in this file is used */
 static int ast_say_number_full_en(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
 {
        int res = 0;
        int playh = 0;
        char fn[256] = "";
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-       while(!res && (num || playh)) {
+       while (!res && (num || playh)) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
                } else  if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
                        num = 0;
                } else  if (num < 100) {
                        snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
-                       num -= ((num / 10) * 10);
+                       num %= 10;
                } else {
                        if (num < 1000){
                                snprintf(fn, sizeof(fn), "digits/%d", (num/100));
                                playh++;
-                               num -= ((num / 100) * 100);
+                               num %= 100;
                        } else {
                                if (num < 1000000) { /* 1,000,000 */
                                        res = ast_say_number_full_en(chan, num / 1000, ints, language, audiofd, ctrlfd);
                                        if (res)
                                                return res;
-                                       num = num % 1000;
+                                       num %= 1000;
                                        snprintf(fn, sizeof(fn), "digits/thousand");
                                } else {
                                        if (num < 1000000000) { /* 1,000,000,000 */
                                                res = ast_say_number_full_en(chan, num / 1000000, ints, language, audiofd, ctrlfd);
                                                if (res)
                                                        return res;
-                                               num = num % 1000000;
-                                               snprintf(fn, sizeof(fn), "digits/million");
+                                               num %= 1000000;
+                                               ast_copy_string(fn, "digits/million", sizeof(fn));
                                        } else {
-                                               if (option_debug)
-                                                       ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                                               ast_debug(1, "Number '%d' is too big for me\n", num);
                                                res = -1;
                                        }
                                }
                        }
                }
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
+                       if (!ast_streamfile(chan, fn, language)) {
                                if ((audiofd  > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
                                else
@@ -507,109 +632,110 @@ static int exp10_int(int power)
        return res;
 }
 
-/*! \brief  ast_say_number_full_cz: Czech syntax */
-/* files needed:
- * 1m,2m - gender male
- * 1w,2w - gender female
- * 3,4,...,20
- * 30,40,...,90
- * 
- * hundereds - 100 - sto, 200 - 2ste, 300,400 3,4sta, 500,600,...,900 5,6,...9set 
- * 
+/*! \brief  ast_say_number_full_cs: Czech syntax
+ *
+ * files needed:
+ * - 1m,2m - gender male
+ * - 1w,2w - gender female
+ * - 3,4,...,20
+ * - 30,40,...,90
+ *
+ * - hundereds - 100 - sto, 200 - 2ste, 300,400 3,4sta, 500,600,...,900 5,6,...9set
+ *
  * for each number 10^(3n + 3) exist 3 files represented as:
- *             1 tousand = jeden tisic = 1_E3
- *             2,3,4 tousands = dva,tri,ctyri tisice = 2-3_E3
- *             5,6,... tousands = pet,sest,... tisic = 5_E3
+ *             1 tousand = jeden tisic = 1_E3
+ *             2,3,4 tousands = dva,tri,ctyri tisice = 2-3_E3
+ *             5,6,... tousands = pet,sest,... tisic = 5_E3
  *
- *             million = _E6
- *             miliard = _E9
- *             etc...
+ *             million = _E6
+ *             miliard = _E9
+ *             etc...
  *
  * tousand, milion are  gender male, so 1 and 2 is 1m 2m
  * miliard is gender female, so 1 and 2 is 1w 2w
  */
-static int ast_say_number_full_cz(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
+static int ast_say_number_full_cs(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
        int res = 0;
        int playh = 0;
        char fn[256] = "";
-       
+
        int hundered = 0;
        int left = 0;
        int length = 0;
-       
+
        /* options - w = woman, m = man, n = neutral. Defaultl is woman */
        if (!options)
                options = "w";
-       
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-       
-       while(!res && (num || playh)) {
+
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+       while (!res && (num || playh)) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (num < 3 ) {
-                       snprintf(fn, sizeof(fn), "digits/%d%c",num,options[0]);
+                       snprintf(fn, sizeof(fn), "digits/%d%c", num, options[0]);
                        playh = 0;
                        num = 0;
                } else if (num < 20) {
-                       snprintf(fn, sizeof(fn), "digits/%d",num);
+                       snprintf(fn, sizeof(fn), "digits/%d", num);
                        playh = 0;
                        num = 0;
                } else if (num < 100) {
                        snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
-                       num -= ((num / 10) * 10);
+                       num %= 10;
                } else if (num < 1000) {
                        hundered = num / 100;
                        if ( hundered == 1 ) {
-                               snprintf(fn, sizeof(fn), "digits/1sto");
+                               ast_copy_string(fn, "digits/1sto", sizeof(fn));
                        } else if ( hundered == 2 ) {
-                               snprintf(fn, sizeof(fn), "digits/2ste");
+                               ast_copy_string(fn, "digits/2ste", sizeof(fn));
                        } else {
-                                       res = ast_say_number_full_cz(chan,hundered,ints,language,options,audiofd,ctrlfd);
+                               res = ast_say_number_full_cs(chan, hundered, ints, language, options, audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               if (hundered == 3 || hundered == 4) {   
-                                       snprintf(fn, sizeof(fn), "digits/sta");
+                               if (hundered == 3 || hundered == 4) {
+                                       ast_copy_string(fn, "digits/sta", sizeof(fn));
                                } else if ( hundered > 4 ) {
-                                       snprintf(fn, sizeof(fn), "digits/set");
+                                       ast_copy_string(fn, "digits/set", sizeof(fn));
                                }
                        }
                        num -= (hundered * 100);
                } else { /* num > 1000 */
-                       length = (int)log10(num)+1;  
+                       length = (int)log10(num)+1;
                        while ( (length % 3 ) != 1 ) {
-                               length--;               
+                               length--;
                        }
                        left = num / (exp10_int(length-1));
-                       if ( left == 2 ) {  
+                       if ( left == 2 ) {
                                switch (length-1) {
                                        case 9: options = "w";  /* 1,000,000,000 gender female */
                                                break;
                                        default : options = "m"; /* others are male */
                                }
                        }
-                       if ( left > 1 ) { /* we dont say "one thousand" but only thousand */
-                               res = ast_say_number_full_cz(chan,left,ints,language,options,audiofd,ctrlfd);
-                               if (res) 
+                       if ( left > 1 ) { /* we don't say "one thousand" but only thousand */
+                               res = ast_say_number_full_cs(chan, left, ints, language, options, audiofd, ctrlfd);
+                               if (res)
                                        return res;
                        }
                        if ( left >= 5 ) { /* >= 5 have the same declesion */
-                               snprintf(fn, sizeof(fn), "digits/5_E%d",length-1);      
+                               snprintf(fn, sizeof(fn), "digits/5_E%d", length - 1);
                        } else if ( left >= 2 && left <= 4 ) {
-                               snprintf(fn, sizeof(fn), "digits/2-4_E%d",length-1);
+                               snprintf(fn, sizeof(fn), "digits/2-4_E%d", length - 1);
                        } else { /* left == 1 */
-                               snprintf(fn, sizeof(fn), "digits/1_E%d",length-1);
+                               snprintf(fn, sizeof(fn), "digits/1_E%d", length - 1);
                        }
                        num -= left * (exp10_int(length-1));
                }
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
+                       if (!ast_streamfile(chan, fn, language)) {
                                if ((audiofd > -1) && (ctrlfd > -1)) {
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
                                } else {
@@ -619,12 +745,12 @@ static int ast_say_number_full_cz(struct ast_channel *chan, int num, const char
                        ast_stopstream(chan);
                }
        }
-       return res; 
+       return res;
 }
 
-/*! \brief  ast_say_number_full_da: Danish syntax */
-/* New files:
- In addition to English, the following sounds are required: "1N", "millions", "and" and "1-and" through "9-and" 
+/*! \brief  ast_say_number_full_da: Danish syntax
+ New files:
+ - In addition to English, the following sounds are required: "1N", "millions", "and" and "1-and" through "9-and"
  */
 static int ast_say_number_full_da(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
@@ -633,12 +759,12 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, const char
        int playa = 0;
        int cn = 1;             /* +1 = commune; -1 = neuter */
        char fn[256] = "";
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-       if (options && !strncasecmp(options, "n",1)) cn = -1;
+       if (options && !strncasecmp(options, "n", 1)) cn = -1;
 
-       while(!res && (num || playh || playa )) {
+       while (!res && (num || playh || playa )) {
                /* The grammar for Danish numbers is the same as for English except
                * for the following:
                * - 1 exists in both commune ("en", file "1N") and neuter ("et", file "1")
@@ -650,20 +776,20 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, const char
                *   four-and thirty" and 1000012 is "one million and twelve".
                */
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
                } else if (playa) {
-                       snprintf(fn, sizeof(fn), "digits/and");
+                       ast_copy_string(fn, "digits/and", sizeof(fn));
                        playa = 0;
                } else if (num == 1 && cn == -1) {
-                       snprintf(fn, sizeof(fn), "digits/1N");
+                       ast_copy_string(fn, "digits/1N", sizeof(fn));
                        num = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
@@ -681,7 +807,7 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, const char
                        if (num < 1000) {
                                int hundreds = num / 100;
                                if (hundreds == 1)
-                                       snprintf(fn, sizeof(fn), "digits/1N");
+                                       ast_copy_string(fn, "digits/1N", sizeof(fn));
                                else
                                        snprintf(fn, sizeof(fn), "digits/%d", (num / 100));
 
@@ -696,7 +822,7 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, const char
                                        if (res)
                                                return res;
                                        num = num % 1000;
-                                       snprintf(fn, sizeof(fn), "digits/thousand");
+                                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
                                } else {
                                        if (num < 1000000000) {
                                                int millions = num / 1000000;
@@ -704,13 +830,12 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, const char
                                                if (res)
                                                        return res;
                                                if (millions == 1)
-                                                       snprintf(fn, sizeof(fn), "digits/million");
+                                                       ast_copy_string(fn, "digits/million", sizeof(fn));
                                                else
-                                                       snprintf(fn, sizeof(fn), "digits/millions");
+                                                       ast_copy_string(fn, "digits/millions", sizeof(fn));
                                                num = num % 1000000;
                                        } else {
-                                               if (option_debug)
-                                                       ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                                               ast_debug(1, "Number '%d' is too big for me\n", num);
                                                res = -1;
                                        }
                                }
@@ -719,10 +844,10 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, const char
                        }
                }
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
-                               if ((audiofd > -1) && (ctrlfd > -1)) 
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else  
+                               else
                                        res = ast_waitstream(chan, ints);
                        }
                        ast_stopstream(chan);
@@ -731,14 +856,15 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, const char
        return res;
 }
 
-/*! \brief  ast_say_number_full_de: German syntax */
-/* New files:
+/*! \brief  ast_say_number_full_de: German syntax
+
+ New files:
  In addition to English, the following sounds are required:
- "millions"
- "1-and" through "9-and" 
- "1F" (eine)
- "1N" (ein)
- NB "1" is recorded as 'eins'
+ - "millions"
+ - "1-and" through "9-and"
+ - "1F" (eine)
+ - "1N" (ein)
+ - NB "1" is recorded as 'eins'
  */
 static int ast_say_number_full_de(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
@@ -746,13 +872,13 @@ static int ast_say_number_full_de(struct ast_channel *chan, int num, const char
        int mf = 1;                            /* +1 = male and neuter; -1 = female */
        char fn[256] = "";
        char fna[256] = "";
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-       if (options && (!strncasecmp(options, "f",1)))
+       if (options && (!strncasecmp(options, "f", 1)))
                mf = -1;
 
-       while(!res && num) {
+       while (!res && num) {
                /* The grammar for German numbers is the same as for English except
                * for the following:
                * - numbers 20 through 99 are said in reverse order, i.e. 21 is
@@ -762,17 +888,17 @@ static int ast_say_number_full_de(struct ast_channel *chan, int num, const char
                * - 1000 is 'tausend', however all other instances are 'ein tausend'
                * - 1000000 is always 'eine million'
                * - "million" is different in singular and plural form
+               * - 'and' should not go between a hundreds place value and any
+               *   tens/ones place values that follows it. i.e 136 is ein hundert
+               *   sechs und dreizig, not ein hundert und sechs und dreizig.
                */
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
-               } else if (num < 100 && t) {
-                       snprintf(fn, sizeof(fn), "digits/and");
-                       t = 0;
+                       }
                } else if (num == 1 && mf == -1) {
                        snprintf(fn, sizeof(fn), "digits/%dF", num);
                        num = 0;
@@ -789,71 +915,69 @@ static int ast_say_number_full_de(struct ast_channel *chan, int num, const char
                                num = 0;
                        }
                } else if (num == 100 && t == 0) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        num = 0;
                } else if (num < 1000) {
                        int hundreds = num / 100;
                        num = num % 100;
                        if (hundreds == 1) {
-                               snprintf(fn, sizeof(fn), "digits/1N");
+                               ast_copy_string(fn, "digits/1N", sizeof(fn));
                        } else {
                                snprintf(fn, sizeof(fn), "digits/%d", hundreds);
                        }
-                       snprintf(fna, sizeof(fna), "digits/hundred");
-                       t = 1;
+                       ast_copy_string(fna, "digits/hundred", sizeof(fna));
                } else if (num == 1000 && t == 0) {
-                       snprintf(fn, sizeof(fn), "digits/thousand");
+                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
                        num = 0;
-               } else  if (num < 1000000) {
+               } else if (num < 1000000) {
                        int thousands = num / 1000;
                        num = num % 1000;
                        t = 1;
                        if (thousands == 1) {
-                               snprintf(fn, sizeof(fn), "digits/1N");
-                               snprintf(fna, sizeof(fna), "digits/thousand");
+                               ast_copy_string(fn, "digits/1N", sizeof(fn));
+                               ast_copy_string(fna, "digits/thousand", sizeof(fna));
                        } else {
                                res = ast_say_number_full_de(chan, thousands, ints, language, options, audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               snprintf(fn, sizeof(fn), "digits/thousand");
+                               ast_copy_string(fn, "digits/thousand", sizeof(fn));
                        }
                } else if (num < 1000000000) {
                        int millions = num / 1000000;
                        num = num % 1000000;
                        t = 1;
                        if (millions == 1) {
-                               snprintf(fn, sizeof(fn), "digits/1F");
-                               snprintf(fna, sizeof(fna), "digits/million");
+                               ast_copy_string(fn, "digits/1F", sizeof(fn));
+                               ast_copy_string(fna, "digits/million", sizeof(fna));
                        } else {
                                res = ast_say_number_full_de(chan, millions, ints, language, options, audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               snprintf(fn, sizeof(fn), "digits/millions");
+                               ast_copy_string(fn, "digits/millions", sizeof(fn));
                        }
                } else if (num <= INT_MAX) {
                        int billions = num / 1000000000;
                        num = num % 1000000000;
                        t = 1;
                        if (billions == 1) {
-                               snprintf(fn, sizeof(fn), "digits/1F");
-                               snprintf(fna, sizeof(fna), "digits/milliard");
+                               ast_copy_string(fn, "digits/1F", sizeof(fn));
+                               ast_copy_string(fna, "digits/milliard", sizeof(fna));
                        } else {
                                res = ast_say_number_full_de(chan, billions, ints, language, options, audiofd, ctrlfd);
                                if (res) {
                                        return res;
                                }
-                               snprintf(fn, sizeof(fn), "digits/milliards");
+                               ast_copy_string(fn, "digits/milliards", sizeof(fn));
                        }
                } else {
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
                        res = -1;
                }
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
-                               if ((audiofd > -1) && (ctrlfd > -1)) 
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else  
+                               else
                                        res = ast_waitstream(chan, ints);
                        }
                        ast_stopstream(chan);
@@ -872,9 +996,9 @@ static int ast_say_number_full_de(struct ast_channel *chan, int num, const char
        return res;
 }
 
-/*! \brief  ast_say_number_full_en_GB: British and Norwegian syntax */
-/* New files:
- In addition to American English, the following sounds are required:  "and"
+/*! \brief  ast_say_number_full_en_GB: British syntax
+ New files:
+  - In addition to American English, the following sounds are required:  "vm-and"
  */
 static int ast_say_number_full_en_GB(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
 {
@@ -882,29 +1006,29 @@ static int ast_say_number_full_en_GB(struct ast_channel *chan, int num, const ch
        int playh = 0;
        int playa = 0;
        char fn[256] = "";
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-       while(!res && (num || playh || playa )) {
+       while (!res && (num || playh || playa )) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
                } else if (playa) {
-                       snprintf(fn, sizeof(fn), "digits/and");
+                       ast_copy_string(fn, "vm-and", sizeof(fn));
                        playa = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
                        num = 0;
                } else if (num < 100) {
                        snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
-                       num -= ((num / 10) * 10);
+                       num %= 10;
                } else if (num < 1000) {
                        int hundreds = num / 100;
                        snprintf(fn, sizeof(fn), "digits/%d", (num / 100));
@@ -913,34 +1037,33 @@ static int ast_say_number_full_en_GB(struct ast_channel *chan, int num, const ch
                        num -= 100 * hundreds;
                        if (num)
                                playa++;
-               } else  if (num < 1000000) {
+               } else if (num < 1000000) {
                        res = ast_say_number_full_en_GB(chan, num / 1000, ints, language, audiofd, ctrlfd);
                        if (res)
                                return res;
-                       snprintf(fn, sizeof(fn), "digits/thousand");
-                       num = num % 1000;
+                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
+                       num %= 1000;
                        if (num && num < 100)
                                playa++;
-               } else  if (num < 1000000000) {
+               } else if (num < 1000000000) {
                                int millions = num / 1000000;
                                res = ast_say_number_full_en_GB(chan, millions, ints, language, audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               snprintf(fn, sizeof(fn), "digits/million");
-                               num = num % 1000000;
+                               ast_copy_string(fn, "digits/million", sizeof(fn));
+                               num %= 1000000;
                                if (num && num < 100)
                                        playa++;
                } else {
-                               if (option_debug)
-                                       ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                               ast_debug(1, "Number '%d' is too big for me\n", num);
                                res = -1;
                }
-               
+
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
-                               if ((audiofd > -1) && (ctrlfd > -1)) 
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else  
+                               else
                                        res = ast_waitstream(chan, ints);
                        }
                        ast_stopstream(chan);
@@ -949,11 +1072,12 @@ static int ast_say_number_full_en_GB(struct ast_channel *chan, int num, const ch
        return res;
 }
 
-/*! \brief  ast_say_number_full_es: Spanish syntax */
-/* New files:
+/*! \brief  ast_say_number_full_es: Spanish syntax
+
+ New files:
  Requires a few new audios:
    1F.gsm: feminine 'una'
-   21.gsm thru 29.gsm, cien.gsm, mil.gsm, millon.gsm, millones.gsm, 100.gsm, 200.gsm, 300.gsm, 400.gsm, 500.gsm, 600.gsm, 700.gsm, 800.gsm, 900.gsm, y.gsm 
+   21.gsm thru 29.gsm, cien.gsm, mil.gsm, millon.gsm, millones.gsm, 100.gsm, 200.gsm, 300.gsm, 400.gsm, 500.gsm, 600.gsm, 700.gsm, 800.gsm, 900.gsm, y.gsm
  */
 static int ast_say_number_full_es(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
@@ -961,11 +1085,11 @@ static int ast_say_number_full_es(struct ast_channel *chan, int num, const char
        int playa = 0;
        int mf = 0;                            /* +1 = male; -1 = female */
        char fn[256] = "";
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        if (options) {
-               if (!strncasecmp(options, "f",1))
+               if (!strncasecmp(options, "f", 1))
                        mf = -1;
                else if (!strncasecmp(options, "m", 1))
                        mf = 1;
@@ -973,21 +1097,21 @@ static int ast_say_number_full_es(struct ast_channel *chan, int num, const char
 
        while (!res && num) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playa) {
-                       snprintf(fn, sizeof(fn), "digits/and");
+                       ast_copy_string(fn, "digits/and", sizeof(fn));
                        playa = 0;
                } else if (num == 1) {
                        if (mf < 0)
                                snprintf(fn, sizeof(fn), "digits/%dF", num);
                        else if (mf > 0)
                                snprintf(fn, sizeof(fn), "digits/%dM", num);
-                       else 
+                       else
                                snprintf(fn, sizeof(fn), "digits/%d", num);
                        num = 0;
                } else if (num < 31) {
@@ -995,46 +1119,45 @@ static int ast_say_number_full_es(struct ast_channel *chan, int num, const char
                        num = 0;
                } else if (num < 100) {
                        snprintf(fn, sizeof(fn), "digits/%d", (num/10)*10);
-                       num -= ((num/10)*10);
+                       num %= 10;
                        if (num)
                                playa++;
                } else if (num == 100) {
-                       snprintf(fn, sizeof(fn), "digits/100");
+                       ast_copy_string(fn, "digits/100", sizeof(fn));
                        num = 0;
                } else if (num < 200) {
-                       snprintf(fn, sizeof(fn), "digits/100-and");
+                       ast_copy_string(fn, "digits/100-and", sizeof(fn));
                        num -= 100;
                } else {
                        if (num < 1000) {
                                snprintf(fn, sizeof(fn), "digits/%d", (num/100)*100);
-                               num -= ((num/100)*100);
+                               num %= 100;
                        } else if (num < 2000) {
-                               num = num % 1000;
-                               snprintf(fn, sizeof(fn), "digits/thousand");
+                               num %= 1000;
+                               ast_copy_string(fn, "digits/thousand", sizeof(fn));
                        } else {
                                if (num < 1000000) {
                                        res = ast_say_number_full_es(chan, num / 1000, ints, language, options, audiofd, ctrlfd);
                                        if (res)
                                                return res;
-                                       num = num % 1000;
-                                       snprintf(fn, sizeof(fn), "digits/thousand");
+                                       num %= 1000;
+                                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
                                } else {
                                        if (num < 2147483640) {
                                                if ((num/1000000) == 1) {
                                                        res = ast_say_number_full_es(chan, num / 1000000, ints, language, "M", audiofd, ctrlfd);
                                                        if (res)
                                                                return res;
-                                                       snprintf(fn, sizeof(fn), "digits/million");
+                                                       ast_copy_string(fn, "digits/million", sizeof(fn));
                                                } else {
                                                        res = ast_say_number_full_es(chan, num / 1000000, ints, language, options, audiofd, ctrlfd);
                                                        if (res)
                                                                return res;
-                                                       snprintf(fn, sizeof(fn), "digits/millions");
+                                                       ast_copy_string(fn, "digits/millions", sizeof(fn));
                                                }
-                                               num = num % 1000000;
+                                               num %= 1000000;
                                        } else {
-                                               if (option_debug)
-                                                       ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                                               ast_debug(1, "Number '%d' is too big for me\n", num);
                                                res = -1;
                                        }
                                }
@@ -1042,7 +1165,7 @@ static int ast_say_number_full_es(struct ast_channel *chan, int num, const char
                }
 
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
+                       if (!ast_streamfile(chan, fn, language)) {
                                if ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
                                else
@@ -1051,15 +1174,15 @@ static int ast_say_number_full_es(struct ast_channel *chan, int num, const char
                        ast_stopstream(chan);
 
                }
-                       
+
        }
        return res;
 }
 
-/*! \brief  ast_say_number_full_fr: French syntax */
-/*     Extra sounds needed:
-       1F: feminin 'une'
-       et: 'and' */
+/*! \brief  ast_say_number_full_fr: French syntax
+       Extra sounds needed:
+       1F: feminin 'une'
+       et: 'and' */
 static int ast_say_number_full_fr(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
        int res = 0;
@@ -1067,25 +1190,25 @@ static int ast_say_number_full_fr(struct ast_channel *chan, int num, const char
        int playa = 0;
        int mf = 1;                            /* +1 = male; -1 = female */
        char fn[256] = "";
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-       
-       if (options && !strncasecmp(options, "f",1))
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+       if (options && !strncasecmp(options, "f", 1))
                mf = -1;
 
-       while(!res && (num || playh || playa)) {
+       while (!res && (num || playh || playa)) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
                } else if (playa) {
-                       snprintf(fn, sizeof(fn), "digits/et");
+                       ast_copy_string(fn, "digits/et", sizeof(fn));
                        playa = 0;
                } else if (num == 1) {
                        if (mf < 0)
@@ -1101,41 +1224,40 @@ static int ast_say_number_full_fr(struct ast_channel *chan, int num, const char
                        if ((num % 10) == 1) playa++;
                        num = num % 10;
                } else if (num < 80) {
-                       snprintf(fn, sizeof(fn), "digits/60");
+                       ast_copy_string(fn, "digits/60", sizeof(fn));
                        if ((num % 10) == 1) playa++;
-                       num = num - 60;
+                       num -= 60;
                } else if (num < 100) {
-                       snprintf(fn, sizeof(fn), "digits/80");
+                       ast_copy_string(fn, "digits/80", sizeof(fn));
                        num = num - 80;
                } else if (num < 200) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        num = num - 100;
                } else if (num < 1000) {
                        snprintf(fn, sizeof(fn), "digits/%d", (num/100));
                        playh++;
                        num = num % 100;
                } else if (num < 2000) {
-                       snprintf(fn, sizeof(fn), "digits/thousand");
+                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
                        num = num - 1000;
                } else if (num < 1000000) {
                        res = ast_say_number_full_fr(chan, num / 1000, ints, language, options, audiofd, ctrlfd);
                        if (res)
                                return res;
-                       snprintf(fn, sizeof(fn), "digits/thousand");
+                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
                        num = num % 1000;
                } else  if (num < 1000000000) {
                        res = ast_say_number_full_fr(chan, num / 1000000, ints, language, options, audiofd, ctrlfd);
                        if (res)
                                return res;
-                       snprintf(fn, sizeof(fn), "digits/million");
+                       ast_copy_string(fn, "digits/million", sizeof(fn));
                        num = num % 1000000;
                } else {
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
                        res = -1;
                }
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
+                       if (!ast_streamfile(chan, fn, language)) {
                                if ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
                                else
@@ -1149,147 +1271,169 @@ static int ast_say_number_full_fr(struct ast_channel *chan, int num, const char
 
 
 
-/*! \brief  ast_say_number_full_he: Hebrew syntax */
-/*     Extra sounds needed:
-       1F: feminin 'one'
-       ve: 'and'
-       1hundred: 1 hundred
-       2hundred: 2 hundreds
-       2thousands: 2 thousand 
-       thousands: plural of 'thousand'
-       3sF 'Smichut forms (female)
-       4sF
-       5sF
-       6sF
-       7sF
-       8sF
-       9sF
-       3s 'Smichut' forms (male)
-       4s
-       5s
-       6s
-       7s
-       9s
-       10s
-       11s
-       12s
-       13s
-       14s
-       15s
-       16s
-       17s
-       18s
-       19s
-
-TODO: 've' should sometimed be 'hu':
-* before 'shtaym' (2, F)
-* before 'shnaym' (2, M)
-* before 'shlosha' (3, M)
-* before 'shmone' (8, M)
-* before 'shlosim' (30)
-* before 'shmonim' (80)
-
-What about:
-'sheva' (7, F)?
-'tesha' (9, F)?
-*/
+/* Hebrew syntax
+ * Check doc/lang/hebrew-digits.txt for information about the various
+ * recordings required to make this translation work properly */
 #define SAY_NUM_BUF_SIZE 256
-static int ast_say_number_full_he(struct ast_channel *chan, int num, 
-    const char *ints, const char *language, const char *options, 
-    int audiofd, int ctrlfd)
+static int ast_say_number_full_he(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
        int res = 0;
-       int state = 0; /* no need to save anything */
-       int mf = 1;    /* +1 = Masculin; -1 = Feminin */
+       int state = 0;                          /* no need to save anything */
+       int mf = -1;                            /* +1 = Masculin; -1 = Feminin */
+       int tmpnum = 0;
+
        char fn[SAY_NUM_BUF_SIZE] = "";
-       ast_verbose(VERBOSE_PREFIX_3 "ast_say_digits_full: started. "
-               "num: %d, options=\"%s\"\n",
-               num, options
-       );
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-       
-       if (options && !strncasecmp(options, "f",1))
-               mf = -1;
+
+       ast_verb(3, "ast_say_digits_full: started. num: %d, options=\"%s\"\n", num, options);
+
+       if (!num) {
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+       }
+       if (options && !strncasecmp(options, "m", 1)) {
+               mf = 1;
+       }
+       ast_verb(3, "ast_say_digits_full: num: %d, state=%d, options=\"%s\", mf=%d\n", num, state, options, mf);
 
        /* Do we have work to do? */
-       while(!res && (num || (state>0) ))  {
+       while (!res && (num || (state > 0))) {
                /* first type of work: play a second sound. In this loop
-                * we can only play one sound file at a time. Thus playing 
-                * a second one requires repeating the loop just for the 
+                * we can only play one sound file at a time. Thus playing
+                * a second one requires repeating the loop just for the
                 * second file. The variable 'state' remembers where we were.
                 * state==0 is the normal mode and it means that we continue
                 * to check if the number num has yet anything left.
                 */
-               ast_verbose(VERBOSE_PREFIX_3 "ast_say_digits_full: num: %d, "
-                       "state=%d, options=\"%s\", mf=%d\n",
-                       num, state, options, mf
-               );
-               if (state==1) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+               ast_verb(3, "ast_say_digits_full: num: %d, state=%d, options=\"%s\", mf=%d, tmpnum=%d\n", num, state, options, mf, tmpnum);
+
+               if (state == 1) {
+                       state = 0;
+               } else if (state == 2) {
+                       if ((num >= 11) && (num < 21)) {
+                               if (mf < 0) {
+                                       snprintf(fn, sizeof(fn), "digits/ve");
+                               } else {
+                                       snprintf(fn, sizeof(fn), "digits/uu");
+                               }
+                       } else {
+                               switch (num) {
+                               case 1:
+                                       snprintf(fn, sizeof(fn), "digits/ve");
+                                       break;
+                               case 2:
+                                       snprintf(fn, sizeof(fn), "digits/uu");
+                                       break;
+                               case 3:
+                                       if (mf < 0) {
+                                               snprintf(fn, sizeof(fn), "digits/ve");
+                                       } else {
+                                               snprintf(fn, sizeof(fn), "digits/uu");
+                                       }
+                                       break;
+                               case 4:
+                                       snprintf(fn, sizeof(fn), "digits/ve");
+                                       break;
+                               case 5:
+                                       snprintf(fn, sizeof(fn), "digits/ve");
+                                       break;
+                               case 6:
+                                       snprintf(fn, sizeof(fn), "digits/ve");
+                                       break;
+                               case 7:
+                                       snprintf(fn, sizeof(fn), "digits/ve");
+                                       break;
+                               case 8:
+                                       snprintf(fn, sizeof(fn), "digits/uu");
+                                       break;
+                               case 9:
+                                       snprintf(fn, sizeof(fn), "digits/ve");
+                                       break;
+                               case 10:
+                                       snprintf(fn, sizeof(fn), "digits/ve");
+                                       break;
+                               }
+                       }
                        state = 0;
-               } else if (state==2) {
-                       snprintf(fn, sizeof(fn), "digits/ve");
+               } else if (state == 3) {
+                       snprintf(fn, sizeof(fn), "digits/1k");
                        state = 0;
-               } else if (state==3) {
-                       snprintf(fn, sizeof(fn), "digits/thousands");
-                       state=0;
-               } else if (num <21) {
-                       if (mf < 0)
-                               snprintf(fn, sizeof(fn), "digits/%dF", num);
-                       else
+               } else if (num < 0) {
+                       snprintf(fn, sizeof(fn), "digits/minus");
+                       num = (-1) * num;
+               } else if (num < 20) {
+                       if (mf < 0) {
                                snprintf(fn, sizeof(fn), "digits/%d", num);
+                       } else {
+                               snprintf(fn, sizeof(fn), "digits/%dm", num);
+                       }
                        num = 0;
-               } else if (num < 100) {
-                       snprintf(fn, sizeof(fn), "digits/%d", (num/10)*10);
+               } else if ((num < 100) && (num >= 20)) {
+                       snprintf(fn, sizeof(fn), "digits/%d", (num / 10) * 10);
                        num = num % 10;
-                       if (num>0) state=2;
-               } else if (num < 200) {
-                       snprintf(fn, sizeof(fn), "digits/1hundred");
-                       num = num - 100;
-                       state=2;
-               } else if (num < 300) {
-                       snprintf(fn, sizeof(fn), "digits/2hundred");
-                       num = num - 200;
-                       state=2;
-               } else if (num < 1000) {
-                       snprintf(fn, sizeof(fn), "digits/%d", (num/100));
-                       state=1;
-                       num = num % 100;
-               } else if (num < 2000) {
-                       snprintf(fn, sizeof(fn), "digits/thousand");
-                       num = num - 1000;
-               } else if (num < 3000) {
-                       snprintf(fn, sizeof(fn), "digits/2thousand");
-                       num = num - 2000;
-                        if (num>0) state=2;
+                       if (num > 0) {
+                               state = 2;
+                       }
+               } else if ((num >= 100) && (num < 1000)) {
+                       tmpnum = num / 100;
+                       snprintf(fn, sizeof(fn), "digits/%d00", tmpnum);
+                       num = num - (tmpnum * 100);
+                       if ((num > 0) && (num < 11)) {
+                               state = 2;
+                       }
+               } else if ((num >= 1000) && (num < 10000)) {
+                       tmpnum = num / 1000;
+                       snprintf(fn, sizeof(fn), "digits/%dk", tmpnum);
+                       num = num - (tmpnum * 1000);
+                       if ((num > 0) && (num < 11)) {
+                               state = 2;
+                       }
                } else if (num < 20000) {
-                       snprintf(fn, sizeof(fn), "digits/%ds",(num/1000));
+                       snprintf(fn, sizeof(fn), "digits/%dm", (num / 1000));
                        num = num % 1000;
-                       state=3;
+                       state = 3;
                } else if (num < 1000000) {
-                       res = ast_say_number_full_he(chan, num / 1000, ints, language, options, audiofd, ctrlfd);
-                       if (res)
+                       res = ast_say_number_full_he(chan, num / 1000, ints, language, "m", audiofd, ctrlfd);
+                       if (res) {
                                return res;
-                       snprintf(fn, sizeof(fn), "digits/thousand");
+                       }
+                       snprintf(fn, sizeof(fn), "digits/1k");
                        num = num % 1000;
-               } else  if (num < 1000000000) {
-                       res = ast_say_number_full_he(chan, num / 1000000, ints, language, options, audiofd, ctrlfd);
-                       if (res)
+                       if ((num > 0) && (num < 11)) {
+                               state = 2;
+                       }
+               } else if (num < 2000000) {
+                       snprintf(fn, sizeof(fn), "digits/million");
+                       num = num % 1000000;
+                       if ((num > 0) && (num < 11)) {
+                               state = 2;
+                       }
+               } else if (num < 3000000) {
+                       snprintf(fn, sizeof(fn), "digits/twomillion");
+                       num = num - 2000000;
+                       if ((num > 0) && (num < 11)) {
+                               state = 2;
+                       }
+               } else if (num < 1000000000) {
+                       res = ast_say_number_full_he(chan, num / 1000000, ints, language, "m", audiofd, ctrlfd);
+                       if (res) {
                                return res;
+                       }
                        snprintf(fn, sizeof(fn), "digits/million");
                        num = num % 1000000;
+                       if ((num > 0) && (num < 11)) {
+                               state = 2;
+                       }
                } else {
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
                        res = -1;
                }
+               tmpnum = 0;
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
-                               if ((audiofd > -1) && (ctrlfd > -1))
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd > -1) && (ctrlfd > -1)) {
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else
+                               } else {
                                        res = ast_waitstream(chan, ints);
+                               }
                        }
                        ast_stopstream(chan);
                }
@@ -1297,53 +1441,258 @@ static int ast_say_number_full_he(struct ast_channel *chan, int num,
        return res;
 }
 
-/*! \brief  ast_say_number_full_it:  Italian */
-static int ast_say_number_full_it(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
+/*! \brief  ast_say_number_full_hu: Hungarian syntax
+
+  Extra sounds needed:
+       10en: "tizen"
+       20on: "huszon"
+*/
+static int ast_say_number_full_hu(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
 {
        int res = 0;
        int playh = 0;
-       int tempnum = 0;
        char fn[256] = "";
-
        if (!num)
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-
-               /*
-               Italian support
-
-               Like english, numbers up to 20 are a single 'word', and others
-               compound, but with exceptions.
-               For example 21 is not twenty-one, but there is a single word in 'it'.
-               Idem for 28 (ie when a the 2nd part of a compund number
-               starts with a vowel)
-
-               There are exceptions also for hundred, thousand and million.
-               In english 100 = one hundred, 200 is two hundred.
-               In italian 100 = cento , like to say hundred (without one),
-               200 and more are like english.
-               
-               Same applies for thousand:
-               1000 is one thousand in en, 2000 is two thousand.
-               In it we have 1000 = mille , 2000 = 2 mila 
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-               For million(s) we use the plural, if more than one
-               Also, one million is abbreviated in it, like on-million,
-               or 'un milione', not 'uno milione'.
-               So the right file is provided.
-               */
+       /*
+       Hungarian support
+       like english, except numbers up to 29 are from 2 words.
+       10 and first word of 1[1-9] and 20 and first word of 2[1-9] are different.
+       */
 
-               while(!res && (num || playh)) {
-                       if (num < 0) {
-                               snprintf(fn, sizeof(fn), "digits/minus");
-                               if ( num > INT_MIN ) {
-                                       num = -num;
-                               } else {
-                                       num = 0;
-                               }       
-                       } else if (playh) {
-                               snprintf(fn, sizeof(fn), "digits/hundred");
-                               playh = 0;
-                       } else if (num < 20) {
+       while(!res && (num || playh)) {
+               if (num < 0) {
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
+                       if ( num > INT_MIN ) {
+                               num = -num;
+                       } else {
+                               num = 0;
+                       }
+               } else if (playh) {
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
+                       playh = 0;
+               } else if (num < 11 || num == 20) {
+                       snprintf(fn, sizeof(fn), "digits/%d", num);
+                       num = 0;
+               } else if (num < 20) {
+                       ast_copy_string(fn, "digits/10en", sizeof(fn));
+                       num -= 10;
+               } else if (num < 30) {
+                       ast_copy_string(fn, "digits/20on", sizeof(fn));
+                       num -= 20;
+               } else  if (num < 100) {
+                       snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
+                       num %= 10;
+               } else {
+                       if (num < 1000){
+                               snprintf(fn, sizeof(fn), "digits/%d", (num/100));
+                               playh++;
+                               num %= 100;
+                       } else {
+                               if (num < 1000000) { /* 1,000,000 */
+                                       res = ast_say_number_full_hu(chan, num / 1000, ints, language, audiofd, ctrlfd);
+                                       if (res)
+                                               return res;
+                                       num %= 1000;
+                                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
+                               } else {
+                                       if (num < 1000000000) { /* 1,000,000,000 */
+                                               res = ast_say_number_full_hu(chan, num / 1000000, ints, language, audiofd, ctrlfd);
+                                               if (res)
+                                                       return res;
+                                               num %= 1000000;
+                                               ast_copy_string(fn, "digits/million", sizeof(fn));
+                                       } else {
+                                               ast_debug(1, "Number '%d' is too big for me\n", num);
+                                               res = -1;
+                                       }
+                               }
+                       }
+               }
+               if (!res) {
+                       if(!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd  > -1) && (ctrlfd > -1))
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               else
+                                       res = ast_waitstream(chan, ints);
+                       }
+                       ast_stopstream(chan);
+               }
+       }
+       return res;
+}
+
+/*! \brief  ast_say_number_full_is: Icelandic syntax */
+/* New files:
+ In addition to American English, the following sounds are required:  "hundreds", "millions", "1kvk", "1hk", "2kvk", "2hk", "3kvk", "3hk", "4kvk", "4hk"
+ */
+static int ast_say_number_full_is(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
+{
+       int res = 0;
+       int playh = 0;
+       int playa = 0;
+       int cn = 1;             /* 1 = masc; 2 = fem; 3 = neut */
+       char fn[256] = "";
+
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+       if (options && !strncasecmp(options, "f", 1)) cn = 2;
+       if (options && !strncasecmp(options, "c", 1)) cn = 3;
+       /* It seems that sometimes people are using c and sometimes n. */
+       if (options && !strncasecmp(options, "n", 1)) cn = 3;
+
+       while (!res && (num || playh || playa )) {
+               if (num < 0) {
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
+                       if ( num > INT_MIN ) {
+                               num = -num;
+                       } else {
+                               num = 0;
+                       }
+               } else if (playh) {
+                       if (playh > 1)
+                               ast_copy_string(fn, "digits/hundreds", sizeof(fn));
+                       else
+                               ast_copy_string(fn, "digits/hundred", sizeof(fn));
+                       playh = 0;
+               } else if (playa) {
+                       ast_copy_string(fn, "digits/and", sizeof(fn));
+                       playa = 0;
+               } else if (num < 5 && cn == 2) {
+                       snprintf(fn, sizeof(fn), "digits/%dkvk", num);
+                       num = 0;
+               } else if (num < 5 && cn == 3) {
+                       snprintf(fn, sizeof(fn), "digits/%dhk", num);
+                       num = 0;
+               } else if (num < 20) {
+                       snprintf(fn, sizeof(fn), "digits/%d", num);
+                       num = 0;
+               } else if (num < 100) {
+                       snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
+                       num %= 10;
+                       if (num)
+                               playa++;
+               } else if (num < 1000) {
+                       int hundreds = num / 100;
+                       /* The number prepending hundreds are in neutral */
+                       if (hundreds < 5)
+                               snprintf(fn, sizeof(fn), "digits/%dhk", hundreds);
+                       else
+                               snprintf(fn, sizeof(fn), "digits/%d", (num / 100));
+
+                       playh = hundreds;
+                       num -= 100 * hundreds;
+                       if (num && num < 20)
+                               playa++;
+                       /* The 'and' moves forward on even tens. */
+                       if (num && (num % 10) == 0)
+                               playa++;
+               } else if (num < 1000000) {
+                       res = ast_say_number_full_is(chan, num / 1000, ints, language, "n", audiofd, ctrlfd);
+                       /* Play 'and' if it's an even hundred. */
+                       if ((num % 100) == 0 && (num % 1000 != 0)) {
+                               playa++;
+                       }
+                       if (res)
+                               return res;
+                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
+                       num %= 1000;
+                       if (num && (num < 20 || (num % 10 == 0)))
+                               playa++;
+               } else if (num < 1000000000) {
+                       int millions = num / 1000000;
+                       /* The number of millions is feminine */
+                       res = ast_say_number_full_is(chan, millions, ints, language, "f", audiofd, ctrlfd);
+                       if (res)
+                               return res;
+                       if (millions > 1)
+                               ast_copy_string(fn, "digits/millions", sizeof(fn));
+                       else
+                               ast_copy_string(fn, "digits/million", sizeof(fn));
+                       num %= 1000000;
+                       if (num && num < 100)
+                               playa++;
+               } else if (num < INT_MAX) {
+                       int milliards = num / 1000000000;
+                       /* The number of milliards is masculine */
+                       res = ast_say_number_full_is(chan, milliards, ints, language, "m", audiofd, ctrlfd);
+                       if (res)
+                               return res;
+                       if (milliards > 1)
+                               ast_copy_string(fn, "digits/milliards", sizeof(fn));
+                       else
+                               ast_copy_string(fn, "digits/milliard", sizeof(fn));
+                       num %= 1000000000;
+                       if (num && num < 100)
+                               playa++;
+               } else {
+                               ast_debug(1, "Number '%d' is too big for me\n", num);
+                               res = -1;
+               }
+
+               if (!res) {
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd > -1) && (ctrlfd > -1))
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               else
+                                       res = ast_waitstream(chan, ints);
+                       }
+                       ast_stopstream(chan);
+               }
+       }
+       return res;
+}
+
+
+/*! \brief  ast_say_number_full_it:  Italian */
+static int ast_say_number_full_it(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
+{
+       int res = 0;
+       int playh = 0;
+       int tempnum = 0;
+       char fn[256] = "";
+
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+               /*
+               Italian support
+
+               Like english, numbers up to 20 are a single 'word', and others
+               compound, but with exceptions.
+               For example 21 is not twenty-one, but there is a single word in 'it'.
+               Idem for 28 (ie when a the 2nd part of a compund number
+               starts with a vowel)
+
+               There are exceptions also for hundred, thousand and million.
+               In english 100 = one hundred, 200 is two hundred.
+               In italian 100 = cento , like to say hundred (without one),
+               200 and more are like english.
+
+               Same applies for thousand:
+               1000 is one thousand in en, 2000 is two thousand.
+               In it we have 1000 = mille , 2000 = 2 mila
+
+               For million(s) we use the plural, if more than one
+               Also, one million is abbreviated in it, like on-million,
+               or 'un milione', not 'uno milione'.
+               So the right file is provided.
+               */
+
+       while (!res && (num || playh)) {
+                       if (num < 0) {
+                               ast_copy_string(fn, "digits/minus", sizeof(fn));
+                               if ( num > INT_MIN ) {
+                                       num = -num;
+                               } else {
+                                       num = 0;
+                               }
+                       } else if (playh) {
+                               ast_copy_string(fn, "digits/hundred", sizeof(fn));
+                               playh = 0;
+                       } else if (num < 20) {
                                snprintf(fn, sizeof(fn), "digits/%d", num);
                                num = 0;
                        } else if (num == 21) {
@@ -1396,16 +1745,16 @@ static int ast_say_number_full_it(struct ast_channel *chan, int num, const char
                                num = 0;
                        } else if (num < 100) {
                                snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
-                               num -= ((num / 10) * 10);
+                               num %= 10;
                        } else {
                                if (num < 1000) {
                                        if ((num / 100) > 1) {
                                                snprintf(fn, sizeof(fn), "digits/%d", (num/100));
                                                playh++;
                                        } else {
-                                               snprintf(fn, sizeof(fn), "digits/hundred");
+                                               ast_copy_string(fn, "digits/hundred", sizeof(fn));
                                        }
-                                       num -= ((num / 100) * 100);
+                                       num %= 100;
                                } else {
                                        if (num < 1000000) { /* 1,000,000 */
                                                if ((num/1000) > 1)
@@ -1413,11 +1762,11 @@ static int ast_say_number_full_it(struct ast_channel *chan, int num, const char
                                                if (res)
                                                        return res;
                                                tempnum = num;
-                                               num = num % 1000;
+                                               num %= 1000;
                                                if ((tempnum / 1000) < 2)
-                                                       snprintf(fn, sizeof(fn), "digits/thousand");
+                                                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
                                                else /* for 1000 it says mille, for >1000 (eg 2000) says mila */
-                                                       snprintf(fn, sizeof(fn), "digits/thousands");
+                                                       ast_copy_string(fn, "digits/thousands", sizeof(fn));
                                        } else {
                                                if (num < 1000000000) { /* 1,000,000,000 */
                                                        if ((num / 1000000) > 1)
@@ -1425,21 +1774,20 @@ static int ast_say_number_full_it(struct ast_channel *chan, int num, const char
                                                        if (res)
                                                                return res;
                                                        tempnum = num;
-                                                       num = num % 1000000;
+                                                       num %= 1000000;
                                                        if ((tempnum / 1000000) < 2)
-                                                               snprintf(fn, sizeof(fn), "digits/million");
+                                                               ast_copy_string(fn, "digits/million", sizeof(fn));
                                                        else
-                                                               snprintf(fn, sizeof(fn), "digits/millions");
+                                                               ast_copy_string(fn, "digits/millions", sizeof(fn));
                                                } else {
-                                                       if (option_debug)
-                                                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                                                       ast_debug(1, "Number '%d' is too big for me\n", num);
                                                        res = -1;
                                                }
                                        }
                                }
                        }
                        if (!res) {
-                               if(!ast_streamfile(chan, fn, language)) {
+                               if (!ast_streamfile(chan, fn, language)) {
                                        if ((audiofd > -1) && (ctrlfd > -1))
                                                res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
                                        else
@@ -1451,8 +1799,8 @@ static int ast_say_number_full_it(struct ast_channel *chan, int num, const char
        return res;
 }
 
-/*! \brief  ast_say_number_full_nl: dutch syntax */
-/* New files: digits/nl-en
+/*! \brief  ast_say_number_full_nl: dutch syntax
+ * New files: digits/nl-en
  */
 static int ast_say_number_full_nl(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
 {
@@ -1460,18 +1808,18 @@ static int ast_say_number_full_nl(struct ast_channel *chan, int num, const char
        int playh = 0;
        int units = 0;
        char fn[256] = "";
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
        while (!res && (num || playh )) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
@@ -1483,33 +1831,46 @@ static int ast_say_number_full_nl(struct ast_channel *chan, int num, const char
                                if (res)
                                        return res;
                                num = num - units;
-                               snprintf(fn, sizeof(fn), "digits/nl-en");
+                               ast_copy_string(fn, "digits/nl-en", sizeof(fn));
                        } else {
                                snprintf(fn, sizeof(fn), "digits/%d", num - units);
                                num = 0;
                        }
+               } else if (num < 200) {
+                       /* hundred, not one-hundred */
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
+                       num %= 100;
+               } else if (num < 1000) {
+                       snprintf(fn, sizeof(fn), "digits/%d", num / 100);
+                       playh++;
+                       num %= 100;
                } else {
-                       if (num < 1000) {
-                               snprintf(fn, sizeof(fn), "digits/%d", (num/100));
-                               playh++;
-                               num -= ((num / 100) * 100);
+                       if (num < 1100) {
+                               /* thousand, not one-thousand */
+                               num %= 1000;
+                               ast_copy_string(fn, "digits/thousand", sizeof(fn));
+                       } else if (num < 10000) { /* 1,100 to 9,9999 */
+                               res = ast_say_number_full_nl(chan, num / 100, ints, language, audiofd, ctrlfd);
+                               if (res)
+                                       return res;
+                               num %= 100;
+                               ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        } else {
                                if (num < 1000000) { /* 1,000,000 */
-                                       res = ast_say_number_full_en(chan, num / 1000, ints, language, audiofd, ctrlfd);
+                                       res = ast_say_number_full_nl(chan, num / 1000, ints, language, audiofd, ctrlfd);
                                        if (res)
                                                return res;
-                                       num = num % 1000;
-                                       snprintf(fn, sizeof(fn), "digits/thousand");
+                                       num %= 1000;
+                                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
                                } else {
                                        if (num < 1000000000) { /* 1,000,000,000 */
-                                               res = ast_say_number_full_en(chan, num / 1000000, ints, language, audiofd, ctrlfd);
+                                               res = ast_say_number_full_nl(chan, num / 1000000, ints, language, audiofd, ctrlfd);
                                                if (res)
                                                        return res;
-                                               num = num % 1000000;
-                                               snprintf(fn, sizeof(fn), "digits/million");
+                                               num %= 1000000;
+                                               ast_copy_string(fn, "digits/million", sizeof(fn));
                                        } else {
-                                               if (option_debug)
-                                                       ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                                               ast_debug(1, "Number '%d' is too big for me\n", num);
                                                res = -1;
                                        }
                                }
@@ -1517,7 +1878,7 @@ static int ast_say_number_full_nl(struct ast_channel *chan, int num, const char
                }
 
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
+                       if (!ast_streamfile(chan, fn, language)) {
                                if ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
                                else
@@ -1529,9 +1890,15 @@ static int ast_say_number_full_nl(struct ast_channel *chan, int num, const char
        return res;
 }
 
-/*! \brief  ast_say_number_full_no: Norwegian syntax */
-/* New files:
- In addition to American English, the following sounds are required:  "and", "1N"
+/*! \brief  ast_say_number_full_no: Norwegian syntax
+ * New files:
+ * In addition to American English, the following sounds are required:  "and", "1N"
+ *
+ * The grammar for Norwegian numbers is the same as for English except
+ * for the following:
+ * - 1 exists in both commune ("en", file "1") and neuter ("ett", file "1N")
+ *   "and" before the last two digits, i.e. 2034 is "two thousand and
+ *   thirty-four" and 1000012 is "one million and twelve".
  */
 static int ast_say_number_full_no(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
@@ -1540,45 +1907,39 @@ static int ast_say_number_full_no(struct ast_channel *chan, int num, const char
        int playa = 0;
        int cn = 1;             /* +1 = commune; -1 = neuter */
        char fn[256] = "";
-       
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-       
-       if (options && !strncasecmp(options, "n",1)) cn = -1;
-
-       while(!res && (num || playh || playa )) {
-               /* The grammar for Norwegian numbers is the same as for English except
-               * for the following:
-               * - 1 exists in both commune ("en", file "1") and neuter ("ett", file "1N")
-               *   "and" before the last two digits, i.e. 2034 is "two thousand and
-               *   thirty-four" and 1000012 is "one million and twelve".
-               */
+
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+       if (options && !strncasecmp(options, "n", 1)) cn = -1;
+
+       while (!res && (num || playh || playa )) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
                } else if (playa) {
-                       snprintf(fn, sizeof(fn), "digits/and");
+                       ast_copy_string(fn, "digits/and", sizeof(fn));
                        playa = 0;
                } else if (num == 1 && cn == -1) {
-                       snprintf(fn, sizeof(fn), "digits/1N");
+                       ast_copy_string(fn, "digits/1N", sizeof(fn));
                        num = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
                        num = 0;
                } else if (num < 100) {
                        snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
-                       num -= ((num / 10) * 10);
+                       num %= 10;
                } else if (num < 1000) {
                        int hundreds = num / 100;
                        if (hundreds == 1)
-                               snprintf(fn, sizeof(fn), "digits/1N");
+                               ast_copy_string(fn, "digits/1N", sizeof(fn));
                        else
                                snprintf(fn, sizeof(fn), "digits/%d", (num / 100));
 
@@ -1586,34 +1947,33 @@ static int ast_say_number_full_no(struct ast_channel *chan, int num, const char
                        num -= 100 * hundreds;
                        if (num)
                                playa++;
-               } else  if (num < 1000000) {
+               } else if (num < 1000000) {
                        res = ast_say_number_full_no(chan, num / 1000, ints, language, "n", audiofd, ctrlfd);
                        if (res)
                                return res;
-                       snprintf(fn, sizeof(fn), "digits/thousand");
-                       num = num % 1000;
+                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
+                       num %= 1000;
                        if (num && num < 100)
                                playa++;
-               } else  if (num < 1000000000) {
+               } else if (num < 1000000000) {
                                int millions = num / 1000000;
                                res = ast_say_number_full_no(chan, millions, ints, language, "c", audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               snprintf(fn, sizeof(fn), "digits/million");
-                               num = num % 1000000;
+                               ast_copy_string(fn, "digits/million", sizeof(fn));
+                               num %= 1000000;
                                if (num && num < 100)
                                        playa++;
                } else {
-                               if (option_debug)
-                                       ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                               ast_debug(1, "Number '%d' is too big for me\n", num);
                                res = -1;
                }
-               
+
                if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
-                               if ((audiofd > -1) && (ctrlfd > -1)) 
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else  
+                               else
                                        res = ast_waitstream(chan, ints);
                        }
                        ast_stopstream(chan);
@@ -1622,13 +1982,13 @@ static int ast_say_number_full_no(struct ast_channel *chan, int num, const char
        return res;
 }
 
-typedef struct {  
+typedef struct {
        char *separator_dziesiatek;
        char *cyfry[10];
        char *cyfry2[10];
        char *setki[10];
        char *dziesiatki[10];
-       char *nastki[10];  
+       char *nastki[10];
        char *rzedy[3][3];
 } odmiana;
 
@@ -1636,7 +1996,7 @@ static char *pl_rzad_na_tekst(odmiana *odm, int i, int rzad)
 {
        if (rzad==0)
                return "";
+
        if (i==1)
                return odm->rzedy[rzad - 1][0];
        if ((i > 21 || i < 11) &&  i%10 > 1 && i%10 < 5)
@@ -1648,16 +2008,15 @@ static char *pl_rzad_na_tekst(odmiana *odm, int i, int rzad)
 static char* pl_append(char* buffer, char* str)
 {
        strcpy(buffer, str);
-       buffer += strlen(str); 
+       buffer += strlen(str);
        return buffer;
 }
 
 static void pl_odtworz_plik(struct ast_channel *chan, const char *language, int audiofd, int ctrlfd, const char *ints, char *fn)
-{    
+{
        char file_name[255] = "digits/";
        strcat(file_name, fn);
-       if (option_debug)
-               ast_log(LOG_DEBUG, "Trying to play: %s\n", file_name);
+       ast_debug(1, "Trying to play: %s\n", file_name);
        if (!ast_streamfile(chan, file_name, language)) {
                if ((audiofd > -1) && (ctrlfd > -1))
                        ast_waitstream_full(chan, ints, audiofd, ctrlfd);
@@ -1678,8 +2037,8 @@ static void powiedz(struct ast_channel *chan, const char *language, int audiofd,
        int i1000 = 0;
        int m100 = 0;
        int i100 = 0;
-       
-       if (i == 0 && rzad > 0) { 
+
+       if (i == 0 && rzad > 0) {
                return;
        }
        if (i == 0) {
@@ -1704,41 +2063,40 @@ static void powiedz(struct ast_channel *chan, const char *language, int audiofd,
 
        m100 = m1000 % 100;
        i100 = m1000 / 100;
-       
-       if (i100>0)
-               pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->setki[i100]);
 
-       if ( m100 > 0 && m100 <=9 ) {
-               if (m1000>0)
-                       pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100]);
-               else
-                       pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry[m100]);
-       } else if (m100 % 10 == 0) {
-               pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]);
-       } else if (m100 <= 19 ) {
-               pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->nastki[m100 % 10]);
-       } else if (m100 != 0) {
-               if (odm->separator_dziesiatek[0]==' ') {
-                       pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]);
-                       pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100 % 10]);
-               } else {
-                       char buf[10];
-                       char *b = buf;
-                       b = pl_append(b, odm->dziesiatki[m100 / 10]);  
-                       b = pl_append(b, odm->separator_dziesiatek);  
-                       b = pl_append(b, odm->cyfry2[m100 % 10]); 
-                       pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, buf);
-               }
-       } 
+        if (i100>0)
+                pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->setki[i100]);
+
+        if (m100 > 0 && m100 <= 9) {
+                if (m1000 > 0)
+                        pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100]);
+                else
+                        pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry[m100]);
+        } else if (m100 % 10 == 0 && m100 != 0) {
+                pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]);
+        } else if (m100 > 10 && m100 <= 19) {
+                pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->nastki[m100 % 10]);
+        } else if (m100 > 20) {
+                if (odm->separator_dziesiatek[0] == ' ') {
+                        pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]);
+                        pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100 % 10]);
+                } else {
+                        char buf[10];
+                        char *b = buf;
+                        b = pl_append(b, odm->dziesiatki[m100 / 10]);
+                        b = pl_append(b, odm->separator_dziesiatek);
+                        pl_append(b, odm->cyfry2[m100 % 10]);
+                        pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, buf);
+                }
+        }
 
        if (rzad > 0) {
                pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, pl_rzad_na_tekst(odm, i, rzad));
        }
 }
 
-/* ast_say_number_full_pl: Polish syntax */
-static int ast_say_number_full_pl(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
-/*
+/* ast_say_number_full_pl: Polish syntax
+
 Sounds needed:
 0              zero
 1              jeden
@@ -1829,14 +2187,15 @@ Sounds needed:
 and combinations of eg.: 20_1, 30m_3m, etc...
 
 */
+static int ast_say_number_full_pl(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
-       char *zenski_cyfry[] = {"0","1z", "2z", "3", "4", "5", "6", "7", "8", "9"};
+       char *zenski_cyfry[] = {"0", "1z", "2z", "3", "4", "5", "6", "7", "8", "9"};
 
-       char *zenski_cyfry2[] = {"0","1", "2z", "3", "4", "5", "6", "7", "8", "9"};
+       char *zenski_cyfry2[] = {"0", "1", "2z", "3", "4", "5", "6", "7", "8", "9"};
 
-       char *meski_cyfry[] = {"0","1", "2-1m", "3-1m", "4-1m", "5m",  /*"2-1mdwaj"*/ "6m", "7m", "8m", "9m"};
+       char *meski_cyfry[] = {"0", "1", "2-1m", "3-1m", "4-1m", "5m",  /*"2-1mdwaj"*/ "6m", "7m", "8m", "9m"};
 
-       char *meski_cyfry2[] = {"0","1", "2-2m", "3-2m", "4-2m", "5m", "6m", "7m", "8m", "9m"};
+       char *meski_cyfry2[] = {"0", "1", "2-2m", "3-2m", "4-2m", "5m", "6m", "7m", "8m", "9m"};
 
        char *meski_setki[] = {"", "100m", "200m", "300m", "400m", "500m", "600m", "700m", "800m", "900m"};
 
@@ -1844,9 +2203,9 @@ and combinations of eg.: 20_1, 30m_3m, etc...
 
        char *meski_nastki[] = {"", "11m", "12m", "13m", "14m", "15m", "16m", "17m", "18m", "19m"};
 
-       char *nijaki_cyfry[] = {"0","1", "2", "3", "4", "5", "6", "7", "8", "9"};
+       char *nijaki_cyfry[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
 
-       char *nijaki_cyfry2[] = {"0","1", "2", "3", "4", "5", "6", "7", "8", "9"};
+       char *nijaki_cyfry2[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
 
        char *nijaki_setki[] = {"", "100", "200", "300", "400", "500", "600", "700", "800", "900"};
 
@@ -1854,17 +2213,17 @@ and combinations of eg.: 20_1, 30m_3m, etc...
 
        char *nijaki_nastki[] = {"", "11", "12", "13", "14", "15", "16", "17", "18", "19"};
 
-       char *rzedy[][3] = { {"1000", "1000.2", "1000.5"}, {"1000000", "1000000.2", "1000000.5"}, {"1000000000", "1000000000.2", "1000000000.5"}}; 
+       char *rzedy[][3] = { {"1000", "1000.2", "1000.5"}, {"1000000", "1000000.2", "1000000.5"}, {"1000000000", "1000000000.2", "1000000000.5"}};
 
        /* Initialise variables to allow compilation on Debian-stable, etc */
        odmiana *o;
 
-       static odmiana *odmiana_nieosobowa = NULL; 
-       static odmiana *odmiana_meska = NULL; 
-       static odmiana *odmiana_zenska = NULL; 
+       static odmiana *odmiana_nieosobowa = NULL;
+       static odmiana *odmiana_meska = NULL;
+       static odmiana *odmiana_zenska = NULL;
 
        if (odmiana_nieosobowa == NULL) {
-               odmiana_nieosobowa = (odmiana *) malloc(sizeof(odmiana));
+               odmiana_nieosobowa = ast_malloc(sizeof(*odmiana_nieosobowa));
 
                odmiana_nieosobowa->separator_dziesiatek = " ";
 
@@ -1877,7 +2236,7 @@ and combinations of eg.: 20_1, 30m_3m, etc...
        }
 
        if (odmiana_zenska == NULL) {
-               odmiana_zenska = (odmiana *) malloc(sizeof(odmiana));
+               odmiana_zenska = ast_malloc(sizeof(*odmiana_zenska));
 
                odmiana_zenska->separator_dziesiatek = " ";
 
@@ -1890,7 +2249,7 @@ and combinations of eg.: 20_1, 30m_3m, etc...
        }
 
        if (odmiana_meska == NULL) {
-               odmiana_meska = (odmiana *) malloc(sizeof(odmiana));
+               odmiana_meska = ast_malloc(sizeof(*odmiana_meska));
 
                odmiana_meska->separator_dziesiatek = " ";
 
@@ -1916,12 +2275,14 @@ and combinations of eg.: 20_1, 30m_3m, etc...
        return 0;
 }
 
-/* ast_say_number_full_pt: Portuguese syntax */
-/*     Extra sounds needed: */
-/*     For feminin all sound files end with F */
-/*     100E for 100+ something */
-/*     1000000S for plural */
-/*     pt-e for 'and' */
+/* ast_say_number_full_pt: Portuguese syntax
+
+ *     Extra sounds needed:
+ *     For feminin all sound files ends with F
+ *     100E for 100+ something
+ *     1000000S for plural
+ *     pt-e for 'and'
+ */
 static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
        int res = 0;
@@ -1929,20 +2290,20 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
        int mf = 1;                            /* +1 = male; -1 = female */
        char fn[256] = "";
 
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-       if (options && !strncasecmp(options, "f",1))
+       if (options && !strncasecmp(options, "f", 1))
                mf = -1;
 
-       while(!res && num ) {
+       while (!res && num ) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (num < 20) {
                        if ((num == 1 || num == 2) && (mf < 0))
                                snprintf(fn, sizeof(fn), "digits/%dF", num);
@@ -1956,9 +2317,9 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
                        num = num % 10;
                } else if (num < 1000) {
                        if (num == 100)
-                               snprintf(fn, sizeof(fn), "digits/100");
+                               ast_copy_string(fn, "digits/100", sizeof(fn));
                        else if (num < 200)
-                               snprintf(fn, sizeof(fn), "digits/100E");
+                               ast_copy_string(fn, "digits/100E", sizeof(fn));
                        else {
                                if (mf < 0 && num > 199)
                                        snprintf(fn, sizeof(fn), "digits/%dF", (num / 100) * 100);
@@ -1974,7 +2335,7 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
                                if (res)
                                        return res;
                        }
-                       snprintf(fn, sizeof(fn), "digits/1000");
+                       ast_copy_string(fn, "digits/1000", sizeof(fn));
                        if ((num % 1000) && ((num % 1000) < 100  || !(num % 100)))
                                playh = 1;
                        num = num % 1000;
@@ -1983,10 +2344,10 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
                        if (res)
                                return res;
                        if (num < 2000000)
-                               snprintf(fn, sizeof(fn), "digits/1000000");
+                               ast_copy_string(fn, "digits/1000000", sizeof(fn));
                        else
-                               snprintf(fn, sizeof(fn), "digits/1000000S");
+                               ast_copy_string(fn, "digits/1000000S", sizeof(fn));
+
                        if ((num % 1000000) &&
                                /* no thousands */
                                ((!((num / 1000) % 1000) && ((num % 1000) < 100 || !(num % 100))) ||
@@ -2002,7 +2363,7 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
                if (!res) {
                        if (!ast_streamfile(chan, fn, language)) {
                                if ((audiofd > -1) && (ctrlfd > -1))
-                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); 
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
                                else
                                        res = ast_waitstream(chan, ints);
                        }
@@ -2017,134 +2378,189 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
        return res;
 }
 
-/*! \brief  ast_say_number_full_se: Swedish syntax */
+/*! \brief  ast_say_number_full_se: Swedish syntax
+
+ Sound files needed
+ - 1N
+*/
 static int ast_say_number_full_se(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
-       int res = 0;
        int playh = 0;
+       int start = 1;
        char fn[256] = "";
        int cn = 1;             /* +1 = commune; -1 = neuter */
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-       if (options && !strncasecmp(options, "n",1)) cn = -1;
+       int res = 0;
 
-       while(!res && (num || playh)) {
+       if (!num) {
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+       }
+       if (options && !strncasecmp(options, "n", 1)) cn = -1;
+
+       while (num || playh) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
-                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
+               } else if (start  && num < 200 && num > 99 && cn == -1) {
+                       /* Don't say "en hundra" just say "hundra". */
+                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       num -= 100;
+               } else if (num == 1 && cn == -1) {      /* En eller ett? */
+                       ast_copy_string(fn, "digits/1N", sizeof(fn));
+                       num = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
                        num = 0;
-               } else if (num < 100) {
+               } else if (num < 100) { /* Below hundreds - teens and tens */
                        snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
-                       num -= ((num / 10) * 10);
-               } else if (num == 1 && cn == -1) {      /* En eller ett? */
-                       snprintf(fn, sizeof(fn), "digits/1N");
-                       num = 0;
-               } else {
-                       if (num < 1000){
-                               snprintf(fn, sizeof(fn), "digits/%d", (num/100));
-                               playh++;
-                               num -= ((num / 100) * 100);
-                       } else {
-                               if (num < 1000000) { /* 1,000,000 */
-                                       res = ast_say_number_full_se(chan, num / 1000, ints, language, options, audiofd, ctrlfd);
-                                       if (res) {
-                                               return res;
-                                       }
-                                       num = num % 1000;
-                                       snprintf(fn, sizeof(fn), "digits/thousand");
-                               } else {
-                                       if (num < 1000000000) { /* 1,000,000,000 */
-                                               res = ast_say_number_full_se(chan, num / 1000000, ints, language, options, audiofd, ctrlfd);
-                                               if (res) {
-                                                       return res;
-                                               }
-                                               num = num % 1000000;
-                                               snprintf(fn, sizeof(fn), "digits/million");
-                                       } else {
-                                               if (option_debug)
-                                                       ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
-                                               res = -1;
-                                       }
-                               }
+                       num %= 10;
+               } else if (num < 1000) {
+                       /* Hundreds */
+                       snprintf(fn, sizeof(fn), "digits/%d", (num/100));
+                       playh++;
+                       num %= 100;
+               } else if (num < 1000000) { /* 1,000,000 */
+                       /* Always say "ett hundra tusen", not "en hundra tusen" */
+                       res = ast_say_number_full_se(chan, num / 1000, ints, language, "c", audiofd, ctrlfd);
+                       if (res) {
+                               return res;
                        }
+                       num %= 1000;
+                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
+               } else if (num < 1000000000) {  /* 1,000,000,000 */
+                       /* Always say "en miljon", not "ett miljon" */
+                       res = ast_say_number_full_se(chan, num / 1000000, ints, language, "n", audiofd, ctrlfd);
+                       if (res) {
+                               return res;
+                       }
+                       num %= 1000000;
+                       ast_copy_string(fn, "digits/million", sizeof(fn));
+               } else {        /* Miljarder - Billions */
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
+                       return -1;
                }
-               if (!res) {
-                       if(!ast_streamfile(chan, fn, language)) {
-                               if ((audiofd > -1) && (ctrlfd > -1))
-                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else
-                                       res = ast_waitstream(chan, ints);
-                               ast_stopstream(chan);
+
+               if (!ast_streamfile(chan, fn, language)) {
+                       if ((audiofd > -1) && (ctrlfd > -1)) {
+                               res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                       } else {
+                               res = ast_waitstream(chan, ints);
+                       }
+                       ast_stopstream(chan);
+                       if (res) {
+                               return res;
                        }
                }
+               start = 0;
        }
-       return res;
+       return 0;
 }
 
-/*! \brief  ast_say_number_full_tw: Taiwanese / Chinese syntax */
-static int ast_say_number_full_tw(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
+/*! \brief  ast_say_number_full_zh: Taiwanese / Chinese syntax */
+static int ast_say_number_full_zh(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
 {
        int res = 0;
        int playh = 0;
+       int playt = 0;
+       int playz = 0;
+       int last_length = 0;
+       char buf[20] = "";
        char fn[256] = "";
        if (!num)
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-       while(!res && (num || playh)) {
+       while (!res && (num || playh || playt || playz)) {
                        if (num < 0) {
-                               snprintf(fn, sizeof(fn), "digits/minus");
+                               ast_copy_string(fn, "digits/minus", sizeof(fn));
                                if ( num > INT_MIN ) {
                                        num = -num;
                                } else {
                                        num = 0;
-                               }       
+                               }
+                       } else if (playz) {
+                               snprintf(fn, sizeof(fn), "digits/0");
+                               last_length = 0;
+                               playz = 0;
                        } else if (playh) {
-                               snprintf(fn, sizeof(fn), "digits/hundred");
+                               ast_copy_string(fn, "digits/hundred", sizeof(fn));
                                playh = 0;
+                       } else if (playt) {
+                               snprintf(fn, sizeof(fn), "digits/thousand");
+                               playt = 0;
                        } else  if (num < 10) {
+                               snprintf(buf, 10, "%d", num);
+                               if (last_length - strlen(buf) > 1 && last_length != 0) {
+                                       last_length = strlen(buf);
+                                       playz++;
+                                       continue;
+                               }
                                snprintf(fn, sizeof(fn), "digits/%d", num);
                                num = 0;
                        } else  if (num < 100) {
-                               snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
-                               num -= ((num / 10) * 10);
+                               snprintf(buf, 10, "%d", num);
+                               if (last_length - strlen(buf) > 1 && last_length != 0) {
+                                       last_length = strlen(buf);
+                                       playz++;
+                                       continue;
+                               }
+                               last_length = strlen(buf);
+                               snprintf(fn, sizeof(fn), "digits/%d", (num / 10) * 10);
+                               num %= 10;
                        } else {
                                if (num < 1000){
-                                       snprintf(fn, sizeof(fn), "digits/%d", (num/100));
+                                       snprintf(buf, 10, "%d", num);
+                                       if (last_length - strlen(buf) > 1 && last_length != 0) {
+                                               last_length = strlen(buf);
+                                               playz++;
+                                               continue;
+                                       }
+                                       snprintf(fn, sizeof(fn), "digits/%d", (num / 100));
                                        playh++;
+                                       snprintf(buf, 10, "%d", num);
+                                       ast_debug(1, "Number '%d' %d %d\n", num, (int)strlen(buf), last_length);
+                                       last_length = strlen(buf);
                                        num -= ((num / 100) * 100);
+                               } else if (num < 10000){
+                                       snprintf(buf, 10, "%d", num);
+                                       snprintf(fn, sizeof(fn), "digits/%d", (num / 1000));
+                                       playt++;
+                                       snprintf(buf, 10, "%d", num);
+                                       ast_debug(1, "Number '%d' %d %d\n", num, (int)strlen(buf), last_length);
+                                       last_length = strlen(buf);
+                                       num -= ((num / 1000) * 1000);
+                               } else if (num < 100000000) { /* 100,000,000 */
+                                               res = ast_say_number_full_zh(chan, num / 10000, ints, language, audiofd, ctrlfd);
+                                               if (res)
+                                                       return res;
+                                               snprintf(buf, 10, "%d", num);
+                                               ast_debug(1, "Number '%d' %d %d\n", num, (int)strlen(buf), last_length);
+                                               num -= ((num / 10000) * 10000);
+                                               last_length = strlen(buf);
+                                               snprintf(fn, sizeof(fn), "digits/wan");
                                } else {
-                                       if (num < 1000000) { /* 1,000,000 */
-                                               res = ast_say_number_full_tw(chan, num / 1000, ints, language, audiofd, ctrlfd);
+                                       if (num < 1000000000) { /* 1,000,000,000 */
+                                               res = ast_say_number_full_zh(chan, num / 100000000, ints, language, audiofd, ctrlfd);
                                                if (res)
                                                        return res;
-                                               num = num % 1000;
-                                               snprintf(fn, sizeof(fn), "digits/thousand");
+                                               snprintf(buf, 10, "%d", num);
+                                               ast_debug(1, "Number '%d' %d %d\n", num, (int)strlen(buf), last_length);
+                                               last_length = strlen(buf);
+                                               num -= ((num / 100000000) * 100000000);
+                                               snprintf(fn, sizeof(fn), "digits/yi");
                                        } else {
-                                               if (num < 1000000000) { /* 1,000,000,000 */
-                                                       res = ast_say_number_full_tw(chan, num / 1000000, ints, language, audiofd, ctrlfd);
-                                                       if (res)
-                                                               return res;
-                                                       num = num % 1000000;
-                                                       snprintf(fn, sizeof(fn), "digits/million");
-                                               } else {
-                                                       if (option_debug)
-                                                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
-                                                       res = -1;
-                                               }
+                                               ast_debug(1, "Number '%d' is too big for me\n", num);
+                                               res = -1;
                                        }
                                }
                        }
                        if (!res) {
-                               if(!ast_streamfile(chan, fn, language)) {
+                               if (!ast_streamfile(chan, fn, language)) {
                                        if ((audiofd > -1) && (ctrlfd > -1))
                                                res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
                                        else
@@ -2156,6 +2572,67 @@ static int ast_say_number_full_tw(struct ast_channel *chan, int num, const char
        return res;
 }
 
+/*!\internal
+ * \brief Counting in Urdu, the national language of Pakistan
+ * \since 1.8
+ */
+static int ast_say_number_full_ur(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
+{
+       int res = 0;
+       int playh = 0;
+       char fn[256] = "";
+
+       if (!num) {
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+       }
+
+       while (!res && (num || playh)) {
+               if (playh) {
+                       snprintf(fn, sizeof(fn), "digits/hundred");
+                       playh = 0;
+               } else if (num < 100) {
+                       snprintf(fn, sizeof(fn), "digits/%d", num);
+                       num = 0;
+               } else if (num < 1000) {
+                       snprintf(fn, sizeof(fn), "digits/%d", (num / 100));
+                       playh++;
+                       num -= ((num / 100) * 100);
+               } else if (num < 100000) { /* 1,00,000 */
+                       if ((res = ast_say_number_full_ur(chan, num / 1000, ints, language, options, audiofd, ctrlfd))) {
+                               return res;
+                       }
+                       num = num % 1000;
+                       snprintf(fn, sizeof(fn), "digits/thousand");
+               } else if (num < 10000000) { /* 1,00,00,000 */
+                       if ((res = ast_say_number_full_ur(chan, num / 100000, ints, language, options, audiofd, ctrlfd))) {
+                               return res;
+                       }
+                       num = num % 100000;
+                       snprintf(fn, sizeof(fn), "digits/lac");
+               } else if (num < 1000000000) { /* 1,00,00,00,000 */
+                       if ((res = ast_say_number_full_ur(chan, num / 10000000, ints, language, options, audiofd, ctrlfd))) {
+                               return res;
+                       }
+                       num = num % 10000000;
+                       snprintf(fn, sizeof(fn), "digits/crore");
+               } else {
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
+                       res = -1;
+               }
+
+               if (!res) {
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd > -1) && (ctrlfd > -1)) {
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               } else {
+                                       res = ast_waitstream(chan, ints);
+                               }
+                       }
+                       ast_stopstream(chan);
+               }
+       }
+       return res;
+}
 
 /*! \brief  determine last digits for thousands/millions (ru) */
 static int get_lastdigits_ru(int num) {
@@ -2170,8 +2647,9 @@ static int get_lastdigits_ru(int num) {
 }
 
 
-/*! \brief  ast_say_number_full_ru: Russian syntax */
-/*! \brief  additional files:
+/*! \brief  ast_say_number_full_ru: Russian syntax
+
+ additional files:
        n00.gsm                 (one hundred, two hundred, ...)
        thousand.gsm
        million.gsm
@@ -2181,7 +2659,7 @@ static int get_lastdigits_ru(int num) {
        millions.gsm
        1f.gsm                  (odna)
        2f.gsm                  (dve)
-    
+
        where 'n' from 1 to 9
 */
 static int ast_say_number_full_ru(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
@@ -2189,31 +2667,31 @@ static int ast_say_number_full_ru(struct ast_channel *chan, int num, const char
        int res = 0;
        int lastdigits = 0;
        char fn[256] = "";
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-       while(!res && (num)) {
+       while (!res && (num)) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus");
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else  if (num < 20) {
-                       if(options && strlen(options) == 1 && num < 3) {
+                       if (options && strlen(options) == 1 && num < 3) {
                            snprintf(fn, sizeof(fn), "digits/%d%s", num, options);
                        } else {
-                           snprintf(fn, sizeof(fn), "digits/%d", num);
+                               snprintf(fn, sizeof(fn), "digits/%d", num);
                        }
                        num = 0;
-               } else  if (num < 100) {
+               } else if (num < 100) {
                        snprintf(fn, sizeof(fn), "digits/%d", num - (num % 10));
                        num %= 10;
-               } else  if (num < 1000){
+               } else if (num < 1000){
                        snprintf(fn, sizeof(fn), "digits/%d", num - (num % 100));
                        num %= 100;
-               } else  if (num < 1000000) { /* 1,000,000 */
+               } else if (num < 1000000) { /* 1,000,000 */
                        lastdigits = get_lastdigits_ru(num / 1000);
                        /* say thousands */
                        if (lastdigits < 3) {
@@ -2224,30 +2702,29 @@ static int ast_say_number_full_ru(struct ast_channel *chan, int num, const char
                        if (res)
                                return res;
                        if (lastdigits == 1) {
-                               snprintf(fn, sizeof(fn), "digits/thousand");
+                               ast_copy_string(fn, "digits/thousand", sizeof(fn));
                        } else if (lastdigits > 1 && lastdigits < 5) {
-                               snprintf(fn, sizeof(fn), "digits/thousands-i");
+                               ast_copy_string(fn, "digits/thousands-i", sizeof(fn));
                        } else {
-                               snprintf(fn, sizeof(fn), "digits/thousands");
+                               ast_copy_string(fn, "digits/thousands", sizeof(fn));
                        }
                        num %= 1000;
-               } else  if (num < 1000000000) { /* 1,000,000,000 */
+               } else if (num < 1000000000) {  /* 1,000,000,000 */
                        lastdigits = get_lastdigits_ru(num / 1000000);
                        /* say millions */
                        res = ast_say_number_full_ru(chan, num / 1000000, ints, language, NULL, audiofd, ctrlfd);
                        if (res)
                                return res;
                        if (lastdigits == 1) {
-                               snprintf(fn, sizeof(fn), "digits/million");
+                               ast_copy_string(fn, "digits/million", sizeof(fn));
                        } else if (lastdigits > 1 && lastdigits < 5) {
-                               snprintf(fn, sizeof(fn), "digits/million-a");
+                               ast_copy_string(fn, "digits/million-a", sizeof(fn));
                        } else {
-                               snprintf(fn, sizeof(fn), "digits/millions");
+                               ast_copy_string(fn, "digits/millions", sizeof(fn));
                        }
                        num %= 1000000;
                } else {
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
                        res = -1;
                }
                if (!res) {
@@ -2263,42 +2740,212 @@ static int ast_say_number_full_ru(struct ast_channel *chan, int num, const char
        return res;
 }
 
+/*! \brief Thai syntax */
+static int ast_say_number_full_th(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
+{
+       int res = 0;
+       int playh = 0;
+       char fn[256] = "";
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+       while(!res && (num || playh)) {
+               if (num < 0) {
+                       ast_copy_string(fn, "digits/lop", sizeof(fn));
+                       if ( num > INT_MIN ) {
+                               num = -num;
+                       } else {
+                               num = 0;
+                       }
+               } else if (playh) {
+                       ast_copy_string(fn, "digits/roi", sizeof(fn));
+                       playh = 0;
+               } else if (num < 100) {
+                       if ((num <= 20) || ((num % 10) == 1)) {
+                               snprintf(fn, sizeof(fn), "digits/%d", num);
+                               num = 0;
+                       } else {
+                               snprintf(fn, sizeof(fn), "digits/%d", (num / 10) * 10);
+                               num %= 10;
+                       }
+               } else if (num < 1000) {
+                       snprintf(fn, sizeof(fn), "digits/%d", (num/100));
+                       playh++;
+                       num %= 100;
+               } else if (num < 10000) { /* 10,000 */
+                       res = ast_say_number_full_th(chan, num / 1000, ints, language, audiofd, ctrlfd);
+                       if (res)
+                               return res;
+                       num %= 1000;
+                       ast_copy_string(fn, "digits/pan", sizeof(fn));
+               } else if (num < 100000) { /* 100,000 */
+                       res = ast_say_number_full_th(chan, num / 10000, ints, language, audiofd, ctrlfd);
+                       if (res)
+                               return res;
+                       num %= 10000;
+                       ast_copy_string(fn, "digits/muan", sizeof(fn));
+               } else if (num < 1000000) { /* 1,000,000 */
+                       res = ast_say_number_full_th(chan, num / 100000, ints, language, audiofd, ctrlfd);
+                       if (res)
+                               return res;
+                       num %= 100000;
+                       ast_copy_string(fn, "digits/san", sizeof(fn));
+               } else {
+                       res = ast_say_number_full_th(chan, num / 1000000, ints, language, audiofd, ctrlfd);
+                       if (res)
+                               return res;
+                       num %= 1000000;
+                       ast_copy_string(fn, "digits/larn", sizeof(fn));
+               }
+               if (!res) {
+                       if(!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd  > -1) && (ctrlfd > -1))
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               else
+                                       res = ast_waitstream(chan, ints);
+                       }
+                       ast_stopstream(chan);
+               }
+       }
+       return res;
+}
+
+/*! \brief  ast_say_number_full_vi: Vietnamese syntax */
+static int ast_say_number_full_vi(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
+{
+       int res = 0;
+       int playh = 0;
+       int playoh = 0;
+       int playohz = 0;
+       int playz = 0;
+       int playl = 0;
+       char fn[256] = "";
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+       while (!res && (num || playh)) {
+               if (num < 0) {
+                       ast_copy_string(fn, "digits/minus", sizeof(fn));
+                       if ( num > INT_MIN ) {
+                               num = -num;
+                       } else {
+                               num = 0;
+                       }
+               } else if (playl) {
+                       snprintf(fn, sizeof(fn), "digits/%da", num);
+                       playl = 0;
+                       num = 0;
+               } else if (playh) {
+                       ast_copy_string(fn, "digits/hundred", sizeof(fn));
+                       playh = 0;
+               } else if (playz) {
+                       ast_copy_string(fn, "digits/odd", sizeof(fn));
+                       playz = 0;
+               } else if (playoh) {
+                       ast_copy_string(fn, "digits/0-hundred", sizeof(fn));
+                       playoh = 0;
+               } else if (playohz) {
+                       ast_copy_string(fn, "digits/0-hundred-odd", sizeof(fn));
+                       playohz = 0;
+               } else  if (num < 20) {
+                       snprintf(fn, sizeof(fn), "digits/%d", num);
+                       num = 0;
+               } else  if (num < 100) {
+                       snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
+                       num %= 10;
+                       if ((num == 5) || (num == 4) || (num == 1)) playl++;
+               } else {
+                       if (num < 1000) {
+                               snprintf(fn, sizeof(fn), "digits/%d", (num/100));
+                               num %= 100;
+                               if (num && (num < 10)) {
+                                       playz++;
+                                       playh++;
+                               } else {
+                                       playh++;
+                               }
+                       } else {
+                               if (num < 1000000) { /* 1,000,000 */
+                                       res = ast_say_number_full_vi(chan, num / 1000, ints, language, audiofd, ctrlfd);
+                                       if (res)
+                                               return res;
+                                       num %= 1000;
+                                       snprintf(fn, sizeof(fn), "digits/thousand");
+                                       if (num && (num < 10)) {
+                                               playohz++;
+                                       } else if (num && (num < 100)){
+                                               playoh++;
+                                       } else {
+                                               playh = 0;
+                                               playohz = 0;
+                                               playoh = 0;
+                                       }
+                               } else {
+                                       if (num < 1000000000) { /* 1,000,000,000 */
+                                               res = ast_say_number_full_vi(chan, num / 1000000, ints, language, audiofd, ctrlfd);
+                                               if (res)
+                                                       return res;
+                                               num %= 1000000;
+                                               ast_copy_string(fn, "digits/million", sizeof(fn));
+                                       } else {
+                                               res = -1;
+                                       }
+                               }
+                       }
+               }
+               if (!res) {
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd  > -1) && (ctrlfd > -1))
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               else
+                                       res = ast_waitstream(chan, ints);
+                       }
+                       ast_stopstream(chan);
+               }
+       }
+       return res;
+}
 
-/*! \brief  ast_say_enumeration_full: call language-specific functions */
-/* Called from AGI */
+/*! \brief  ast_say_enumeration_full: call language-specific functions
+ * \note Called from AGI */
 static int say_enumeration_full(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
-       if (!strcasecmp(language,"en") ) {      /* English syntax */
-          return(ast_say_enumeration_full_en(chan, num, ints, language, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "da") ) {      /* Danish syntax */
-          return(ast_say_enumeration_full_da(chan, num, ints, language, options, audiofd, ctrlfd));
-       } else if (!strcasecmp(language, "de") ) {      /* German syntax */
-          return(ast_say_enumeration_full_de(chan, num, ints, language, options, audiofd, ctrlfd));
-       } 
-       
+       if (!strncasecmp(language, "en", 2)) {        /* English syntax */
+          return ast_say_enumeration_full_en(chan, num, ints, language, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "da", 2)) { /* Danish syntax */
+          return ast_say_enumeration_full_da(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "de", 2)) { /* German syntax */
+          return ast_say_enumeration_full_de(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "he", 2)) { /* Hebrew syntax */
+               return ast_say_enumeration_full_he(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "is", 2)) { /* Icelandic syntax */
+               return ast_say_enumeration_full_is(chan, num, ints, language, options, audiofd, ctrlfd);
+       } else if (!strncasecmp(language, "vi", 2)) { /* Vietnamese syntax */
+               return ast_say_enumeration_full_vi(chan, num, ints, language, audiofd, ctrlfd);
+       }
+
        /* Default to english */
-       return(ast_say_enumeration_full_en(chan, num, ints, language, audiofd, ctrlfd));
+       return ast_say_enumeration_full_en(chan, num, ints, language, audiofd, ctrlfd);
 }
 
-/*! \brief  ast_say_enumeration_full_en: English syntax */
-/* This is the default syntax, if no other syntax defined in this file is used */
+/*! \brief  ast_say_enumeration_full_en: English syntax
+ \note This is the default syntax, if no other syntax defined in this file is used */
 static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
 {
        int res = 0, t = 0;
        char fn[256] = "";
-       
-       while(!res && num) {
+
+       while (!res && num) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus"); /* kind of senseless for enumerations, but our best effort for error checking */
+                       ast_copy_string(fn, "digits/minus", sizeof(fn)); /* kind of senseless for enumerations, but our best effort for error checking */
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/h-%d", num);
                        num = 0;
-               } else if (num < 100) { 
+               } else if (num < 100) {
                        int tens = num / 10;
                        num = num % 10;
                        if (num == 0) {
@@ -2311,13 +2958,13 @@ static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const
                        num = num % 100;
                        if (hundreds > 1 || t == 1) {
                                res = ast_say_number_full_en(chan, hundreds, ints, language, audiofd, ctrlfd);
-                       }                       
+                       }
                        if (res)
                                return res;
                        if (num) {
-                               snprintf(fn, sizeof(fn), "digits/hundred");
+                               ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        } else {
-                               snprintf(fn, sizeof(fn), "digits/h-hundred");
+                               ast_copy_string(fn, "digits/h-hundred", sizeof(fn));
                        }
                } else if (num < 1000000) {
                        int thousands = num / 1000;
@@ -2327,10 +2974,10 @@ static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const
                        }
                        if (res)
                                return res;
-                       if (num) {                                      
-                               snprintf(fn, sizeof(fn), "digits/thousand");
+                       if (num) {
+                               ast_copy_string(fn, "digits/thousand", sizeof(fn));
                        } else {
-                               snprintf(fn, sizeof(fn), "digits/h-thousand");
+                               ast_copy_string(fn, "digits/h-thousand", sizeof(fn));
                        }
                        t = 1;
                } else if (num < 1000000000) {
@@ -2340,10 +2987,10 @@ static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const
                        res = ast_say_number_full_en(chan, millions, ints, language, audiofd, ctrlfd);
                        if (res)
                                return res;
-                       if (num) {                                      
-                               snprintf(fn, sizeof(fn), "digits/million");
+                       if (num) {
+                               ast_copy_string(fn, "digits/million", sizeof(fn));
                        } else {
-                               snprintf(fn, sizeof(fn), "digits/h-million");
+                               ast_copy_string(fn, "digits/h-million", sizeof(fn));
                        }
                } else if (num < INT_MAX) {
                        int billions = num / 1000000000;
@@ -2352,17 +2999,16 @@ static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const
                        res = ast_say_number_full_en(chan, billions, ints, language, audiofd, ctrlfd);
                        if (res)
                                return res;
-                       if (num) {                                      
-                               snprintf(fn, sizeof(fn), "digits/billion");
+                       if (num) {
+                               ast_copy_string(fn, "digits/billion", sizeof(fn));
                        } else {
-                               snprintf(fn, sizeof(fn), "digits/h-billion");
+                               ast_copy_string(fn, "digits/h-billion", sizeof(fn));
                        }
                } else if (num == INT_MAX) {
-                       snprintf(fn, sizeof(fn), "digits/h-last");
+                       ast_copy_string(fn, "digits/h-last", sizeof(fn));
                        num = 0;
                } else {
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
                        res = -1;
                }
 
@@ -2380,6 +3026,25 @@ static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const
        return res;
 }
 
+static int ast_say_enumeration_full_vi(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
+{
+       int res = 0;
+       char fn[256] = "";
+       ast_copy_string(fn, "digits/h", sizeof(fn));
+       if (!res) {
+               if (!ast_streamfile(chan, fn, language)) {
+                       if ((audiofd > -1) && (ctrlfd > -1)) {
+                               res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                       } else {
+                               res = ast_waitstream(chan, ints);
+                       }
+               }
+               ast_stopstream(chan);
+       }
+
+       return ast_say_number_full_vi(chan, num, ints, language, audiofd, ctrlfd);
+}
+
 /*! \brief  ast_say_enumeration_full_da: Danish syntax */
 static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
@@ -2388,27 +3053,27 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
        char fn[256] = "", fna[256] = "";
        char *gender;
 
-       if (options && !strncasecmp(options, "f",1)) {
+       if (options && !strncasecmp(options, "f", 1)) {
                gender = "F";
-       } else if (options && !strncasecmp(options, "n",1)) {
+       } else if (options && !strncasecmp(options, "n", 1)) {
                gender = "N";
        } else {
                gender = "";
        }
 
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-       while(!res && num) {
+       while (!res && num) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus"); /* kind of senseless for enumerations, but our best effort for error checking */
+                       ast_copy_string(fn, "digits/minus", sizeof(fn)); /* kind of senseless for enumerations, but our best effort for error checking */
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (num < 100 && t) {
-                       snprintf(fn, sizeof(fn), "digits/and");
+                       ast_copy_string(fn, "digits/and", sizeof(fn));
                        t = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/h-%d%s", num, gender);
@@ -2429,26 +3094,26 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                        int hundreds = num / 100;
                        num = num % 100;
                        if (hundreds == 1) {
-                               snprintf(fn, sizeof(fn), "digits/1N");
+                               ast_copy_string(fn, "digits/1N", sizeof(fn));
                        } else {
                                snprintf(fn, sizeof(fn), "digits/%d", hundreds);
                        }
-                       if (num) {                                      
-                               snprintf(fna, sizeof(fna), "digits/hundred");
+                       if (num) {
+                               ast_copy_string(fna, "digits/hundred", sizeof(fna));
                        } else {
                                snprintf(fna, sizeof(fna), "digits/h-hundred%s", gender);
                        }
                        t = 1;
-               } else  if (num < 1000000) {
+               } else if (num < 1000000) {
                        int thousands = num / 1000;
                        num = num % 1000;
                        if (thousands == 1) {
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/1N");
-                                       snprintf(fna, sizeof(fna), "digits/thousand");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/1N", sizeof(fn));
+                                       ast_copy_string(fna, "digits/thousand", sizeof(fna));
                                } else {
                                        if (t) {
-                                               snprintf(fn, sizeof(fn), "digits/1N");
+                                               ast_copy_string(fn, "digits/1N", sizeof(fn));
                                                snprintf(fna, sizeof(fna), "digits/h-thousand%s", gender);
                                        } else {
                                                snprintf(fn, sizeof(fn), "digits/h-thousand%s", gender);
@@ -2459,8 +3124,8 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                                if (res) {
                                        return res;
                                }
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/thousand");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
                                } else {
                                        snprintf(fn, sizeof(fn), "digits/h-thousand%s", gender);
                                }
@@ -2470,11 +3135,11 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                        int millions = num / 1000000;
                        num = num % 1000000;
                        if (millions == 1) {
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/1F");
-                                       snprintf(fna, sizeof(fna), "digits/million");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/1F", sizeof(fn));
+                                       ast_copy_string(fna, "digits/million", sizeof(fna));
                                } else {
-                                       snprintf(fn, sizeof(fn), "digits/1N");
+                                       ast_copy_string(fn, "digits/1N", sizeof(fn));
                                        snprintf(fna, sizeof(fna), "digits/h-million%s", gender);
                                }
                        } else {
@@ -2482,8 +3147,8 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                                if (res) {
                                        return res;
                                }
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/millions");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/millions", sizeof(fn));
                                } else {
                                        snprintf(fn, sizeof(fn), "digits/h-million%s", gender);
                                }
@@ -2493,19 +3158,19 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                        int billions = num / 1000000000;
                        num = num % 1000000000;
                        if (billions == 1) {
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/1F");
-                                       snprintf(fna, sizeof(fna), "digits/milliard");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/1F", sizeof(fn));
+                                       ast_copy_string(fna, "digits/milliard", sizeof(fna));
                                } else {
-                                       snprintf(fn, sizeof(fn), "digits/1N");
+                                       ast_copy_string(fn, "digits/1N", sizeof(fn));
                                        snprintf(fna, sizeof(fna), "digits/h-milliard%s", gender);
                                }
                        } else {
                                res = ast_say_number_full_de(chan, billions, ints, language, options, audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fna), "digits/milliards");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/milliards", sizeof(fna));
                                } else {
                                        snprintf(fn, sizeof(fna), "digits/h-milliard%s", gender);
                                }
@@ -2515,16 +3180,15 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                        snprintf(fn, sizeof(fn), "digits/h-last%s", gender);
                        num = 0;
                } else {
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
                        res = -1;
                }
 
                if (!res) {
                        if (!ast_streamfile(chan, fn, language)) {
-                               if ((audiofd > -1) && (ctrlfd > -1)) 
+                               if ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else  
+                               else
                                        res = ast_waitstream(chan, ints);
                        }
                        ast_stopstream(chan);
@@ -2552,27 +3216,27 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
        char fn[256] = "", fna[256] = "";
        char *gender;
 
-       if (options && !strncasecmp(options, "f",1)) {
+       if (options && !strncasecmp(options, "f", 1)) {
                gender = "F";
-       } else if (options && !strncasecmp(options, "n",1)) {
+       } else if (options && !strncasecmp(options, "n", 1)) {
                gender = "N";
        } else {
                gender = "";
        }
 
-       if (!num) 
-               return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-       while(!res && num) {
+       while (!res && num) {
                if (num < 0) {
-                       snprintf(fn, sizeof(fn), "digits/minus"); /* kind of senseless for enumerations, but our best effort for error checking */
+                       ast_copy_string(fn, "digits/minus", sizeof(fn)); /* kind of senseless for enumerations, but our best effort for error checking */
                        if ( num > INT_MIN ) {
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (num < 100 && t) {
-                       snprintf(fn, sizeof(fn), "digits/and");
+                       ast_copy_string(fn, "digits/and", sizeof(fn));
                        t = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/h-%d%s", num, gender);
@@ -2593,26 +3257,26 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                        int hundreds = num / 100;
                        num = num % 100;
                        if (hundreds == 1) {
-                               snprintf(fn, sizeof(fn), "digits/1N");
+                               ast_copy_string(fn, "digits/1N", sizeof(fn));
                        } else {
                                snprintf(fn, sizeof(fn), "digits/%d", hundreds);
                        }
-                       if (num) {                                      
-                               snprintf(fna, sizeof(fna), "digits/hundred");
+                       if (num) {
+                               ast_copy_string(fna, "digits/hundred", sizeof(fna));
                        } else {
                                snprintf(fna, sizeof(fna), "digits/h-hundred%s", gender);
                        }
                        t = 1;
-               } else  if (num < 1000000) {
+               } else if (num < 1000000) {
                        int thousands = num / 1000;
                        num = num % 1000;
                        if (thousands == 1) {
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/1N");
-                                       snprintf(fna, sizeof(fna), "digits/thousand");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/1N", sizeof(fn));
+                                       ast_copy_string(fna, "digits/thousand", sizeof(fna));
                                } else {
                                        if (t) {
-                                               snprintf(fn, sizeof(fn), "digits/1N");
+                                               ast_copy_string(fn, "digits/1N", sizeof(fn));
                                                snprintf(fna, sizeof(fna), "digits/h-thousand%s", gender);
                                        } else {
                                                snprintf(fn, sizeof(fn), "digits/h-thousand%s", gender);
@@ -2623,8 +3287,8 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                                if (res) {
                                        return res;
                                }
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/thousand");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
                                } else {
                                        snprintf(fn, sizeof(fn), "digits/h-thousand%s", gender);
                                }
@@ -2634,11 +3298,11 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                        int millions = num / 1000000;
                        num = num % 1000000;
                        if (millions == 1) {
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/1F");
-                                       snprintf(fna, sizeof(fna), "digits/million");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/1F", sizeof(fn));
+                                       ast_copy_string(fna, "digits/million", sizeof(fna));
                                } else {
-                                       snprintf(fn, sizeof(fn), "digits/1N");
+                                       ast_copy_string(fn, "digits/1N", sizeof(fn));
                                        snprintf(fna, sizeof(fna), "digits/h-million%s", gender);
                                }
                        } else {
@@ -2646,8 +3310,8 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                                if (res) {
                                        return res;
                                }
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/millions");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/millions", sizeof(fn));
                                } else {
                                        snprintf(fn, sizeof(fn), "digits/h-million%s", gender);
                                }
@@ -2657,19 +3321,19 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                        int billions = num / 1000000000;
                        num = num % 1000000000;
                        if (billions == 1) {
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fn), "digits/1F");
-                                       snprintf(fna, sizeof(fna), "digits/milliard");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/1F", sizeof(fn));
+                                       ast_copy_string(fna, "digits/milliard", sizeof(fna));
                                } else {
-                                       snprintf(fn, sizeof(fn), "digits/1N");
+                                       ast_copy_string(fn, "digits/1N", sizeof(fn));
                                        snprintf(fna, sizeof(fna), "digits/h-milliard%s", gender);
                                }
                        } else {
                                res = ast_say_number_full_de(chan, billions, ints, language, options, audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               if (num) {                                      
-                                       snprintf(fn, sizeof(fna), "digits/milliards");
+                               if (num) {
+                                       ast_copy_string(fn, "digits/milliards", sizeof(fna));
                                } else {
                                        snprintf(fn, sizeof(fna), "digits/h-milliard%s", gender);
                                }
@@ -2679,16 +3343,279 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                        snprintf(fn, sizeof(fn), "digits/h-last%s", gender);
                        num = 0;
                } else {
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
                        res = -1;
                }
 
                if (!res) {
                        if (!ast_streamfile(chan, fn, language)) {
-                               if ((audiofd > -1) && (ctrlfd > -1)) 
+                               if ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else  
+                               else
+                                       res = ast_waitstream(chan, ints);
+                       }
+                       ast_stopstream(chan);
+                       if (!res) {
+                               if (strlen(fna) != 0 && !ast_streamfile(chan, fna, language)) {
+                                       if ((audiofd > -1) && (ctrlfd > -1)) {
+                                               res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                                       } else {
+                                               res = ast_waitstream(chan, ints);
+                                       }
+                               }
+                               ast_stopstream(chan);
+                               strcpy(fna, "");
+                       }
+               }
+       }
+       return res;
+}
+
+static int ast_say_enumeration_full_he(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
+{
+       int res = 0;
+       char fn[256] = "";
+       int mf = -1;                            /* +1 = Masculin; -1 = Feminin */
+       ast_verb(3, "ast_say_digits_full: started. num: %d, options=\"%s\"\n", num, options);
+
+       if (options && !strncasecmp(options, "m", 1)) {
+               mf = -1;
+       }
+
+       ast_verb(3, "ast_say_digits_full: num: %d, options=\"%s\", mf=%d\n", num, options, mf);
+
+       while (!res && num) {
+               if (num < 0) {
+                       snprintf(fn, sizeof(fn), "digits/minus");       /* kind of senseless for enumerations, but our best effort for error checking */
+                       if (num > INT_MIN) {
+                               num = -num;
+                       } else {
+                               num = 0;
+                       }
+               } else if (num < 21) {
+                       if (mf < 0) {
+                               if (num < 10) {
+                                       snprintf(fn, sizeof(fn), "digits/f-0%d", num);
+                               } else {
+                                       snprintf(fn, sizeof(fn), "digits/f-%d", num);
+                               }
+                       } else {
+                               if (num < 10) {
+                                       snprintf(fn, sizeof(fn), "digits/m-0%d", num);
+                               } else {
+                                       snprintf(fn, sizeof(fn), "digits/m-%d", num);
+                               }
+                       }
+                       num = 0;
+               } else if ((num < 100) && num >= 20) {
+                       snprintf(fn, sizeof(fn), "digits/%d", (num / 10) * 10);
+                       num = num % 10;
+               } else if ((num >= 100) && (num < 1000)) {
+                       int tmpnum = num / 100;
+                       snprintf(fn, sizeof(fn), "digits/%d00", tmpnum);
+                       num = num - (tmpnum * 100);
+               } else if ((num >= 1000) && (num < 10000)) {
+                       int tmpnum = num / 1000;
+                       snprintf(fn, sizeof(fn), "digits/%dk", tmpnum);
+                       num = num - (tmpnum * 1000);
+               } else if (num < 20000) {
+                       snprintf(fn, sizeof(fn), "digits/m-%d", (num / 1000));
+                       num = num % 1000;
+               } else if (num < 1000000) {
+                       res = ast_say_number_full_he(chan, num / 1000, ints, language, "m", audiofd, ctrlfd);
+                       if (res) {
+                               return res;
+                       }
+                       snprintf(fn, sizeof(fn), "digits/1k");
+                       num = num % 1000;
+               } else if (num < 2000000) {
+                       snprintf(fn, sizeof(fn), "digits/1m");
+                       num = num % 1000000;
+               } else if (num < 3000000) {
+                       snprintf(fn, sizeof(fn), "digits/2m");
+                       num = num - 2000000;
+               } else if (num < 1000000000) {
+                       res = ast_say_number_full_he(chan, num / 1000000, ints, language, "m", audiofd, ctrlfd);
+                       if (res) {
+                               return res;
+                       }
+                       snprintf(fn, sizeof(fn), "digits/1m");
+                       num = num % 1000000;
+               } else {
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
+                       res = -1;
+               }
+               if (!res) {
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd > -1) && (ctrlfd > -1)) {
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               } else {
+                                       res = ast_waitstream(chan, ints);
+                               }
+                       }
+                       ast_stopstream(chan);
+               }
+       }
+       return res;
+}
+
+/*! \brief  ast_say_enumeration_full_is: Icelandic syntax */
+static int ast_say_enumeration_full_is(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
+{
+       /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender; 'p' plural */
+       int res = 0, t = 0;
+       char fn[256] = "", fna[256] = "";
+       char *gender;
+
+       if (options && !strncasecmp(options, "f", 1)) {
+               gender = "F";
+       } else if (options && !strncasecmp(options, "n", 1)) {
+               gender = "N";
+       } else {
+               gender = "";
+       }
+
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+       while (!res && num) {
+               if (num < 0) {
+                       ast_copy_string(fn, "digits/minus", sizeof(fn)); /* kind of senseless for enumerations, but our best effort for error checking */
+                       if ( num > INT_MIN ) {
+                               num = -num;
+                       } else {
+                               num = 0;
+                       }
+               } else if (num < 100 && t) {
+                       ast_copy_string(fn, "digits/and", sizeof(fn));
+                       t = 0;
+               } else if (num < 20) {
+                       snprintf(fn, sizeof(fn), "digits/h-%d%s", num, gender);
+                       num = 0;
+               } else if (num < 100) {
+                       int ones = num % 10;
+                       if (ones) {
+                               int tens = num - ones;
+                               snprintf(fn, sizeof(fn), "digits/h-%d%s", tens, gender);
+                               num = ones;
+                               t++;
+                       }
+                       else if (t) {
+                               snprintf(fn, sizeof(fn), "digits/and");
+                               t = 0;
+                       }
+                       else {
+                               snprintf(fn, sizeof(fn), "digits/h-%d%s", num, gender);
+                               num = 0;
+                       }
+
+               } else if (num == 100 && t == 0) {
+                       snprintf(fn, sizeof(fn), "digits/h-hundred%s", gender);
+                       num = 0;
+               } else if (num < 1000) {
+                       int hundreds = num / 100;
+                       num = num % 100;
+                       if (hundreds == 1) {
+                               ast_copy_string(fn, "digits/1hk", sizeof(fn));
+                       } else {
+                               snprintf(fn, sizeof(fn), "digits/%d", hundreds);
+                       }
+                       if (num) {
+                               ast_copy_string(fna, "digits/hundred", sizeof(fna));
+                       } else {
+                               snprintf(fna, sizeof(fna), "digits/h-hundred%s", gender);
+                       }
+                       t = 1;
+               } else  if (num < 1000000) {
+                       int thousands = num / 1000;
+                       num = num % 1000;
+                       if (thousands == 1) {
+                               if (num) {
+                                       /* Thousand is a neutral word, so use the neutral recording */
+                                       ast_copy_string(fn, "digits/1hk", sizeof(fn));
+                                       ast_copy_string(fna, "digits/thousand", sizeof(fna));
+                               } else {
+                                       if (t) {
+                                               ast_copy_string(fn, "digits/1hk", sizeof(fn));
+                                               snprintf(fna, sizeof(fna), "digits/h-thousand%s", gender);
+                                       } else {
+                                               snprintf(fn, sizeof(fn), "digits/h-thousand%s", gender);
+                                       }
+                               }
+                       } else {
+                               res = ast_say_number_full_is(chan, thousands, ints, language, options, audiofd, ctrlfd);
+                               if (res) {
+                                       return res;
+                               }
+                               if (num) {
+                                       ast_copy_string(fn, "digits/thousand", sizeof(fn));
+                               } else {
+                                       snprintf(fn, sizeof(fn), "digits/h-thousand%s", gender);
+                               }
+                       }
+                       if (num)
+                               t = 1;
+               } else if (num < 1000000000) {
+                       int millions = num / 1000000;
+                       num = num % 1000000;
+                       if (millions == 1) {
+                               if (num) {
+                                       /* Million is a feminine word, so use the female form */
+                                       ast_copy_string(fn, "digits/1kvk", sizeof(fn));
+                                       ast_copy_string(fna, "digits/million", sizeof(fna));
+                               } else {
+                                       ast_copy_string(fn, "digits/1hk", sizeof(fn));
+                                       snprintf(fna, sizeof(fna), "digits/h-million%s", gender);
+                               }
+                       } else {
+                               res = ast_say_number_full_is(chan, millions, ints, language, options, audiofd, ctrlfd);
+                               if (res) {
+                                       return res;
+                               }
+                               if (num) {
+                                       ast_copy_string(fn, "digits/millions", sizeof(fn));
+                               } else {
+                                       snprintf(fn, sizeof(fn), "digits/h-million%s", gender);
+                               }
+                       }
+                       if (num)
+                               t = 1;
+               } else if (num < INT_MAX) {
+                       int billions = num / 1000000000;
+                       num = num % 1000000000;
+                       if (billions == 1) {
+                               if (num) {
+                                       ast_copy_string(fn, "digits/1", sizeof(fn));
+                                       ast_copy_string(fna, "digits/milliard", sizeof(fna));
+                               } else {
+                                       ast_copy_string(fn, "digits/1hk", sizeof(fn));
+                                       snprintf(fna, sizeof(fna), "digits/h-milliard%s", gender);
+                               }
+                       } else {
+                               res = ast_say_number_full_is(chan, billions, ints, language, options, audiofd, ctrlfd);
+                               if (res)
+                                       return res;
+                               if (num) {
+                                       ast_copy_string(fn, "digits/milliards", sizeof(fna));
+                               } else {
+                                       snprintf(fn, sizeof(fna), "digits/h-milliard%s", gender);
+                               }
+                       }
+                       if (num)
+                               t = 1;
+               } else if (num == INT_MAX) {
+                       snprintf(fn, sizeof(fn), "digits/h-last%s", gender);
+                       num = 0;
+               } else {
+                       ast_debug(1, "Number '%d' is too big for me\n", num);
+                       res = -1;
+               }
+
+               if (!res) {
+                       if (!ast_streamfile(chan, fn, language)) {
+                               if ((audiofd > -1) && (ctrlfd > -1))
+                                       res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                               else
                                        res = ast_waitstream(chan, ints);
                        }
                        ast_stopstream(chan);
@@ -2710,33 +3637,52 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
 
 static int say_date(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
-       if (!strcasecmp(lang, "en") ) { /* English syntax */
-               return(ast_say_date_en(chan, t, ints, lang));
-       } else if (!strcasecmp(lang, "da") ) {  /* Danish syntax */
-               return(ast_say_date_da(chan, t, ints, lang));
-       } else if (!strcasecmp(lang, "de") ) {  /* German syntax */
-               return(ast_say_date_de(chan, t, ints, lang));
-       } else if (!strcasecmp(lang, "fr") ) {  /* French syntax */
-               return(ast_say_date_fr(chan, t, ints, lang));
-       } else if (!strcasecmp(lang, "nl") ) {  /* Dutch syntax */
-               return(ast_say_date_nl(chan, t, ints, lang));
-       } else if (!strcasecmp(lang, "pt") || !strcasecmp(lang, "pt_BR")) {     /* Portuguese syntax */
-               return(ast_say_date_pt(chan, t, ints, lang));
-       } else if (!strcasecmp(lang, "gr") ) {                          /* Greek syntax */
-               return(ast_say_date_gr(chan, t, ints, lang));
+       if (!strncasecmp(lang, "en", 2)) {        /* English syntax */
+               return ast_say_date_en(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "da", 2)) { /* Danish syntax */
+               return ast_say_date_da(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "de", 2)) { /* German syntax */
+               return ast_say_date_de(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "fr", 2)) { /* French syntax */
+               return ast_say_date_fr(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "ge", 2)) { /* deprecated Georgian syntax */
+               static int deprecation_warning = 0;
+               if (deprecation_warning++ % 10 == 0) {
+                       ast_log(LOG_WARNING, "ge is not a standard language code.  Please switch to using ka instead.\n");
+               }
+               return ast_say_date_ka(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "gr", 2)) { /* Greek syntax */
+               return ast_say_date_gr(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "ja", 2)) { /* Japanese syntax */
+               return ast_say_date_ja(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "he", 2)) { /* Hebrew syntax */
+               return ast_say_date_he(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "hu", 2)) { /* Hungarian syntax */
+               return ast_say_date_hu(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "is", 2)) { /* Icelandic syntax */
+               return ast_say_date_is(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "ka", 2)) { /* Georgian syntax */
+               return ast_say_date_ka(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "nl", 2)) { /* Dutch syntax */
+               return ast_say_date_nl(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "pt", 2)) { /* Portuguese syntax */
+               return ast_say_date_pt(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "th", 2)) { /* Thai syntax */
+               return ast_say_date_th(chan, t, ints, lang);
        }
 
        /* Default to English */
-       return(ast_say_date_en(chan, t, ints, lang));
+       return ast_say_date_en(chan, t, ints, lang);
 }
 
-/* English syntax */
+/*! \brief English syntax */
 int ast_say_date_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
-       struct tm tm;
+       struct ast_tm tm;
+       struct timeval when = { t, 0 };
        char fn[256];
        int res = 0;
-       ast_localtime(&t,&tm,NULL);
+       ast_localtime(&when, &tm, NULL);
        if (!res) {
                snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
                res = ast_streamfile(chan, fn, lang);
@@ -2758,13 +3704,14 @@ int ast_say_date_en(struct ast_channel *chan, time_t t, const char *ints, const
        return res;
 }
 
-/* Danish syntax */
+/*! \brief Danish syntax */
 int ast_say_date_da(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
-       struct tm tm;
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
        char fn[256];
        int res = 0;
-       ast_localtime(&t,&tm,NULL);
+       ast_localtime(&when, &tm, NULL);
        if (!res) {
                snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
                res = ast_streamfile(chan, fn, lang);
@@ -2785,19 +3732,19 @@ int ast_say_date_da(struct ast_channel *chan, time_t t, const char *ints, const
                /* Year */
                int year = tm.tm_year + 1900;
                if (year > 1999) {      /* year 2000 and later */
-                       res = ast_say_number(chan, year, ints, lang, (char *) NULL);    
+                       res = ast_say_number(chan, year, ints, lang, (char *) NULL);
                } else {
                        if (year < 1100) {
                                /* I'm not going to handle 1100 and prior */
                                /* We'll just be silent on the year, instead of bombing out. */
                        } else {
                            /* year 1100 to 1999. will anybody need this?!? */
-                               snprintf(fn,sizeof(fn), "digits/%d", (year / 100) );
+                               snprintf(fn, sizeof(fn), "digits/%d", (year / 100));
                                res = wait_file(chan, ints, fn, lang);
                                if (!res) {
-                                       res = wait_file(chan,ints, "digits/hundred", lang);
+                                       res = wait_file(chan, ints, "digits/hundred", lang);
                                        if (!res && year % 100 != 0) {
-                                               res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);    
+                                               res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);
                                        }
                                }
                        }
@@ -2806,13 +3753,14 @@ int ast_say_date_da(struct ast_channel *chan, time_t t, const char *ints, const
        return res;
 }
 
-/* German syntax */
+/*! \brief German syntax */
 int ast_say_date_de(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
-       struct tm tm;
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
        char fn[256];
        int res = 0;
-       ast_localtime(&t,&tm,NULL);
+       ast_localtime(&when, &tm, NULL);
        if (!res) {
                snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
                res = ast_streamfile(chan, fn, lang);
@@ -2833,7 +3781,7 @@ int ast_say_date_de(struct ast_channel *chan, time_t t, const char *ints, const
                /* Year */
                int year = tm.tm_year + 1900;
                if (year > 1999) {      /* year 2000 and later */
-                       res = ast_say_number(chan, year, ints, lang, (char *) NULL);    
+                       res = ast_say_number(chan, year, ints, lang, (char *) NULL);
                } else {
                        if (year < 1100) {
                                /* I'm not going to handle 1100 and prior */
@@ -2841,12 +3789,12 @@ int ast_say_date_de(struct ast_channel *chan, time_t t, const char *ints, const
                        } else {
                            /* year 1100 to 1999. will anybody need this?!? */
                            /* say 1967 as 'neunzehn hundert sieben und sechzig' */
-                               snprintf(fn,sizeof(fn), "digits/%d", (year / 100) );
+                               snprintf(fn, sizeof(fn), "digits/%d", (year / 100) );
                                res = wait_file(chan, ints, fn, lang);
                                if (!res) {
-                                       res = wait_file(chan,ints, "digits/hundred", lang);
+                                       res = wait_file(chan, ints, "digits/hundred", lang);
                                        if (!res && year % 100 != 0) {
-                                               res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);    
+                                               res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);
                                        }
                                }
                        }
@@ -2855,13 +3803,46 @@ int ast_say_date_de(struct ast_channel *chan, time_t t, const char *ints, const
        return res;
 }
 
-/* French syntax */
+/*! \brief Hungarian syntax */
+int ast_say_date_hu(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+{
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
+       char fn[256];
+       int res = 0;
+       ast_localtime(&when, &tm, NULL);
+
+       if (!res)
+               res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
+       if (!res)
+               res = ast_waitstream(chan, ints);
+       if (!res) {
+               snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
+               res = ast_streamfile(chan, fn, lang);
+               if (!res)
+                       res = ast_waitstream(chan, ints);
+       }
+       if (!res)
+               ast_say_number(chan, tm.tm_mday , ints, lang, (char *) NULL);
+       if (!res)
+               res = ast_waitstream(chan, ints);
+       if (!res) {
+               snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
+               res = ast_streamfile(chan, fn, lang);
+               if (!res)
+                       res = ast_waitstream(chan, ints);
+       }
+       return res;
+}
+
+/*! \brief French syntax */
 int ast_say_date_fr(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
-       struct tm tm;
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
        char fn[256];
        int res = 0;
-       ast_localtime(&t,&tm,NULL);
+       ast_localtime(&when, &tm, NULL);
        if (!res) {
                snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
                res = ast_streamfile(chan, fn, lang);
@@ -2883,13 +3864,14 @@ int ast_say_date_fr(struct ast_channel *chan, time_t t, const char *ints, const
        return res;
 }
 
-/* Dutch syntax */
+/*! \brief Dutch syntax */
 int ast_say_date_nl(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
-       struct tm tm;
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
        char fn[256];
        int res = 0;
-       ast_localtime(&t,&tm,NULL);
+       ast_localtime(&when, &tm, NULL);
        if (!res) {
                snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
                res = ast_streamfile(chan, fn, lang);
@@ -2911,14 +3893,51 @@ int ast_say_date_nl(struct ast_channel *chan, time_t t, const char *ints, const
        return res;
 }
 
-/* Portuguese syntax */
+/*! \brief Thai syntax */
+int ast_say_date_th(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+{
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
+       char fn[256];
+       int res = 0;
+       ast_localtime(&when, &tm, NULL);
+       if (!res) {
+               snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
+               res = ast_streamfile(chan, fn, lang);
+               ast_copy_string(fn, "digits/tee", sizeof(fn));
+               res = ast_streamfile(chan, fn, lang);
+               if (!res)
+                       res = ast_waitstream(chan, ints);
+       }
+       if (!res)
+               res = ast_say_number(chan, tm.tm_mday, ints, lang, (char * ) NULL);
+       if (!res)
+               res = ast_waitstream(chan, ints);
+       if (!res) {
+               ast_copy_string(fn, "digits/duan", sizeof(fn));
+               res = ast_streamfile(chan, fn, lang);
+               snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
+               res = ast_streamfile(chan, fn, lang);
+               if (!res)
+                       res = ast_waitstream(chan, ints);
+       }
+       if (!res){
+               ast_copy_string(fn, "digits/posor", sizeof(fn));
+               res = ast_streamfile(chan, fn, lang);
+               res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
+       }
+       return res;
+}
+
+/*! \brief Portuguese syntax */
 int ast_say_date_pt(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
-       struct tm tm;
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
        char fn[256];
        int res = 0;
-       ast_localtime(&t,&tm,NULL);
-       localtime_r(&t,&tm);
+
+       ast_localtime(&when, &tm, NULL);
        snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
        if (!res)
                res = wait_file(chan, ints, fn, lang);
@@ -2937,89 +3956,192 @@ int ast_say_date_pt(struct ast_channel *chan, time_t t, const char *ints, const
        return res;
 }
 
-static int say_date_with_format(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone)
+/*! \brief Hebrew syntax */
+int ast_say_date_he(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
-       if (!strcasecmp(lang, "en") ) { /* English syntax */
-               return(ast_say_date_with_format_en(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "da") ) {  /* Danish syntax */
-               return(ast_say_date_with_format_da(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "de") ) {  /* German syntax */
-               return(ast_say_date_with_format_de(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "es") || !strcasecmp(lang, "mx")) {        /* Spanish syntax */
-               return(ast_say_date_with_format_es(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "he")) {   /* Hebrew syntax */
-               return(ast_say_date_with_format_he(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "fr") ) {  /* French syntax */
-               return(ast_say_date_with_format_fr(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "it") ) {  /* Italian syntax */
-               return(ast_say_date_with_format_it(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "nl") ) {  /* Dutch syntax */
-               return(ast_say_date_with_format_nl(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "pl") ) {  /* Polish syntax */
-               return(ast_say_date_with_format_pl(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "pt") || !strcasecmp(lang, "pt_BR")) {     /* Portuguese syntax */
-               return(ast_say_date_with_format_pt(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "tw") || !strcasecmp(lang, "zh") ) {       /* Taiwanese / Chinese syntax */
-               return(ast_say_date_with_format_tw(chan, time, ints, lang, format, timezone));
-       } else if (!strcasecmp(lang, "gr") ) {  /* Greek syntax */
-               return(ast_say_date_with_format_gr(chan, time, ints, lang, format, timezone));
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
+       char fn[256];
+       int res = 0;
+       ast_localtime(&when, &tm, NULL);
+       if (!res) {
+               snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
+               res = ast_streamfile(chan, fn, lang);
+               if (!res) {
+                       res = ast_waitstream(chan, ints);
+               }
        }
+       if (!res) {
+               snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
+               res = ast_streamfile(chan, fn, lang);
+               if (!res) {
+                       res = ast_waitstream(chan, ints);
+               }
+       }
+       if (!res) {
+               res = ast_say_number(chan, tm.tm_mday, ints, lang, "m");
+       }
+       if (!res) {
+               res = ast_waitstream(chan, ints);
+       }
+       if (!res) {
+               res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, "m");
+       }
+       return res;
+}
+
+/* Icelandic syntax */
+int ast_say_date_is(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+{
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
+       char fn[256];
+       int res = 0;
+       ast_localtime(&when, &tm, NULL);
+       if (!res) {
+               snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
+               res = ast_streamfile(chan, fn, lang);
+               if (!res)
+                       res = ast_waitstream(chan, ints);
+       }
+       if (!res)
+               res = ast_say_enumeration(chan, tm.tm_mday, ints, lang, (char * ) NULL);
+       if (!res)
+               res = ast_waitstream(chan, ints);
+       if (!res) {
+               snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
+               res = ast_streamfile(chan, fn, lang);
+               if (!res)
+                       res = ast_waitstream(chan, ints);
+       }
+       if (!res) {
+               /* Year */
+               int year = tm.tm_year + 1900;
+               if (year > 1999) {      /* year 2000 and later */
+                       res = ast_say_number(chan, year, ints, lang, (char *) NULL);
+               } else {
+                       if (year < 1100) {
+                               /* I'm not going to handle 1100 and prior */
+                               /* We'll just be silent on the year, instead of bombing out. */
+                       } else {
+                           /* year 1100 to 1999. will anybody need this?!? */
+                               snprintf(fn, sizeof(fn), "digits/%d", (year / 100));
+                               res = wait_file(chan, ints, fn, lang);
+                               if (!res) {
+                                       res = wait_file(chan, ints, "digits/hundred", lang);
+                                       if (!res && year % 100 != 0) {
+                                               res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);
+                                       }
+                               }
+                       }
+               }
+       }
+       return res;
+}
+
+static int say_date_with_format(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone)
+{
+       if (!strncasecmp(lang, "en", 2)) {      /* English syntax */
+               return ast_say_date_with_format_en(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "da", 2)) { /* Danish syntax */
+               return ast_say_date_with_format_da(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "de", 2)) { /* German syntax */
+               return ast_say_date_with_format_de(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "es", 2)) { /* Spanish syntax */
+               return ast_say_date_with_format_es(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "he", 2)) { /* Hebrew syntax */
+               return ast_say_date_with_format_he(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "fr", 2)) { /* French syntax */
+               return ast_say_date_with_format_fr(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "gr", 2)) { /* Greek syntax */
+               return ast_say_date_with_format_gr(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "is", 2)) { /* Icelandic syntax */
+               return ast_say_date_with_format_is(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "ja", 2)) { /* Japanese syntax */
+               return ast_say_date_with_format_ja(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "it", 2)) { /* Italian syntax */
+               return ast_say_date_with_format_it(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "mx", 2)) { /* deprecated Mexican syntax */
+               static int deprecation_warning = 0;
+               if (deprecation_warning++ % 10 == 0) {
+                       ast_log(LOG_WARNING, "mx is not a standard language code.  Please switch to using es_MX instead.\n");
+               }
+               return ast_say_date_with_format_es(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "nl", 2)) { /* Dutch syntax */
+               return ast_say_date_with_format_nl(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "pl", 2)) { /* Polish syntax */
+               return ast_say_date_with_format_pl(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "pt", 2)) { /* Portuguese syntax */
+               return ast_say_date_with_format_pt(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "th", 2)) { /* Thai syntax */
+               return ast_say_date_with_format_th(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "tw", 2)) { /* deprecated Taiwanese syntax */
+               static int deprecation_warning = 0;
+               if (deprecation_warning++ % 10 == 0) {
+                       ast_log(LOG_WARNING, "tw is a standard language code for Twi, not Taiwanese.  Please switch to using zh_TW instead.\n");
+               }
+               return ast_say_date_with_format_zh(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "zh", 2)) { /* Taiwanese / Chinese syntax */
+               return ast_say_date_with_format_zh(chan, t, ints, lang, format, tzone);
+       } else if (!strncasecmp(lang, "vi", 2)) { /* Vietnamese syntax */
+               return ast_say_date_with_format_vi(chan, t, ints, lang, format, tzone);
+       }
+
+       /* Default to English */
+       return ast_say_date_with_format_en(chan, t, ints, lang, format, tzone);
+}
+
+/*! \brief English syntax */
+int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone)
+{
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
+       int res=0, offset, sndoffset;
+       char sndfile[256], nextmsg[256];
 
-       /* Default to English */
-       return(ast_say_date_with_format_en(chan, time, ints, lang, format, timezone));
-}
-
-/* English syntax */
-int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone)
-{
-       struct tm tm;
-       int res=0, offset, sndoffset;
-       char sndfile[256], nextmsg[256];
-
        if (format == NULL)
                format = "ABdY 'digits/at' IMp";
 
-       ast_localtime(&time,&tm,timezone);
+       ast_localtime(&when, &tm, tzone);
 
        for (offset=0 ; format[offset] != '\0' ; offset++) {
-               if (option_debug)
-                       ast_log(LOG_DEBUG, "Parsing %c (offset %d) in %s\n", format[offset], offset, format);
+               ast_debug(1, "Parsing %c (offset %d) in %s\n", format[offset], offset, format);
                switch (format[offset]) {
                        /* NOTE:  if you add more options here, please try to be consistent with strftime(3) */
                        case '\'':
                                /* Literal name of a sound file */
-                               sndoffset=0;
-                               for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++)
+                               for (sndoffset = 0; !strchr("\'\0", format[++offset]) && (sndoffset < sizeof(sndfile) - 1) ; sndoffset++) {
                                        sndfile[sndoffset] = format[offset];
+                               }
                                sndfile[sndoffset] = '\0';
-                               res = wait_file(chan,ints,sndfile,lang);
+                               res = wait_file(chan, ints, sndfile, lang);
                                break;
                        case 'A':
                        case 'a':
                                /* Sunday - Saturday */
-                               snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
-                               res = wait_file(chan,ints,nextmsg,lang);
+                               snprintf(nextmsg, sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
+                               res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'B':
                        case 'b':
                        case 'h':
                                /* January - December */
-                               snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
-                               res = wait_file(chan,ints,nextmsg,lang);
+                               snprintf(nextmsg, sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
+                               res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'm':
                                /* Month enumerated */
-                               res = ast_say_enumeration(chan, (tm.tm_mon + 1), ints, lang, (char *) NULL);    
+                               res = ast_say_enumeration(chan, (tm.tm_mon + 1), ints, lang, (char *) NULL);
                                break;
                        case 'd':
                        case 'e':
                                /* First - Thirtyfirst */
-                               res = ast_say_enumeration(chan, tm.tm_mday, ints, lang, (char *) NULL); 
+                               res = ast_say_enumeration(chan, tm.tm_mday, ints, lang, (char *) NULL);
                                break;
                        case 'Y':
                                /* Year */
                                if (tm.tm_year > 99) {
-                                       res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
+                                       res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
                                } else if (tm.tm_year < 1) {
                                        /* I'm not going to handle 1900 and prior */
                                        /* We'll just be silent on the year, instead of bombing out. */
@@ -3028,7 +4150,7 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha
                                        if (!res) {
                                                if (tm.tm_year <= 9) {
                                                        /* 1901 - 1909 */
-                                                       res = wait_file(chan,ints, "digits/oh", lang);
+                                                       res = wait_file(chan, ints, "digits/oh", lang);
                                                }
 
                                                res |= ast_say_number(chan, tm.tm_year, ints, lang, (char *) NULL);
@@ -3039,12 +4161,12 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha
                        case 'l':
                                /* 12-Hour */
                                if (tm.tm_hour == 0)
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/12");
+                                       ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
                                else if (tm.tm_hour > 12)
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
+                                       snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
                                else
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour);
-                               res = wait_file(chan,ints,nextmsg,lang);
+                                       snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
+                               res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'H':
                        case 'k':
@@ -3052,24 +4174,24 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha
                                if (format[offset] == 'H') {
                                        /* e.g. oh-eight */
                                        if (tm.tm_hour < 10) {
-                                               res = wait_file(chan,ints, "digits/oh",lang);
+                                               res = wait_file(chan, ints, "digits/oh", lang);
                                        }
                                } else {
                                        /* e.g. eight */
                                        if (tm.tm_hour == 0) {
-                                               res = wait_file(chan,ints, "digits/oh",lang);
+                                               res = wait_file(chan, ints, "digits/oh", lang);
                                        }
                                }
                                if (!res) {
                                        if (tm.tm_hour != 0) {
-                                               int remainder = tm.tm_hour;
+                                               int remaining = tm.tm_hour;
                                                if (tm.tm_hour > 20) {
-                                                       res = wait_file(chan,ints, "digits/20",lang);
-                                                       remainder -= 20;
+                                                       res = wait_file(chan, ints, "digits/20", lang);
+                                                       remaining -= 20;
                                                }
                                                if (!res) {
-                                                       snprintf(nextmsg,sizeof(nextmsg), "digits/%d", remainder);
-                                                       res = wait_file(chan,ints,nextmsg,lang);
+                                                       snprintf(nextmsg, sizeof(nextmsg), "digits/%d", remaining);
+                                                       res = wait_file(chan, ints, nextmsg, lang);
                                                }
                                        }
                                }
@@ -3084,10 +4206,10 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha
                                                res = wait_file(chan, ints, "digits/hundred", lang);
                                        }
                                } else if (tm.tm_min < 10) {
-                                       res = wait_file(chan,ints, "digits/oh",lang);
+                                       res = wait_file(chan, ints, "digits/oh", lang);
                                        if (!res) {
-                                               snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_min);
-                                               res = wait_file(chan,ints,nextmsg,lang);
+                                               snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_min);
+                                               res = wait_file(chan, ints, nextmsg, lang);
                                        }
                                } else {
                                        res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
@@ -3097,10 +4219,10 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha
                        case 'p':
                                /* AM/PM */
                                if (tm.tm_hour > 11)
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/p-m");
+                                       ast_copy_string(nextmsg, "digits/p-m", sizeof(nextmsg));
                                else
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/a-m");
-                               res = wait_file(chan,ints,nextmsg,lang);
+                                       ast_copy_string(nextmsg, "digits/a-m", sizeof(nextmsg));
+                               res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'Q':
                                /* Shorthand for "Today", "Yesterday", or ABdY */
@@ -3108,34 +4230,33 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha
                                 * language to say the date, with changes in what you say, depending
                                 * upon how recent the date is. XXX */
                                {
-                                       struct timeval now;
-                                       struct tm tmnow;
-                                       time_t beg_today, tt;
+                                       struct timeval now = ast_tvnow();
+                                       struct ast_tm tmnow;
+                                       time_t beg_today;
 
-                                       gettimeofday(&now,NULL);
-                                       tt = now.tv_sec;
-                                       ast_localtime(&tt,&tmnow,timezone);
+                                       gettimeofday(&now, NULL);
+                                       ast_localtime(&now, &tmnow, tzone);
                                        /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */
                                        /* In any case, it saves not having to do ast_mktime() */
-                                       beg_today = tt - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
-                                       if (beg_today < time) {
+                                       beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
+                                       if (beg_today < t) {
                                                /* Today */
-                                               res = wait_file(chan,ints, "digits/today",lang);
-                                       } else if (beg_today - 86400 < time) {
+                                               res = wait_file(chan, ints, "digits/today", lang);
+                                       } else if (beg_today - 86400 < t) {
                                                /* Yesterday */
-                                               res = wait_file(chan,ints, "digits/yesterday",lang);
-                                       } else if (beg_today - 86400 * 6 < time) {
+                                               res = wait_file(chan, ints, "digits/yesterday", lang);
+                                       } else if (beg_today - 86400 * 6 < t) {
                                                /* Within the last week */
-                                               res = ast_say_date_with_format_en(chan, time, ints, lang, "A", timezone);
-                                       } else if (beg_today - 2628000 < time) {
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "A", tzone);
+                                       } else if (beg_today - 2628000 < t) {
                                                /* Less than a month ago - "Sunday, October third" */
-                                               res = ast_say_date_with_format_en(chan, time, ints, lang, "ABd", timezone);
-                                       } else if (beg_today - 15768000 < time) {
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "ABd", tzone);
+                                       } else if (beg_today - 15768000 < t) {
                                                /* Less than 6 months ago - "August seventh" */
-                                               res = ast_say_date_with_format_en(chan, time, ints, lang, "Bd", timezone);
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "Bd", tzone);
                                        } else {
                                                /* More than 6 months ago - "April nineteenth two thousand three" */
-                                               res = ast_say_date_with_format_en(chan, time, ints, lang, "BdY", timezone);
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "BdY", tzone);
                                        }
                                }
                                break;
@@ -3146,55 +4267,54 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha
                                 * upon how recent the date is. XXX */
                                {
                                        struct timeval now;
-                                       struct tm tmnow;
-                                       time_t beg_today, tt;
+                                       struct ast_tm tmnow;
+                                       time_t beg_today;
 
-                                       gettimeofday(&now,NULL);
-                                       tt = now.tv_sec;
-                                       ast_localtime(&tt,&tmnow,timezone);
+                                       now = ast_tvnow();
+                                       ast_localtime(&now, &tmnow, tzone);
                                        /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */
                                        /* In any case, it saves not having to do ast_mktime() */
-                                       beg_today = tt - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
-                                       if (beg_today < time) {
+                                       beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
+                                       if (beg_today < t) {
                                                /* Today */
-                                       } else if ((beg_today - 86400) < time) {
+                                       } else if ((beg_today - 86400) < t) {
                                                /* Yesterday */
-                                               res = wait_file(chan,ints, "digits/yesterday",lang);
-                                       } else if (beg_today - 86400 * 6 < time) {
+                                               res = wait_file(chan, ints, "digits/yesterday", lang);
+                                       } else if (beg_today - 86400 * 6 < t) {
                                                /* Within the last week */
-                                               res = ast_say_date_with_format_en(chan, time, ints, lang, "A", timezone);
-                                       } else if (beg_today - 2628000 < time) {
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "A", tzone);
+                                       } else if (beg_today - 2628000 < t) {
                                                /* Less than a month ago - "Sunday, October third" */
-                                               res = ast_say_date_with_format_en(chan, time, ints, lang, "ABd", timezone);
-                                       } else if (beg_today - 15768000 < time) {
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "ABd", tzone);
+                                       } else if (beg_today - 15768000 < t) {
                                                /* Less than 6 months ago - "August seventh" */
-                                               res = ast_say_date_with_format_en(chan, time, ints, lang, "Bd", timezone);
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "Bd", tzone);
                                        } else {
                                                /* More than 6 months ago - "April nineteenth two thousand three" */
-                                               res = ast_say_date_with_format_en(chan, time, ints, lang, "BdY", timezone);
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "BdY", tzone);
                                        }
                                }
                                break;
                        case 'R':
-                               res = ast_say_date_with_format_en(chan, time, ints, lang, "HM", timezone);
+                               res = ast_say_date_with_format_en(chan, t, ints, lang, "HM", tzone);
                                break;
                        case 'S':
                                /* Seconds */
                                if (tm.tm_sec == 0) {
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
-                                       res = wait_file(chan,ints,nextmsg,lang);
+                                       snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_sec);
+                                       res = wait_file(chan, ints, nextmsg, lang);
                                } else if (tm.tm_sec < 10) {
-                                       res = wait_file(chan,ints, "digits/oh",lang);
+                                       res = wait_file(chan, ints, "digits/oh", lang);
                                        if (!res) {
-                                               snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
-                                               res = wait_file(chan,ints,nextmsg,lang);
+                                               snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_sec);
+                                               res = wait_file(chan, ints, nextmsg, lang);
                                        }
                                } else {
                                        res = ast_say_number(chan, tm.tm_sec, ints, lang, (char *) NULL);
                                }
                                break;
                        case 'T':
-                               res = ast_say_date_with_format_en(chan, time, ints, lang, "HMS", timezone);
+                               res = ast_say_date_with_format_en(chan, t, ints, lang, "HMS", tzone);
                                break;
                        case ' ':
                        case '  ':
@@ -3212,59 +4332,65 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha
        return res;
 }
 
-/* Danish syntax */
-int ast_say_date_with_format_da(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone)
+static char next_item(const char *format)
+{
+       const char *next = ast_skip_blanks(format);
+       return *next;
+}
+
+/*! \brief Danish syntax */
+int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char *ints, const char *lang, const char *format, const char *tzone)
 {
-       struct tm tm;
+       struct timeval when = { t, 0 };
+       struct ast_tm tm;
        int res=0, offset, sndoffset;
        char sndfile[256], nextmsg[256];
 
        if (!format)
                format = "A dBY HMS";
 
-       ast_localtime(&time,&tm,timezone);
+       ast_localtime(&when, &tm, tzone);
 
        for (offset=0 ; format[offset] != '\0' ; offset++) {
-               if (option_debug)
-                       ast_log(LOG_DEBUG, "Parsing %c (offset %d) in %s\n", format[offset], offset, format);
+               ast_debug(1, "Parsing %c (offset %d) in %s\n", format[offset], offset, format);
                switch (format[offset]) {
                        /* NOTE:  if you add more options here, please try to be consistent with strftime(3) */
                        case '\'':
                                /* Literal name of a sound file */
-                               sndoffset=0;
-                               for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++)
+                               for (sndoffset = 0; !strchr("\'\0", format[++offset]) && (sndoffset < sizeof(sndfile) - 1) ; sndoffset++) {
                                        sndfile[sndoffset] = format[offset];
+                               }
                                sndfile[sndoffset] = '\0';
-                               res = wait_file(chan,ints,sndfile,lang);
+                               res = wait_file(chan, ints, sndfile, lang);
                                break;
                        case 'A':
                        case 'a':
                                /* Sunday - Saturday */
-                               snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
-                               res = wait_file(chan,ints,nextmsg,lang);
+                               snprintf(nextmsg, sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
+                               res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'B':
                        case 'b':
                        case 'h':
                                /* January - December */
-                               snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
-                               res = wait_file(chan,ints,nextmsg,lang);
+                               snprintf(nextmsg, sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
+                               res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'm':
                                /* Month enumerated */
-                               res = ast_say_enumeration(chan, (tm.tm_mon + 1), ints, lang, "m");      
+                               res = ast_say_enumeration(chan, (tm.tm_mon + 1), ints, lang, "m");
                                break;
                        case 'd':
                        case 'e':
                                /* First - Thirtyfirst */
-                               res = ast_say_enumeration(chan, tm.tm_mday, ints, lang, "m");   
+                               res = ast_say_enumeration(chan, tm.tm_mday, ints, lang, "m");
                                break;
                        case 'Y':
                                /* Year */
                                {
                                        int year = tm.tm_year + 1900;
                                        if (year > 1999) {      /* year 2000 and later */
-                                               res = ast_say_number(chan, year, ints, lang, (char *) NULL);    
+                                               res = ast_say_number(chan, year, ints, lang, (char *) NULL);
                                        } else {
                                                if (year < 1100) {
                                                        /* I'm not going to handle 1100 and prior */
@@ -3272,12 +4398,12 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t time, const cha
                                                } else {
                                                    /* year 1100 to 1999. will anybody need this?!? */
                                                    /* say 1967 as 'nineteen hundred seven and sixty' */
-                                                       snprintf(nextmsg,sizeof(nextmsg), "digits/%d", (year / 100) );
-                                                       res = wait_file(chan,ints,nextmsg,lang);
+                                                       snprintf(nextmsg, sizeof(nextmsg), "digits/%d", (year / 100) );
+                                                       res = wait_file(chan, ints, nextmsg, lang);
                                                        if (!res) {
-                                                               res = wait_file(chan,ints, "digits/hundred",lang);
+                                                               res = wait_file(chan, ints, "digits/hundred", lang);
                                                                if (!res && year % 100 != 0) {
-                                                                       res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);    
+                                                                       res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);
                                                                }
                                                        }
                                                }
@@ -3287,37 +4413,37 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t time, const cha
                        case 'I':
                        case 'l':
                                /* 12-Hour */
-                               res = wait_file(chan,ints,"digits/oclock",lang);
+                               res = wait_file(chan, ints, "digits/oclock", lang);
                                if (tm.tm_hour == 0)
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/12");
+                                       ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
                                else if (tm.tm_hour > 12)
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
+                                       snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
                                else
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour);
+                                       snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
                                if (!res) {
-                                       res = wait_file(chan,ints,nextmsg,lang);
+                                       res = wait_file(chan, ints, nextmsg, lang);
                                }
                                break;
                        case 'H':
-                               /* 24-Hour, single digit hours preceeded by "oh" (0) */
+                               /* 24-Hour, single digit hours preceded by "oh" (0) */
                                if (tm.tm_hour < 10 && tm.tm_hour > 0) {
-                                       res = wait_file(chan,ints, "digits/0",lang);
+                                       res = wait_file(chan, ints, "digits/0", lang);
                                }
                                /* FALLTRHU */
                        case 'k':
                                /* 24-Hour */
-                               res = ast_say_number(chan, tm.tm_hour, ints, lang, (char *) NULL);      
+                               res = ast_say_number(chan, tm.tm_hour, ints, lang, (char *) NULL);
                                break;
                        case 'M':
                                /* Minute */
-                               if (tm.tm_min > 0 || format[offset+ 1 ] == 'S' ) { /* zero 'digits/0' only if seconds follow (kind of a hack) */
-                                       res = ast_say_number(chan, tm.tm_min, ints, lang, "f"); 
+                               if (tm.tm_min > 0 || next_item(&format[offset + 1]) == 'S') { /* zero 'digits/0' only if seconds follow */
+                                       res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
                                }
-                               if ( !res && format[offset + 1] == 'S' ) { /* minutes only if seconds follow (kind of a hack) */
+                               if (!res && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */
                                        if (tm.tm_min == 1) {
-                                               res = wait_file(chan,ints,"digits/minute",lang);
+                                               res = wait_file(chan, ints, "minute", lang);
                                        } else {
-                                               res = wait_file(chan,ints,"digits/minutes",lang);
+                                               res = wait_file(chan, ints, "minutes", lang);
                                        }
                                }
                                break;
@@ -3325,10 +4451,10 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t time, const cha
                        case 'p':
                                /* AM/PM */
                                if (tm.tm_hour > 11)
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/p-m");
+                                       ast_copy_string(nextmsg, "digits/p-m", sizeof(nextmsg));
                                else
-                                       snprintf(nextmsg,sizeof(nextmsg), "digits/a-m");
-                               res = wait_file(chan,ints,nextmsg,lang);
+                                       ast_copy_string(nextmsg, "digits/a-m", sizeof(nextmsg));
+                               res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'Q':
                                /* Shorthand for "Today", "Yesterday", or AdBY */
@@ -3336,24 +4462,22 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t time, const cha
                                 * language to say the date, with changes in what you say, depending
                                 * upon how recent the date is. XXX */
                                {
-                                       struct timeval now;
-                                       struct tm tmnow;
-                                       time_t beg_today, tt;
+                                       struct timeval now = ast_tvnow();
+                                       struct ast_tm tmnow;
+                                       time_t beg_today;
 
-                                       gettimeofday(&now,NULL);
-                                       tt = now.tv_sec;
-                                       ast_localtime(&tt,&tmnow,timezone);
+                                       ast_localtime(&now, &tmnow, tzone);
                                        /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */
                                        /* In any case, it saves not having to do ast_mktime() */
-                                       beg_today = tt - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
-                                       if (beg_today < time) {
+                                       beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
+                                       if (beg_today < t) {
                                                /* Today */
-                                               res = wait_file(chan,ints, "digits/today",lang);
-                                       } else if (beg_today - 86400 < time) {
+                                               res = wait_file(chan, ints, "digits/today", lang);
+                                       } else if (beg_today - 86400 < t) {
                                                /* Yesterday */
-                                               res = wait_file(chan,ints, "digits/yesterday",lang);
+                                               res = wait_file(chan, ints, "digits/yesterday", lang);
                                        } else {
-                                               res = ast_say_date_with_format_da(chan, time, ints, lang, "AdBY", timezone);
+                                               res = ast_say_date_with_format_da(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
@@ -3363,44 +4487,42 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t time, const cha
                                 * language to say the date, with changes in what you say, depending
                                 * upon how recent the date is. XXX */
                                {
-                                       struct timeval now;
-                                       struct tm tmnow;
-                                       time_t beg_today, tt;
+                                       struct timeval now = ast_tvnow();
+                                       struct ast_tm tmnow;
+                                       time_t beg_today;
 
-                                       gettimeofday(&now,NULL);
-                                       tt = now.tv_sec;
-                                       ast_localtime(&tt,&tmnow,timezone);
+                                       ast_localtime(&now, &tmnow, tzone);
                                        /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */
                                        /* In any case, it saves not having to do ast_mktime() */
-                                       beg_today = tt - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
-                                       if (beg_today < time) {
+                                       beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
+                                       if (beg_today < t) {
                                                /* Today */
-                                       } else if ((beg_today - 86400) < time) {
+                                       } else if ((beg_today - 86400) < t) {
                                                /* Yesterday */
-                                               res = wait_file(chan,ints, "digits/yesterday",lang);
-                                       } else if (beg_today - 86400 * 6 < time) {
+                                               res = wait_file(chan, ints, "digits/yesterday", lang);
+                                       } else if (beg_today - 86400 * 6 < t) {
                                                /* Within the last week */
-                                               res = ast_say_date_with_format_da(chan, time, ints, lang, "A", timezone);
+                                               res = ast_say_date_with_format_da(chan, t, ints, lang, "A", tzone);
                                        } else {
-                                               res = ast_say_date_with_format_da(chan, time, ints, lang, "AdBY", timezone);
+                                               res = ast_say_date_with_format_da(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
                        case 'R':
-                               res = ast_say_date_with_format_da(chan, time, ints, lang, "HM", time