json: Add conditionals to avoid locking if Jansson is thread safe.
[asterisk/asterisk.git] / main / say.c
index 3faf01b..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).
+ *                                             Next Generation Networks (NGN).
  * \note 2007-03-20 : Support for Thai added by Dome C. <dome@tel.co.th>,
- *                                             IP Crossing Co., Ltd.
+ *                                             IP Crossing Co., Ltd.
  */
 
-#include "asterisk.h"
+/*** MODULEINFO
+       <support_level>core</support_level>
+ ***/
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "asterisk.h"
 
 #include <netinet/in.h>
 #include <time.h>
@@ -51,18 +53,21 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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[10], asciibuf[20] = "letters/ascii";
        char ltr;
        int num = 0;
        int res = 0;
+       int upper = 0;
+       int lower = 0;
 
        while (str[num] && !res) {
                fn = NULL;
@@ -116,9 +121,35 @@ 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;
                }
                if ((fn && ast_fileexists(fn, NULL, lang) > 0) ||
@@ -132,6 +163,9 @@ static int say_character_str_full(struct ast_channel *chan, const char *str, con
                        }
                        ast_stopstream(chan);
                }
+               if (upper || lower) {
+                       continue;
+               }
                num++;
        }
 
@@ -281,10 +315,11 @@ 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
@@ -298,7 +333,7 @@ static int say_digit_str_full(struct ast_channel *chan, const char *str, const c
  \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
@@ -337,6 +372,7 @@ static int ast_say_number_full_en_GB(struct ast_channel *chan, int num, const ch
 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);
@@ -345,6 +381,7 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
 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_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);
@@ -357,6 +394,7 @@ static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const
 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 */
@@ -367,10 +405,12 @@ 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_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);
@@ -378,12 +418,14 @@ static int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const
 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);
 
@@ -395,6 +437,7 @@ static int ast_say_time_pt(struct ast_channel *chan, time_t t, const char *ints,
 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_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);
@@ -408,6 +451,7 @@ static int ast_say_datetime_pt(struct ast_channel *chan, time_t t, const char *i
 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_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);
@@ -419,20 +463,23 @@ static int ast_say_datetime_from_now_pt(struct ast_channel *chan, time_t t, cons
 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 
+/*! \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)
 {
+       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 */
@@ -461,10 +508,14 @@ static int say_number_full(struct ast_channel *chan, int num, const char *ints,
                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 */
@@ -507,14 +558,14 @@ static int say_number_full(struct ast_channel *chan, int num, const char *ints,
        return ast_say_number_full_en(chan, num, ints, language, audiofd, ctrlfd);
 }
 
-/*! \brief  ast_say_number_full_en: English syntax 
+/*! \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) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        while (!res && (num || playh)) {
@@ -524,7 +575,7 @@ static int ast_say_number_full_en(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
                        ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
@@ -581,24 +632,24 @@ static int exp10_int(int power)
        return res;
 }
 
-/*! \brief  ast_say_number_full_cs: Czech syntax 
+/*! \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 
- * 
+ *
+ * - 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
@@ -608,18 +659,18 @@ static int ast_say_number_full_cs(struct ast_channel *chan, int num, const char
        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) 
+
+       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));
@@ -627,7 +678,7 @@ static int ast_say_number_full_cs(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (num < 3 ) {
                        snprintf(fn, sizeof(fn), "digits/%d%c", num, options[0]);
                        playh = 0;
@@ -649,7 +700,7 @@ static int ast_say_number_full_cs(struct ast_channel *chan, int num, const char
                                res = ast_say_number_full_cs(chan, hundered, ints, language, options, audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               if (hundered == 3 || hundered == 4) {   
+                               if (hundered == 3 || hundered == 4) {
                                        ast_copy_string(fn, "digits/sta", sizeof(fn));
                                } else if ( hundered > 4 ) {
                                        ast_copy_string(fn, "digits/set", sizeof(fn));
@@ -657,12 +708,12 @@ static int ast_say_number_full_cs(struct ast_channel *chan, int num, const char
                        }
                        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;
@@ -671,11 +722,11 @@ static int ast_say_number_full_cs(struct ast_channel *chan, int num, const char
                        }
                        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) 
+                               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);
                        } else { /* left == 1 */
@@ -694,12 +745,12 @@ static int ast_say_number_full_cs(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" 
+ - 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)
 {
@@ -708,7 +759,7 @@ 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) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        if (options && !strncasecmp(options, "n", 1)) cn = -1;
@@ -730,7 +781,7 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
                        ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
@@ -794,9 +845,9 @@ 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 ((audiofd > -1) && (ctrlfd > -1))
                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
-                               else  
+                               else
                                        res = ast_waitstream(chan, ints);
                        }
                        ast_stopstream(chan);
@@ -805,12 +856,12 @@ 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 
+/*! \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" 
+ - "1-and" through "9-and"
  - "1F" (eine)
  - "1N" (ein)
  - NB "1" is recorded as 'eins'
@@ -821,7 +872,7 @@ 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) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        if (options && (!strncasecmp(options, "f", 1)))
@@ -837,6 +888,9 @@ 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) {
                        ast_copy_string(fn, "digits/minus", sizeof(fn));
@@ -844,10 +898,7 @@ static int ast_say_number_full_de(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
-               } else if (num < 100 && t) {
-                       ast_copy_string(fn, "digits/and", sizeof(fn));
-                       t = 0;
+                       }
                } else if (num == 1 && mf == -1) {
                        snprintf(fn, sizeof(fn), "digits/%dF", num);
                        num = 0;
@@ -875,11 +926,10 @@ static int ast_say_number_full_de(struct ast_channel *chan, int num, const char
                                snprintf(fn, sizeof(fn), "digits/%d", hundreds);
                        }
                        ast_copy_string(fna, "digits/hundred", sizeof(fna));
-                       t = 1;
                } else if (num == 1000 && t == 0) {
                        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;
@@ -925,9 +975,9 @@ static int ast_say_number_full_de(struct ast_channel *chan, int num, const char
                }
                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);
@@ -946,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 syntax 
+/*! \brief  ast_say_number_full_en_GB: British syntax
  New files:
-  - In addition to American English, the following sounds are required:  "and"
+  - 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)
 {
@@ -956,7 +1006,7 @@ 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) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        while (!res && (num || playh || playa )) {
@@ -966,12 +1016,12 @@ static int ast_say_number_full_en_GB(struct ast_channel *chan, int num, const ch
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
                        ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
                } else if (playa) {
-                       ast_copy_string(fn, "digits/and", sizeof(fn));
+                       ast_copy_string(fn, "vm-and", sizeof(fn));
                        playa = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
@@ -987,7 +1037,7 @@ 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;
@@ -995,7 +1045,7 @@ static int ast_say_number_full_en_GB(struct ast_channel *chan, int num, const ch
                        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)
@@ -1008,12 +1058,12 @@ static int ast_say_number_full_en_GB(struct ast_channel *chan, int num, const ch
                                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);
@@ -1022,12 +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 
+/*! \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)
 {
@@ -1035,7 +1085,7 @@ 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) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        if (options) {
@@ -1052,7 +1102,7 @@ static int ast_say_number_full_es(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playa) {
                        ast_copy_string(fn, "digits/and", sizeof(fn));
                        playa = 0;
@@ -1061,7 +1111,7 @@ static int ast_say_number_full_es(struct ast_channel *chan, int num, const char
                                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) {
@@ -1124,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' */
+       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;
@@ -1140,9 +1190,9 @@ 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) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
-       
+
        if (options && !strncasecmp(options, "f", 1))
                mf = -1;
 
@@ -1153,7 +1203,7 @@ static int ast_say_number_full_fr(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
                        ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
@@ -1234,7 +1284,7 @@ static int ast_say_number_full_he(struct ast_channel *chan, int num, const char
 
        char fn[SAY_NUM_BUF_SIZE] = "";
 
-       ast_verbose(VERBOSE_PREFIX_3 "ast_say_digits_full: started. num: %d, options=\"%s\"\n", num, options);
+       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);
@@ -1242,7 +1292,7 @@ static int ast_say_number_full_he(struct ast_channel *chan, int num, const char
        if (options && !strncasecmp(options, "m", 1)) {
                mf = 1;
        }
-       ast_verbose(VERBOSE_PREFIX_3 "ast_say_digits_full: num: %d, state=%d, options=\"%s\", mf=%d\n", num, state, options, mf);
+       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))) {
@@ -1253,7 +1303,7 @@ static int ast_say_number_full_he(struct ast_channel *chan, int num, const char
                 * 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, tmpnum=%d\n", num, state, options, mf, tmpnum);
+               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;
@@ -1391,7 +1441,7 @@ static int ast_say_number_full_he(struct ast_channel *chan, int num, const char
        return res;
 }
 
-/*! \brief  ast_say_number_full_hu: Hungarian syntax 
+/*! \brief  ast_say_number_full_hu: Hungarian syntax
 
   Extra sounds needed:
        10en: "tizen"
@@ -1402,7 +1452,7 @@ static int ast_say_number_full_hu(struct ast_channel *chan, int num, const char
        int res = 0;
        int playh = 0;
        char fn[256] = "";
-       if (!num) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        /*
@@ -1418,7 +1468,7 @@ static int ast_say_number_full_hu(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
                        ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
@@ -1473,6 +1523,129 @@ static int ast_say_number_full_hu(struct ast_channel *chan, int num, const char
        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)
 {
@@ -1488,7 +1661,7 @@ static int ast_say_number_full_it(struct ast_channel *chan, int num, const char
                Italian support
 
                Like english, numbers up to 20 are a single 'word', and others
-               compound, but with exceptions.
+               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)
@@ -1497,10 +1670,10 @@ static int ast_say_number_full_it(struct ast_channel *chan, int num, const char
                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 
+               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,
@@ -1515,7 +1688,7 @@ static int ast_say_number_full_it(struct ast_channel *chan, int num, const char
                                        num = -num;
                                } else {
                                        num = 0;
-                               }       
+                               }
                        } else if (playh) {
                                ast_copy_string(fn, "digits/hundred", sizeof(fn));
                                playh = 0;
@@ -1626,7 +1799,7 @@ 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 
+/*! \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)
@@ -1635,7 +1808,7 @@ 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) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
        while (!res && (num || playh )) {
                if (num < 0) {
@@ -1644,7 +1817,7 @@ static int ast_say_number_full_nl(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
                        ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
@@ -1717,7 +1890,7 @@ 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 
+/*! \brief  ast_say_number_full_no: Norwegian syntax
  * New files:
  * In addition to American English, the following sounds are required:  "and", "1N"
  *
@@ -1734,10 +1907,10 @@ 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) 
+
+       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 )) {
@@ -1747,7 +1920,7 @@ static int ast_say_number_full_no(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
                        ast_copy_string(fn, "digits/hundred", sizeof(fn));
                        playh = 0;
@@ -1774,7 +1947,7 @@ 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;
@@ -1782,7 +1955,7 @@ static int ast_say_number_full_no(struct ast_channel *chan, int num, const char
                        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)
@@ -1795,12 +1968,12 @@ static int ast_say_number_full_no(struct ast_channel *chan, int num, const char
                                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);
@@ -1809,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;
 
@@ -1823,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)
@@ -1835,12 +2008,12 @@ 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);
        ast_debug(1, "Trying to play: %s\n", file_name);
@@ -1864,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) {
@@ -1890,39 +2063,39 @@ 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 
+/* ast_say_number_full_pl: Polish syntax
 
 Sounds needed:
 0              zero
@@ -2040,14 +2213,14 @@ static int ast_say_number_full_pl(struct ast_channel *chan, int num, const char
 
        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 = ast_malloc(sizeof(*odmiana_nieosobowa));
@@ -2102,13 +2275,13 @@ static int ast_say_number_full_pl(struct ast_channel *chan, int num, const char
        return 0;
 }
 
-/* ast_say_number_full_pt: Portuguese syntax 
+/* ast_say_number_full_pt: Portuguese syntax
 
- *     Extra sounds needed:
- *     For feminin all sound files ends with F
+ *     Extra sounds needed:
+ *     For feminin all sound files ends with F
  *     100E for 100+ something
  *     1000000S for plural
- *     pt-e for 'and' 
+ *     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)
 {
@@ -2117,7 +2290,7 @@ 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) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        if (options && !strncasecmp(options, "f", 1))
@@ -2130,7 +2303,7 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (num < 20) {
                        if ((num == 1 || num == 2) && (mf < 0))
                                snprintf(fn, sizeof(fn), "digits/%dF", num);
@@ -2174,7 +2347,7 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, const char
                                ast_copy_string(fn, "digits/1000000", sizeof(fn));
                        else
                                ast_copy_string(fn, "digits/1000000S", sizeof(fn));
+
                        if ((num % 1000000) &&
                                /* no thousands */
                                ((!((num / 1000) % 1000) && ((num % 1000) < 100 || !(num % 100))) ||
@@ -2190,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);
                        }
@@ -2205,7 +2378,7 @@ 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
@@ -2239,7 +2412,7 @@ static int ast_say_number_full_se(struct ast_channel *chan, int num, const char
                        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));
+                       ast_copy_string(fn, "digits/1N", sizeof(fn));
                        num = 0;
                } else if (num < 20) {
                        snprintf(fn, sizeof(fn), "digits/%d", num);
@@ -2269,7 +2442,7 @@ static int ast_say_number_full_se(struct ast_channel *chan, int num, const char
                        num %= 1000000;
                        ast_copy_string(fn, "digits/million", sizeof(fn));
                } else {        /* Miljarder - Billions */
-                       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);
                        return -1;
                }
 
@@ -2309,7 +2482,7 @@ static int ast_say_number_full_zh(struct ast_channel *chan, int num, const char
                                        num = -num;
                                } else {
                                        num = 0;
-                               }       
+                               }
                        } else if (playz) {
                                snprintf(fn, sizeof(fn), "digits/0");
                                last_length = 0;
@@ -2350,7 +2523,7 @@ static int ast_say_number_full_zh(struct ast_channel *chan, int num, const char
                                        snprintf(fn, sizeof(fn), "digits/%d", (num / 100));
                                        playh++;
                                        snprintf(buf, 10, "%d", num);
-                                       ast_log(LOG_DEBUG, "Number '%d' %d %d\n", num, (int)strlen(buf), last_length);
+                                       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){
@@ -2358,7 +2531,7 @@ static int ast_say_number_full_zh(struct ast_channel *chan, int num, const char
                                        snprintf(fn, sizeof(fn), "digits/%d", (num / 1000));
                                        playt++;
                                        snprintf(buf, 10, "%d", num);
-                                       ast_log(LOG_DEBUG, "Number '%d' %d %d\n", num, (int)strlen(buf), last_length);
+                                       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 */
@@ -2366,7 +2539,7 @@ static int ast_say_number_full_zh(struct ast_channel *chan, int num, const char
                                                if (res)
                                                        return res;
                                                snprintf(buf, 10, "%d", num);
-                                               ast_log(LOG_DEBUG, "Number '%d' %d %d\n", num, (int)strlen(buf), last_length);
+                                               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");
@@ -2376,7 +2549,7 @@ static int ast_say_number_full_zh(struct ast_channel *chan, int num, const char
                                                if (res)
                                                        return res;
                                                snprintf(buf, 10, "%d", num);
-                                               ast_log(LOG_DEBUG, "Number '%d' %d %d\n", num, (int)strlen(buf), last_length);
+                                               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");
@@ -2443,7 +2616,7 @@ static int ast_say_number_full_ur(struct ast_channel *chan, int num, const char
                        num = num % 10000000;
                        snprintf(fn, sizeof(fn), "digits/crore");
                } else {
-                       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;
                }
 
@@ -2474,7 +2647,7 @@ static int get_lastdigits_ru(int num) {
 }
 
 
-/*! \brief  ast_say_number_full_ru: Russian syntax 
+/*! \brief  ast_say_number_full_ru: Russian syntax
 
  additional files:
        n00.gsm                 (one hundred, two hundred, ...)
@@ -2494,7 +2667,7 @@ 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) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        while (!res && (num)) {
@@ -2504,7 +2677,7 @@ static int ast_say_number_full_ru(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else  if (num < 20) {
                        if (options && strlen(options) == 1 && num < 3) {
                            snprintf(fn, sizeof(fn), "digits/%d%s", num, options);
@@ -2536,7 +2709,7 @@ static int ast_say_number_full_ru(struct ast_channel *chan, int num, const char
                                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);
@@ -2573,7 +2746,7 @@ static int ast_say_number_full_th(struct ast_channel *chan, int num, const char
        int res = 0;
        int playh = 0;
        char fn[256] = "";
-       if (!num) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        while(!res && (num || playh)) {
@@ -2583,7 +2756,7 @@ static int ast_say_number_full_th(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playh) {
                        ast_copy_string(fn, "digits/roi", sizeof(fn));
                        playh = 0;
@@ -2647,7 +2820,7 @@ static int ast_say_number_full_vi(struct ast_channel *chan, int num, const char
        int playz = 0;
        int playl = 0;
        char fn[256] = "";
-       if (!num) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
        while (!res && (num || playh)) {
                if (num < 0) {
@@ -2656,7 +2829,7 @@ static int ast_say_number_full_vi(struct ast_channel *chan, int num, const char
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (playl) {
                        snprintf(fn, sizeof(fn), "digits/%da", num);
                        playl = 0;
@@ -2666,7 +2839,7 @@ static int ast_say_number_full_vi(struct ast_channel *chan, int num, const char
                        playh = 0;
                } else if (playz) {
                        ast_copy_string(fn, "digits/odd", sizeof(fn));
-                       playz = 0;                      
+                       playz = 0;
                } else if (playoh) {
                        ast_copy_string(fn, "digits/0-hundred", sizeof(fn));
                        playoh = 0;
@@ -2682,7 +2855,7 @@ static int ast_say_number_full_vi(struct ast_channel *chan, int num, const char
                        if ((num == 5) || (num == 4) || (num == 1)) playl++;
                } else {
                        if (num < 1000) {
-                               snprintf(fn, sizeof(fn), "digits/%d", (num/100));                               
+                               snprintf(fn, sizeof(fn), "digits/%d", (num/100));
                                num %= 100;
                                if (num && (num < 10)) {
                                        playz++;
@@ -2732,7 +2905,7 @@ static int ast_say_number_full_vi(struct ast_channel *chan, int num, const char
        return res;
 }
 
-/*! \brief  ast_say_enumeration_full: call language-specific functions 
+/*! \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)
 {
@@ -2744,6 +2917,8 @@ static int say_enumeration_full(struct ast_channel *chan, int num, const char *i
           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);
        }
@@ -2752,13 +2927,13 @@ static int say_enumeration_full(struct ast_channel *chan, int num, const char *i
        return ast_say_enumeration_full_en(chan, num, ints, language, audiofd, ctrlfd);
 }
 
-/*! \brief  ast_say_enumeration_full_en: English syntax 
+/*! \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) {
                if (num < 0) {
                        ast_copy_string(fn, "digits/minus", sizeof(fn)); /* kind of senseless for enumerations, but our best effort for error checking */
@@ -2766,11 +2941,11 @@ static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const
                                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) {
@@ -2783,7 +2958,7 @@ 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) {
@@ -2799,7 +2974,7 @@ static int ast_say_enumeration_full_en(struct ast_channel *chan, int num, const
                        }
                        if (res)
                                return res;
-                       if (num) {                                      
+                       if (num) {
                                ast_copy_string(fn, "digits/thousand", sizeof(fn));
                        } else {
                                ast_copy_string(fn, "digits/h-thousand", sizeof(fn));
@@ -2812,7 +2987,7 @@ 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) {                                      
+                       if (num) {
                                ast_copy_string(fn, "digits/million", sizeof(fn));
                        } else {
                                ast_copy_string(fn, "digits/h-million", sizeof(fn));
@@ -2824,7 +2999,7 @@ 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) {                                      
+                       if (num) {
                                ast_copy_string(fn, "digits/billion", sizeof(fn));
                        } else {
                                ast_copy_string(fn, "digits/h-billion", sizeof(fn));
@@ -2886,7 +3061,7 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                gender = "";
        }
 
-       if (!num) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        while (!res && num) {
@@ -2896,7 +3071,7 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (num < 100 && t) {
                        ast_copy_string(fn, "digits/and", sizeof(fn));
                        t = 0;
@@ -2923,17 +3098,17 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                        } else {
                                snprintf(fn, sizeof(fn), "digits/%d", hundreds);
                        }
-                       if (num) {                                      
+                       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) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/1N", sizeof(fn));
                                        ast_copy_string(fna, "digits/thousand", sizeof(fna));
                                } else {
@@ -2949,7 +3124,7 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                                if (res) {
                                        return res;
                                }
-                               if (num) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/thousand", sizeof(fn));
                                } else {
                                        snprintf(fn, sizeof(fn), "digits/h-thousand%s", gender);
@@ -2960,7 +3135,7 @@ 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) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/1F", sizeof(fn));
                                        ast_copy_string(fna, "digits/million", sizeof(fna));
                                } else {
@@ -2972,7 +3147,7 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                                if (res) {
                                        return res;
                                }
-                               if (num) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/millions", sizeof(fn));
                                } else {
                                        snprintf(fn, sizeof(fn), "digits/h-million%s", gender);
@@ -2983,7 +3158,7 @@ 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) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/1F", sizeof(fn));
                                        ast_copy_string(fna, "digits/milliard", sizeof(fna));
                                } else {
@@ -2994,7 +3169,7 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
                                res = ast_say_number_full_de(chan, billions, ints, language, options, audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               if (num) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/milliards", sizeof(fna));
                                } else {
                                        snprintf(fn, sizeof(fna), "digits/h-milliard%s", gender);
@@ -3011,9 +3186,9 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
 
                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);
@@ -3049,7 +3224,7 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                gender = "";
        }
 
-       if (!num) 
+       if (!num)
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
        while (!res && num) {
@@ -3059,7 +3234,7 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                                num = -num;
                        } else {
                                num = 0;
-                       }       
+                       }
                } else if (num < 100 && t) {
                        ast_copy_string(fn, "digits/and", sizeof(fn));
                        t = 0;
@@ -3086,17 +3261,17 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                        } else {
                                snprintf(fn, sizeof(fn), "digits/%d", hundreds);
                        }
-                       if (num) {                                      
+                       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) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/1N", sizeof(fn));
                                        ast_copy_string(fna, "digits/thousand", sizeof(fna));
                                } else {
@@ -3112,7 +3287,7 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                                if (res) {
                                        return res;
                                }
-                               if (num) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/thousand", sizeof(fn));
                                } else {
                                        snprintf(fn, sizeof(fn), "digits/h-thousand%s", gender);
@@ -3123,7 +3298,7 @@ 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) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/1F", sizeof(fn));
                                        ast_copy_string(fna, "digits/million", sizeof(fna));
                                } else {
@@ -3135,7 +3310,7 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                                if (res) {
                                        return res;
                                }
-                               if (num) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/millions", sizeof(fn));
                                } else {
                                        snprintf(fn, sizeof(fn), "digits/h-million%s", gender);
@@ -3146,7 +3321,7 @@ 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) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/1F", sizeof(fn));
                                        ast_copy_string(fna, "digits/milliard", sizeof(fna));
                                } else {
@@ -3157,7 +3332,7 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
                                res = ast_say_number_full_de(chan, billions, ints, language, options, audiofd, ctrlfd);
                                if (res)
                                        return res;
-                               if (num) {                                      
+                               if (num) {
                                        ast_copy_string(fn, "digits/milliards", sizeof(fna));
                                } else {
                                        snprintf(fn, sizeof(fna), "digits/h-milliard%s", gender);
@@ -3174,9 +3349,9 @@ static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const
 
                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);
@@ -3201,13 +3376,13 @@ static int ast_say_enumeration_full_he(struct ast_channel *chan, int num, const
        int res = 0;
        char fn[256] = "";
        int mf = -1;                            /* +1 = Masculin; -1 = Feminin */
-       ast_verbose(VERBOSE_PREFIX_3 "ast_say_digits_full: started. num: %d, options=\"%s\"\n", num, options);
+       ast_verb(3, "ast_say_digits_full: started. num: %d, options=\"%s\"\n", num, options);
 
        if (options && !strncasecmp(options, "m", 1)) {
                mf = -1;
        }
 
-       ast_verbose(VERBOSE_PREFIX_3 "ast_say_digits_full: num: %d, options=\"%s\", mf=%d\n", num, options, mf);
+       ast_verb(3, "ast_say_digits_full: num: %d, options=\"%s\", mf=%d\n", num, options, mf);
 
        while (!res && num) {
                if (num < 0) {
@@ -3267,7 +3442,7 @@ static int ast_say_enumeration_full_he(struct ast_channel *chan, int num, const
                        snprintf(fn, sizeof(fn), "digits/1m");
                        num = num % 1000000;
                } else {
-                       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) {
@@ -3284,43 +3459,223 @@ static int ast_say_enumeration_full_he(struct ast_channel *chan, int num, const
        return res;
 }
 
-static int say_date(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+/*! \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)
 {
-       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, "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, "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);
+       /* 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 = "";
        }
 
-       /* Default to English */
-       return ast_say_date_en(chan, t, ints, lang);
-}
+       if (!num)
+               return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
-/*! \brief English syntax */
+       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);
+                       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 say_date(struct ast_channel *chan, time_t t, const char *ints, const char *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);
+}
+
+/*! \brief English syntax */
 int ast_say_date_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
        struct ast_tm tm;
@@ -3377,7 +3732,7 @@ 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 */
@@ -3389,7 +3744,7 @@ int ast_say_date_da(struct ast_channel *chan, time_t t, const char *ints, const
                                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);    
+                                               res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);
                                        }
                                }
                        }
@@ -3426,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 */
@@ -3439,7 +3794,7 @@ int ast_say_date_de(struct ast_channel *chan, time_t t, const char *ints, const
                                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);    
+                                               res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);
                                        }
                                }
                        }
@@ -3466,7 +3821,7 @@ int ast_say_date_hu(struct ast_channel *chan, time_t t, const char *ints, const
                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)
@@ -3475,7 +3830,7 @@ int ast_say_date_hu(struct ast_channel *chan, time_t t, const char *ints, const
                snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
                res = ast_streamfile(chan, fn, lang);
                if (!res)
-                       res = ast_waitstream(chan, ints);               
+                       res = ast_waitstream(chan, ints);
        }
        return res;
 }
@@ -3570,7 +3925,7 @@ int ast_say_date_th(struct ast_channel *chan, time_t t, const char *ints, const
                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;
 }
 
@@ -3635,6 +3990,55 @@ int ast_say_date_he(struct ast_channel *chan, time_t t, const char *ints, const
        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 */
@@ -3651,6 +4055,10 @@ static int say_date_with_format(struct ast_channel *chan, time_t t, const char *
                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 */
@@ -3723,12 +4131,12 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *
                                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 */
@@ -3789,22 +4197,254 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *
                                }
                                break;
                        case 'M':
-                       case 'N':
+                       case 'N':
+                               /* Minute */
+                               if (tm.tm_min == 0) {
+                                       if (format[offset] == 'M') {
+                                               res = wait_file(chan, ints, "digits/oclock", lang);
+                                       } else {
+                                               res = wait_file(chan, ints, "digits/hundred", lang);
+                                       }
+                               } else if (tm.tm_min < 10) {
+                                       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);
+                                       }
+                               } else {
+                                       res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
+                               }
+                               break;
+                       case 'P':
+                       case 'p':
+                               /* AM/PM */
+                               if (tm.tm_hour > 11)
+                                       ast_copy_string(nextmsg, "digits/p-m", sizeof(nextmsg));
+                               else
+                                       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 */
+                               /* XXX As emphasized elsewhere, this should the native way in your
+                                * language to say the date, with changes in what you say, depending
+                                * upon how recent the date is. XXX */
+                               {
+                                       struct timeval now = ast_tvnow();
+                                       struct ast_tm tmnow;
+                                       time_t beg_today;
+
+                                       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 = 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 < t) {
+                                               /* Yesterday */
+                                               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, 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, 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, t, ints, lang, "Bd", tzone);
+                                       } else {
+                                               /* More than 6 months ago - "April nineteenth two thousand three" */
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "BdY", tzone);
+                                       }
+                               }
+                               break;
+                       case 'q':
+                               /* Shorthand for "" (today), "Yesterday", A (weekday), or ABdY */
+                               /* XXX As emphasized elsewhere, this should the native way in your
+                                * language to say the date, with changes in what you say, depending
+                                * upon how recent the date is. XXX */
+                               {
+                                       struct timeval now;
+                                       struct ast_tm tmnow;
+                                       time_t beg_today;
+
+                                       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 = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
+                                       if (beg_today < t) {
+                                               /* Today */
+                                       } else if ((beg_today - 86400) < t) {
+                                               /* Yesterday */
+                                               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, 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, 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, t, ints, lang, "Bd", tzone);
+                                       } else {
+                                               /* More than 6 months ago - "April nineteenth two thousand three" */
+                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "BdY", tzone);
+                                       }
+                               }
+                               break;
+                       case 'R':
+                               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);
+                               } else if (tm.tm_sec < 10) {
+                                       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);
+                                       }
+                               } else {
+                                       res = ast_say_number(chan, tm.tm_sec, ints, lang, (char *) NULL);
+                               }
+                               break;
+                       case 'T':
+                               res = ast_say_date_with_format_en(chan, t, ints, lang, "HMS", tzone);
+                               break;
+                       case ' ':
+                       case '  ':
+                               /* Just ignore spaces and tabs */
+                               break;
+                       default:
+                               /* Unknown character */
+                               ast_log(LOG_WARNING, "Unknown character in datetime format %s: %c at pos %d\n", format, format[offset], offset);
+               }
+               /* Jump out on DTMF */
+               if (res) {
+                       break;
+               }
+       }
+       return res;
+}
+
+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 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(&when, &tm, tzone);
+
+       for (offset=0 ; format[offset] != '\0' ; offset++) {
+               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 */
+                               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);
+                               break;
+                       case 'A':
+                       case 'a':
+                               /* Sunday - Saturday */
+                               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);
+                               break;
+                       case 'm':
+                               /* Month enumerated */
+                               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");
+                               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);
+                                       } 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?!? */
+                                                   /* say 1967 as 'nineteen hundred seven and sixty' */
+                                                       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);
+                                                               if (!res && year % 100 != 0) {
+                                                                       res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                               break;
+                       case 'I':
+                       case 'l':
+                               /* 12-Hour */
+                               res = wait_file(chan, ints, "digits/oclock", lang);
+                               if (tm.tm_hour == 0)
+                                       ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
+                               else if (tm.tm_hour > 12)
+                                       snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
+                               else
+                                       snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
+                               if (!res) {
+                                       res = wait_file(chan, ints, nextmsg, lang);
+                               }
+                               break;
+                       case 'H':
+                               /* 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);
+                               }
+                               /* FALLTRHU */
+                       case 'k':
+                               /* 24-Hour */
+                               res = ast_say_number(chan, tm.tm_hour, ints, lang, (char *) NULL);
+                               break;
+                       case 'M':
                                /* Minute */
-                               if (tm.tm_min == 0) {
-                                       if (format[offset] == 'M') {
-                                               res = wait_file(chan, ints, "digits/oclock", lang);
+                               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 && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */
+                                       if (tm.tm_min == 1) {
+                                               res = wait_file(chan, ints, "minute", lang);
                                        } else {
-                                               res = wait_file(chan, ints, "digits/hundred", lang);
-                                       }
-                               } else if (tm.tm_min < 10) {
-                                       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);
+                                               res = wait_file(chan, ints, "minutes", lang);
                                        }
-                               } else {
-                                       res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
                                }
                                break;
                        case 'P':
@@ -3817,7 +4457,7 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *
                                res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'Q':
-                               /* Shorthand for "Today", "Yesterday", or ABdY */
+                               /* Shorthand for "Today", "Yesterday", or AdBY */
                                /* XXX As emphasized elsewhere, this should the native way in your
                                 * language to say the date, with changes in what you say, depending
                                 * upon how recent the date is. XXX */
@@ -3826,7 +4466,6 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *
                                        struct ast_tm tmnow;
                                        time_t beg_today;
 
-                                       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() */
@@ -3837,32 +4476,21 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *
                                        } else if (beg_today - 86400 < t) {
                                                /* Yesterday */
                                                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, 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, 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, t, ints, lang, "Bd", tzone);
                                        } else {
-                                               /* More than 6 months ago - "April nineteenth two thousand three" */
-                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "BdY", tzone);
+                                               res = ast_say_date_with_format_da(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
                        case 'q':
-                               /* Shorthand for "" (today), "Yesterday", A (weekday), or ABdY */
+                               /* Shorthand for "" (today), "Yesterday", A (weekday), or AdBY */
                                /* XXX As emphasized elsewhere, this should the native way in your
                                 * language to say the date, with changes in what you say, depending
                                 * upon how recent the date is. XXX */
                                {
-                                       struct timeval now;
+                                       struct timeval now = ast_tvnow();
                                        struct ast_tm tmnow;
                                        time_t beg_today;
 
-                                       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() */
@@ -3874,39 +4502,27 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *
                                                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, 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, 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, t, ints, lang, "Bd", tzone);
+                                               res = ast_say_date_with_format_da(chan, t, ints, lang, "A", tzone);
                                        } else {
-                                               /* More than 6 months ago - "April nineteenth two thousand three" */
-                                               res = ast_say_date_with_format_en(chan, t, ints, lang, "BdY", tzone);
+                                               res = ast_say_date_with_format_da(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
                        case 'R':
-                               res = ast_say_date_with_format_en(chan, t, ints, lang, "HM", tzone);
+                               res = ast_say_date_with_format_da(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);
-                               } else if (tm.tm_sec < 10) {
-                                       res = wait_file(chan, ints, "digits/oh", lang);
+                               res = wait_file(chan, ints, "digits/and", lang);
+                               if (!res) {
+                                       res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");
                                        if (!res) {
-                                               snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_sec);
-                                               res = wait_file(chan, ints, nextmsg, lang);
+                                               res = wait_file(chan, ints, "seconds", 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, t, ints, lang, "HMS", tzone);
+                               res = ast_say_date_with_format_da(chan, t, ints, lang, "HMS", tzone);
                                break;
                        case ' ':
                        case '  ':
@@ -3924,14 +4540,8 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *
        return res;
 }
 
-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)
+/*! \brief German syntax */
+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)
 {
        struct timeval when = { t, 0 };
        struct ast_tm tm;
@@ -3970,32 +4580,32 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char *
                                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 */
                                                        /* We'll just be silent on the year, instead of bombing out. */
                                                } else {
                                                    /* year 1100 to 1999. will anybody need this?!? */
-                                                   /* say 1967 as 'nineteen hundred seven and sixty' */
+                                                   /* say 1967 as 'neunzehn hundert sieben und sechzig' */
                                                        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);
                                                                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);
                                                                }
                                                        }
                                                }
@@ -4005,37 +4615,38 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char *
                        case 'I':
                        case 'l':
                                /* 12-Hour */
-                               res = wait_file(chan, ints, "digits/oclock", lang);
                                if (tm.tm_hour == 0)
                                        ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
                                else if (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);
                                if (!res) {
-                                       res = wait_file(chan, ints, nextmsg, lang);
+                                       res = wait_file(chan, ints, "digits/oclock", lang);
                                }
                                break;
                        case 'H':
-                               /* 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);
-                               }
-                               /* FALLTRHU */
                        case 'k':
                                /* 24-Hour */
                                res = ast_say_number(chan, tm.tm_hour, ints, lang, (char *) NULL);
+                               if (!res) {
+                                       res = wait_file(chan, ints, "digits/oclock", lang);
+                               }
                                break;
                        case 'M':
                                /* Minute */
-                               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 (next_item(&format[offset + 1]) == 'S') { /* zero 'digits/0' only if seconds follow */
+                                       res = ast_say_number(chan, tm.tm_min, ints, lang, "f"); /* female only if we say minutes */
+                               } else if (tm.tm_min > 0) {
+                                       res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
                                }
+
                                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;
@@ -4069,7 +4680,7 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char *
                                                /* Yesterday */
                                                res = wait_file(chan, ints, "digits/yesterday", lang);
                                        } else {
-                                               res = ast_say_date_with_format_da(chan, t, ints, lang, "AdBY", tzone);
+                                               res = ast_say_date_with_format_de(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
@@ -4094,27 +4705,27 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char *
                                                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, t, ints, lang, "A", tzone);
+                                               res = ast_say_date_with_format_de(chan, t, ints, lang, "A", tzone);
                                        } else {
-                                               res = ast_say_date_with_format_da(chan, t, ints, lang, "AdBY", tzone);
+                                               res = ast_say_date_with_format_de(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
                        case 'R':
-                               res = ast_say_date_with_format_da(chan, t, ints, lang, "HM", tzone);
+                               res = ast_say_date_with_format_de(chan, t, ints, lang, "HM", tzone);
                                break;
                        case 'S':
                                /* Seconds */
                                res = wait_file(chan, ints, "digits/and", lang);
                                if (!res) {
-                                       res = ast_say_number(chan, tm.tm_sec, ints, lang, "f"); 
+                                       res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");
                                        if (!res) {
-                                               res = wait_file(chan, ints, "digits/seconds", lang);
+                                               res = wait_file(chan, ints, tm.tm_sec == 1 ? "second" : "seconds", lang);
                                        }
                                }
                                break;
                        case 'T':
-                               res = ast_say_date_with_format_da(chan, t, ints, lang, "HMS", tzone);
+                               res = ast_say_date_with_format_de(chan, t, ints, lang, "HMS", tzone);
                                break;
                        case ' ':
                        case '  ':
@@ -4132,8 +4743,8 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char *
        return res;
 }
 
-/*! \brief German syntax */
-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)
+/* Icelandic syntax */
+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)
 {
        struct timeval when = { t, 0 };
        struct ast_tm tm;
@@ -4172,32 +4783,32 @@ int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const char *
                                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 */
                                                        /* We'll just be silent on the year, instead of bombing out. */
                                                } else {
                                                    /* year 1100 to 1999. will anybody need this?!? */
-                                                   /* say 1967 as 'neunzehn hundert sieben und sechzig' */
+                                                   /* say 1967 as 'nineteen hundred seven and sixty' */
                                                        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);
                                                                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);
                                                                }
                                                        }
                                                }
@@ -4207,38 +4818,44 @@ int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const char *
                        case 'I':
                        case 'l':
                                /* 12-Hour */
+                               res = wait_file(chan, ints, "digits/oclock", lang);
                                if (tm.tm_hour == 0)
                                        ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
                                else if (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);
                                if (!res) {
-                                       res = wait_file(chan, ints, "digits/oclock", lang);
+                                       res = wait_file(chan, ints, nextmsg, lang);
                                }
                                break;
                        case 'H':
+                               /* 24-Hour, single digit hours preceeded by "oh" (0) */
+                               if (tm.tm_hour < 10 && tm.tm_hour > 0) {
+                                       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);      
-                               if (!res) {
-                                       res = wait_file(chan, ints, "digits/oclock", lang);
-                               }
+                               res = ast_say_number(chan, tm.tm_hour, ints, lang, "n");
                                break;
                        case 'M':
                                /* Minute */
-                               if (next_item(&format[offset + 1]) == 'S') { /* zero 'digits/0' only if seconds follow */
-                                       res = ast_say_number(chan, tm.tm_min, ints, lang, "f"); /* female only if we say digits/minutes */
-                               } else if (tm.tm_min > 0) {
-                                       res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
+                               if (tm.tm_min > 0 || next_item(&format[offset + 1]) == 'S') { /* zero 'digits/0' only if seconds follow */
+                                       if (tm.tm_min < 10)
+                                               res = wait_file(chan, ints, "digits/0", lang);
+                                       /* Gender depends on whether or not seconds follow */
+                                       if (next_item(&format[offset + 1]) == 'S')
+                                               res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
+                                       else
+                                               res = ast_say_number(chan, tm.tm_min, ints, lang, "n");
                                }
-
                                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);
+                                       /* Say minute/minutes depending on whether minutes end in 1 */
+                                       if ((tm.tm_min % 10 == 1) && (tm.tm_min != 11)) {
+                                               res = wait_file(chan, ints, "minute", lang);
                                        } else {
-                                               res = wait_file(chan, ints, "digits/minutes", lang);
+                                               res = wait_file(chan, ints, "minutes", lang);
                                        }
                                }
                                break;
@@ -4272,7 +4889,7 @@ int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const char *
                                                /* Yesterday */
                                                res = wait_file(chan, ints, "digits/yesterday", lang);
                                        } else {
-                                               res = ast_say_date_with_format_de(chan, t, ints, lang, "AdBY", tzone);
+                                               res = ast_say_date_with_format_is(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
@@ -4297,27 +4914,30 @@ int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const char *
                                                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_de(chan, t, ints, lang, "A", tzone);
+                                               res = ast_say_date_with_format_is(chan, t, ints, lang, "A", tzone);
                                        } else {
-                                               res = ast_say_date_with_format_de(chan, t, ints, lang, "AdBY", tzone);
+                                               res = ast_say_date_with_format_is(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
                        case 'R':
-                               res = ast_say_date_with_format_de(chan, t, ints, lang, "HM", tzone);
+                               res = ast_say_date_with_format_is(chan, t, ints, lang, "HM", tzone);
                                break;
                        case 'S':
                                /* Seconds */
                                res = wait_file(chan, ints, "digits/and", lang);
                                if (!res) {
-                                       res = ast_say_number(chan, tm.tm_sec, ints, lang, "f"); 
-                                       if (!res) {
-                                               res = wait_file(chan, ints, tm.tm_sec == 1 ? "digits/second" : "digits/seconds", lang);
+                                       res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");
+                                       /* Say minute/minutes depending on whether seconds end in 1 */
+                                       if (!res && (tm.tm_sec % 10 == 1) && (tm.tm_sec != 11)) {
+                                               res = wait_file(chan, ints, "second", lang);
+                                       } else {
+                                               res = wait_file(chan, ints, "seconds", lang);
                                        }
                                }
                                break;
                        case 'T':
-                               res = ast_say_date_with_format_de(chan, t, ints, lang, "HMS", tzone);
+                               res = ast_say_date_with_format_is(chan, t, ints, lang, "HMS", tzone);
                                break;
                        case ' ':
                        case '  ':
@@ -4349,7 +4969,7 @@ int ast_say_date_with_format_th(struct ast_channel *chan, time_t t, const char *
        ast_localtime(&when, &tm, tzone);
 
        for (offset=0 ; format[offset] != '\0' ; offset++) {
-               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 '\'':
@@ -4375,12 +4995,12 @@ int ast_say_date_with_format_th(struct ast_channel *chan, time_t t, const char *
                                break;
                        case 'm':
                                /* Month enumerated */
-                               res = ast_say_number(chan, (tm.tm_mon + 1), ints, lang, (char *) NULL); 
+                               res = ast_say_number(chan, (tm.tm_mon + 1), ints, lang, (char *) NULL);
                                break;
                        case 'd':
                        case 'e':
                                /* First - Thirtyfirst */
-                               res = ast_say_number(chan, tm.tm_mday, ints, lang, (char *) NULL);      
+                               res = ast_say_number(chan, tm.tm_mday, ints, lang, (char *) NULL);
                                break;
                        case 'Y':
                                /* Year */
@@ -4505,9 +5125,9 @@ int ast_say_date_with_format_th(struct ast_channel *chan, time_t t, const char *
 
 /*! \brief ast_say_date_with_format_he Say formatted date in Hebrew
  *
- * \ref ast_say_date_with_format_en for the details of the options 
+ * \ref ast_say_date_with_format_en for the details of the options
  *
- * Changes from the English version: 
+ * Changes from the English version:
  *
  * - don't replicate in here the logic of ast_say_number_full_he
  *
@@ -4517,7 +5137,7 @@ int ast_say_date_with_format_th(struct ast_channel *chan, time_t t, const char *
  *
  * - The standard "long" format used in Hebrew is AdBY, rather than ABdY
  *
- * \todo 
+ * \todo
  * - A "ha" is missing in the standard date format, before the 'd'.
  * - The numbers of 3000--19000 are not handled well
  */
@@ -4526,7 +5146,7 @@ int ast_say_date_with_format_he(struct ast_channel *chan, time_t t, const char *
 #define IL_DATE_STR "AdBY"
 #define IL_TIME_STR "HM"               /* NOTE: In Hebrew we do not support 12 hours, only 24. No AM or PM exists in the Hebrew language */
 #define IL_DATE_STR_FULL IL_DATE_STR " 'digits/at' " IL_TIME_STR
-       /* TODO: This whole function is cut&paste from 
+       /* TODO: This whole function is cut&paste from
         * ast_say_date_with_format_en . Is that considered acceptable?
         **/
        struct timeval when = { t, 0 };
@@ -4567,13 +5187,13 @@ int ast_say_date_with_format_he(struct ast_channel *chan, time_t t, const char *
                                break;
                        case 'd':
                        case 'e': /* Day of the month */
-                               /* I'm not sure exactly what the parameters 
-                               * audiofd and ctrlfd to 
-                               * ast_say_number_full_he mean, but it seems
-                               * safe to pass -1 there. 
-                               *
-                               * At least in one of the pathes :-( 
-                               */
+                               /* I'm not sure exactly what the parameters
+                               * audiofd and ctrlfd to
+                               * ast_say_number_full_he mean, but it seems
+                               * safe to pass -1 there.
+                               *
+                               * At least in one of the pathes :-(
+                               */
                                res = ast_say_number_full_he(chan, tm.tm_mday, ints, lang, "m", -1, -1);
                                break;
                        case 'Y': /* Year */
@@ -4597,7 +5217,7 @@ int ast_say_date_with_format_he(struct ast_channel *chan, time_t t, const char *
                        case 'Q':
                                /* Shorthand for "Today", "Yesterday", or "date" */
                        case 'q':
-                               /* Shorthand for "" (today), "Yesterday", A 
+                               /* Shorthand for "" (today), "Yesterday", A
                                 * (weekday), or "date" */
                                /* XXX As emphasized elsewhere, this should the native way in your
                                 * language to say the date, with changes in what you say, depending
@@ -4725,6 +5345,8 @@ int ast_say_date_with_format_es(struct ast_channel *chan, time_t t, const char *
                                /* 12-Hour */
                                if (tm.tm_hour == 0)
                                        ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
+                               else if (tm.tm_hour == 1 || tm.tm_hour == 13)
+                                       snprintf(nextmsg,sizeof(nextmsg), "digits/1F");
                                else if (tm.tm_hour > 12)
                                        snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
                                else
@@ -4738,7 +5360,7 @@ int ast_say_date_with_format_es(struct ast_channel *chan, time_t t, const char *
                                break;
                        case 'M':
                                /* Minute */
-                               res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);       
+                               res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
                                break;
                        case 'P':
                        case 'p':
@@ -4854,7 +5476,7 @@ int ast_say_date_with_format_es(struct ast_channel *chan, time_t t, const char *
        return res;
 }
 
-/*! \brief French syntax 
+/*! \brief French syntax
 oclock = heure
 */
 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)
@@ -5030,7 +5652,7 @@ int ast_say_date_with_format_fr(struct ast_channel *chan, time_t t, const char *
                                /* Seconds */
                                res = ast_say_number(chan, tm.tm_sec, ints, lang, (char * ) NULL);
                                if (!res) {
-                                       res = wait_file(chan, ints, "digits/second", lang);
+                                       res = wait_file(chan, ints, "second", lang);
                                }
                                break;
                        case 'T':
@@ -5150,13 +5772,14 @@ int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char *
                        case 'I':
                        case 'l':
                                /* 12-Hour */
-                               if (tm.tm_hour == 0)
+                               if (tm.tm_hour == 0) {
                                        ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
-                               else if (tm.tm_hour > 12)
+                               } else if (tm.tm_hour > 12) {
                                        snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
-                               else
+                               } else {
                                        snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
-                                       res = wait_file(chan, ints, nextmsg, lang);
+                               }
+                               res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'H':
                        case 'k':
@@ -5176,11 +5799,12 @@ int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char *
                        case 'P':
                        case 'p':
                                /* AM/PM */
-                               if (tm.tm_hour > 11)
+                               if (tm.tm_hour > 11) {
                                        ast_copy_string(nextmsg, "digits/p-m", sizeof(nextmsg));
-                               else
+                               } else {
                                        ast_copy_string(nextmsg, "digits/a-m", sizeof(nextmsg));
-                                       res = wait_file(chan, ints, nextmsg, lang);
+                               }
+                               res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'Q':
                                /* Shorthand for "Today", "Yesterday", or ABdY */
@@ -5191,7 +5815,7 @@ int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char *
                                        struct timeval now = ast_tvnow();
                                        struct ast_tm tmnow;
                                        time_t beg_today;
-       
+
                                        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() */
@@ -5213,7 +5837,7 @@ int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char *
                                        struct timeval now = ast_tvnow();
                                        struct ast_tm tmnow;
                                        time_t beg_today;
-       
+
                                        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() */
@@ -5291,7 +5915,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
        char sndfile[256], nextmsg[256];
 
        if (format == NULL)
-               format = "ABdY 'digits/at' IMp";
+               format = "AdBY 'digits/at' IMp";
 
        ast_localtime(&when, &tm, tzone);
 
@@ -5413,7 +6037,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
                                res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'Q':
-                               /* Shorthand for "Today", "Yesterday", or ABdY */
+                               /* Shorthand for "Today", "Yesterday", or AdBY */
                                /* XXX As emphasized elsewhere, this should the native way in your
                                 * language to say the date, with changes in what you say, depending
                                 * upon how recent the date is. XXX */
@@ -5433,12 +6057,12 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
                                                /* Yesterday */
                                                res = wait_file(chan, ints, "digits/yesterday", lang);
                                        } else {
-                                               res = ast_say_date_with_format_nl(chan, t, ints, lang, "ABdY", tzone);
+                                               res = ast_say_date_with_format_nl(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
                        case 'q':
-                               /* Shorthand for "" (today), "Yesterday", A (weekday), or ABdY */
+                               /* Shorthand for "" (today), "Yesterday", A (weekday), or AdBY */
                                {
                                        struct timeval now = ast_tvnow();
                                        struct ast_tm tmnow;
@@ -5457,7 +6081,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
                                                /* Within the last week */
                                                res = ast_say_date_with_format_nl(chan, t, ints, lang, "A", tzone);
                                        } else {
-                                               res = ast_say_date_with_format_nl(chan, t, ints, lang, "ABdY", tzone);
+                                               res = ast_say_date_with_format_nl(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
@@ -5579,7 +6203,7 @@ int ast_say_date_with_format_pl(struct ast_channel *chan, time_t thetime, const
                                        ast_copy_string(nextmsg, "digits/t-12", sizeof(nextmsg));
                                else if (tm.tm_hour > 12)
                                        snprintf(nextmsg, sizeof(nextmsg), "digits/t-%d", tm.tm_hour - 12);
-                               else 
+                               else
                                        snprintf(nextmsg, sizeof(nextmsg), "digits/t-%d", tm.tm_hour);
 
                                res = wait_file(chan, ints, nextmsg, lang);
@@ -5590,7 +6214,7 @@ int ast_say_date_with_format_pl(struct ast_channel *chan, time_t thetime, const
                                if (tm.tm_hour != 0) {
                                        snprintf(nextmsg, sizeof(nextmsg), "digits/t-%d", tm.tm_hour);
                                        res = wait_file(chan, ints, nextmsg, lang);
-                               } else 
+                               } else
                                        res = wait_file(chan, ints, "digits/t-24", lang);
                                break;
                        case 'M':
@@ -5603,7 +6227,7 @@ int ast_say_date_with_format_pl(struct ast_channel *chan, time_t thetime, const
                                                res = wait_file(chan, ints, "digits/100", lang);
                                        }
                                } else
-                                       res = ast_say_number(chan, tm.tm_min, ints, lang, "f"); 
+                                       res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
                                break;
                        case 'P':
                        case 'p':
@@ -5672,16 +6296,16 @@ int ast_say_date_with_format_pl(struct ast_channel *chan, time_t thetime, const
                                                if (!res)
                                                        res = wait_file(chan, ints, "digits/second-a", lang);
                                        } else {
-                                               res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
+                                               res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");
                                                if (!res) {
                                                        int ten, one;
                                                        ten = tm.tm_sec / 10;
                                                        one = tm.tm_sec % 10;
-                                                       
+
                                                        if (one > 1 && one < 5 && ten != 1)
-                                                               res = wait_file(chan, ints, "digits/seconds", lang);
+                                                               res = wait_file(chan, ints, "seconds", lang);
                                                        else
-                                                               res = wait_file(chan, ints, "digits/second", lang);
+                                                               res = wait_file(chan, ints, "second", lang);
                                                }
                                        }
                                }
@@ -5845,9 +6469,9 @@ int ast_say_date_with_format_pt(struct ast_channel *chan, time_t t, const char *
                                        res = ast_say_number(chan, tm.tm_min, ints, lang, NULL);
                                        if (!res) {
                                                if (tm.tm_min > 1) {
-                                                       res = wait_file(chan, ints, "digits/minutes", lang);
+                                                       res = wait_file(chan, ints, "minutes", lang);
                                                } else {
-                                                       res = wait_file(chan, ints, "digits/minute", lang);
+                                                       res = wait_file(chan, ints, "minute", lang);
                                                }
                                        }
                                } else {
@@ -5855,9 +6479,9 @@ int ast_say_date_with_format_pt(struct ast_channel *chan, time_t t, const char *
                                                res = wait_file(chan, ints, "digits/pt-hora", lang);
                                                if (tm.tm_hour != 1)
                                                        if (!res)
-                                                               res = wait_file(chan, ints, "digits/pt-sss", lang);                     
+                                                               res = wait_file(chan, ints, "digits/pt-sss", lang);
                                        } else {
-                                               res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);       
+                                               res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
                                        }
                                }
                                break;
@@ -5943,9 +6567,9 @@ int ast_say_date_with_format_pt(struct ast_channel *chan, time_t t, const char *
                                        res = ast_say_number(chan, tm.tm_sec, ints, lang, NULL);
                                        if (!res) {
                                                if (tm.tm_sec > 1) {
-                                                       res = wait_file(chan, ints, "digits/seconds", lang);
+                                                       res = wait_file(chan, ints, "seconds", lang);
                                                } else {
-                                                       res = wait_file(chan, ints, "digits/second", lang);
+                                                       res = wait_file(chan, ints, "second", lang);
                                                }
                                        }
                                } else {
@@ -6122,6 +6746,9 @@ int ast_say_date_with_format_zh(struct ast_channel *chan, time_t t, const char *
                                if (tm.tm_hour < 10) {
                                        res = wait_file(chan, ints, "digits/0", lang);
                                }
+                               /* XXX Static analysis warns of no break here. No idea if this is
+                                * correct or not
+                                */
                        case 'k':
                                /* 24-Hour */
                                if (!(tm.tm_hour % 10) || tm.tm_hour < 10) {
@@ -6156,7 +6783,7 @@ int ast_say_date_with_format_zh(struct ast_channel *chan, time_t t, const char *
                                        }
                                }
                                if (!res) {
-                                       res = wait_file(chan, ints, "digits/minute", lang);
+                                       res = wait_file(chan, ints, "minute", lang);
                                }
                                break;
                        case 'P':
@@ -6240,7 +6867,7 @@ int ast_say_date_with_format_zh(struct ast_channel *chan, time_t t, const char *
                                        }
                                }
                                if (!res) {
-                                       res = wait_file(chan, ints, "digits/second", lang);
+                                       res = wait_file(chan, ints, "second", lang);
                                }
                                break;
                        case 'T':
@@ -6278,6 +6905,8 @@ static int say_time(struct ast_channel *chan, time_t t, const char *ints, const
                return ast_say_time_ka(chan, t, ints, lang);
        } else if (!strncasecmp(lang, "gr", 2)) { /* Greek syntax */
                return ast_say_time_gr(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "ja", 2)) { /* Japanese syntax */
+               return ast_say_time_ja(chan, t, ints, lang);
        } else if (!strncasecmp(lang, "he", 2)) { /* Hebrew syntax */
                return ast_say_time_he(chan, t, ints, lang);
        } else if (!strncasecmp(lang, "hu", 2)) { /* Hungarian syntax */
@@ -6370,7 +6999,7 @@ int ast_say_time_de(struct ast_channel *chan, time_t t, const char *ints, const
        if (!res)
                res = ast_waitstream(chan, ints);
        if (!res)
-           if (tm.tm_min > 0) 
+           if (tm.tm_min > 0)
                res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
        return res;
 }
@@ -6390,10 +7019,10 @@ int ast_say_time_hu(struct ast_channel *chan, time_t t, const char *ints, const
        if (!res)
                res = ast_waitstream(chan, ints);
        if (!res)
-           if (tm.tm_min > 0) { 
+           if (tm.tm_min > 0) {
                        res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
                        if (!res)
-                               res = ast_streamfile(chan, "digits/minute", lang);
+                               res = ast_streamfile(chan, "minute", lang);
                }
        return res;
 }
@@ -6432,7 +7061,7 @@ int ast_say_time_nl(struct ast_channel *chan, time_t t, const char *ints, const
        if (!res)
                res = ast_waitstream(chan, ints);
        if (!res)
-           if (tm.tm_min > 0) 
+           if (tm.tm_min > 0)
                res = ast_say_number(chan, tm.tm_min, ints, lang, NULL);
        return res;
 }
@@ -6488,9 +7117,9 @@ int ast_say_time_pt_BR(struct ast_channel *chan, time_t t, const char *ints, con
                        res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
                if (!res) {
                        if (tm.tm_min > 1)
-                               res = wait_file(chan, ints, "digits/minutes", lang);
+                               res = wait_file(chan, ints, "minutes", lang);
                        else
-                               res = wait_file(chan, ints, "digits/minute", lang);
+                               res = wait_file(chan, ints, "minute", lang);
                }
        }
        return res;
@@ -6550,7 +7179,7 @@ int ast_say_time_zh(struct ast_channel *chan, time_t t, const char *ints, const
        if (!res)
                res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
        if (!res)
-               res = ast_streamfile(chan, "digits/minute", lang);
+               res = ast_streamfile(chan, "minute", lang);
        if (!res)
                res = ast_waitstream(chan, ints);
        return res;
@@ -6609,6 +7238,8 @@ static int say_datetime(struct ast_channel *chan, time_t t, const char *ints, co
                return ast_say_datetime_ka(chan, t, ints, lang);
        } else if (!strncasecmp(lang, "gr", 2)) { /* Greek syntax */
                return ast_say_datetime_gr(chan, t, ints, lang);
+       } else if (!strncasecmp(lang, "ja", 2)) { /* Japanese syntax */
+               return ast_say_datetime_ja(chan, t, ints, lang);
        } else if (!strncasecmp(lang, "he", 2)) { /* Hebrew syntax */
                return ast_say_datetime_he(chan, t, ints, lang);
        } else if (!strncasecmp(lang, "hu", 2)) { /* Hungarian syntax */
@@ -6713,7 +7344,7 @@ int ast_say_datetime_de(struct ast_channel *chan, time_t t, const char *ints, co
 
        ast_localtime(&when, &tm, NULL);
        res = ast_say_date(chan, t, ints, lang);
-       if (!res) 
+       if (!res)
                ast_say_time(chan, t, ints, lang);
        return res;
 
@@ -6728,7 +7359,7 @@ int ast_say_datetime_hu(struct ast_channel *chan, time_t t, const char *ints, co
 
        ast_localtime(&when, &tm, NULL);
        res = ast_say_date(chan, t, ints, lang);
-       if (!res) 
+       if (!res)
                ast_say_time(chan, t, ints, lang);
        return res;
 }
@@ -6766,7 +7397,7 @@ int ast_say_datetime_fr(struct ast_channel *chan, time_t t, const char *ints, co
        if (tm.tm_min > 0) {
                if (!res)
                        res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
-       } 
+       }
        if (!res)
                res = ast_waitstream(chan, ints);
        if (!res)
@@ -6788,7 +7419,7 @@ int ast_say_datetime_nl(struct ast_channel *chan, time_t t, const char *ints, co
                if (!res)
                        res = ast_waitstream(chan, ints);
        }
-       if (!res) 
+       if (!res)
                ast_say_time(chan, t, ints, lang);
        return res;
 }
@@ -6899,7 +7530,7 @@ int ast_say_datetime_th(struct ast_channel *chan, time_t t, const char *ints, co
                ast_copy_string(fn, "digits/posor", sizeof(fn));
                res = ast_streamfile(chan, fn, lang);
                res = ast_say_number(chan, tm.tm_year + 1900 + 543, ints, lang, (char *) NULL);
-       }       
+       }
        if (!res)
                res = ast_say_number(chan, tm.tm_mday, ints, lang, (char *) NULL);
 
@@ -6909,7 +7540,7 @@ int ast_say_datetime_th(struct ast_channel *chan, time_t t, const char *ints, co
        if (!res){
                ast_copy_string(fn, "digits/wela", sizeof(fn));
                res = ast_streamfile(chan, fn, lang);
-       }       
+       }
        if (!res)
                res = ast_say_number(chan, hour, ints, lang, (char *) NULL);
        if (!res)
@@ -6940,7 +7571,7 @@ int ast_say_datetime_zh(struct ast_channel *chan, time_t t, const char *ints, co
        if (!res) {
                snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
                res = ast_streamfile(chan, fn, lang);
-               if (!res)
+               if (!res)
                        res = ast_waitstream(chan, ints);
        }
 
@@ -6971,7 +7602,7 @@ int ast_say_datetime_zh(struct ast_channel *chan, time_t t, const char *ints, co
        if (!res)
                res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
        if (!res)
-               res = ast_streamfile(chan, "digits/minute", lang);
+               res = ast_streamfile(chan, "minute", lang);
        if (!res)
                res = ast_waitstream(chan, ints);
        return res;
@@ -7165,7 +7796,7 @@ int ast_say_datetime_from_now_pt(struct ast_channel *chan, time_t t, const char
                snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
                if (!res)
                        res = wait_file(chan, ints, fn, lang);
-       
+
        } else if (daydiff) {
                /* Just what day of the week */
                snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
@@ -7250,7 +7881,7 @@ static int gr_say_number_female(int num, struct ast_channel *chan, const char *i
                res = wait_file(chan, ints, fn, lang);
        } else if (num < 13) {
                res = ast_say_number(chan, num, ints, lang, (char *) NULL);
-       } else if (num <100 ) { 
+       } else if (num <100 ) {
                tmp = (num/10) * 10;
                left = num - tmp;
                snprintf(fn, sizeof(fn), "digits/%d", tmp);
@@ -7259,7 +7890,7 @@ static int gr_say_number_female(int num, struct ast_channel *chan, const char *i
                        res = ast_waitstream(chan, ints);
                if (left)
                        gr_say_number_female(left, chan, ints, lang);
-                       
+
        } else {
                return -1;
        }
@@ -7269,18 +7900,18 @@ static int gr_say_number_female(int num, struct ast_channel *chan, const char *i
 
 
 /*! \brief Greek support
- *     A list of the files that you need to create
- ->    digits/xilia = "xilia"
- ->    digits/myrio = "ekatomyrio"
- ->    digits/thousands = "xiliades"
- ->    digits/millions = "ektatomyria"
- ->    digits/[1..12]   :: A pronunciation of th digits form 1 to 12 e.g. "tria"
- ->    digits/[10..100]  :: A pronunciation of the tens from 10 to 90 
-                                e.g. 80 = "ogdonta" 
+ *     A list of the files that you need to create
+ ->    digits/xilia = "xilia"
+ ->    digits/myrio = "ekatomyrio"
+ ->    digits/thousands = "xiliades"
+ ->    digits/millions = "ektatomyria"
+ ->    digits/[1..12]   :: A pronunciation of th digits form 1 to 12 e.g. "tria"
+ ->    digits/[10..100]  :: A pronunciation of the tens from 10 to 90
+                                e.g. 80 = "ogdonta"
                                 Here we must note that we use digits/tens/100 to utter "ekato"
                                 and digits/hundred-100 to utter "ekaton"
- ->    digits/hundred-[100...1000] :: A pronunciation of  hundreds from 100 to 1000 e.g 400 = 
-                                "terakosia". Here again we use hundreds/1000 for "xilia" 
+ ->    digits/hundred-[100...1000] :: A pronunciation of  hundreds from 100 to 1000 e.g 400 =
+                                "terakosia". Here again we use hundreds/1000 for "xilia"
                                 and digits/thousnds for "xiliades"
 */
 static int ast_say_number_full_gr(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
@@ -7289,10 +7920,10 @@ static int ast_say_number_full_gr(struct ast_channel *chan, int num, const char
        char fn[256] = "";
        int i=0;
 
+
        if (!num) {
                ast_copy_string(fn, "digits/0", sizeof(fn));
-               res = ast_streamfile(chan, fn, chan->language);
+               res = ast_streamfile(chan, fn, ast_channel_language(chan));
                if (!res)
                        return  ast_waitstream(chan, ints);
        }
@@ -7305,7 +7936,7 @@ static int ast_say_number_full_gr(struct ast_channel *chan, int num, const char
                } else if (num <= 100) {
                        /* 13 < num <= 100  */
                        snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
-                       num %= 10; 
+                       num %= 10;
                } else if (num < 200) {
                        /* 100 < num < 200 */
                        snprintf(fn, sizeof(fn), "digits/hundred-100");
@@ -7318,16 +7949,16 @@ static int ast_say_number_full_gr(struct ast_channel *chan, int num, const char
                        snprintf(fn, sizeof(fn), "digits/xilia");
                        num %= 1000;
                } else {
-                       /* num >  1000 */ 
+                       /* num >  1000 */
                        if (num < 1000000) {
-                               res = ast_say_number_full_gr(chan, (num / 1000), ints, chan->language, audiofd, ctrlfd);
+                               res = ast_say_number_full_gr(chan, (num / 1000), ints, ast_channel_language(chan), audiofd, ctrlfd);
                                if (res)
                                        return res;
                                num %= 1000;
                                snprintf(fn, sizeof(fn), "digits/thousands");
                        }  else {
                                if (num < 1000000000) { /* 1,000,000,000 */
-                                       res = ast_say_number_full_gr(chan, (num / 1000000), ints, chan->language, audiofd, ctrlfd);
+                                       res = ast_say_number_full_gr(chan, (num / 1000000), ints, ast_channel_language(chan), audiofd, ctrlfd);
                                        if (res)
                                                return res;
                                        num %= 1000000;
@@ -7337,7 +7968,7 @@ static int ast_say_number_full_gr(struct ast_channel *chan, int num, const char
                                        res = -1;
                                }
                        }
-               } 
+               }
                if (!res) {
                        if (!ast_streamfile(chan, fn, language)) {
                                if ((audiofd > -1) && (ctrlfd > -1))
@@ -7351,24 +7982,89 @@ static int ast_say_number_full_gr(struct ast_channel *chan, int num, const char
        return res;
 }
 
+/* Japanese syntax */
+static int ast_say_number_full_ja(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/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 < 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_en(chan, num / 1000, ints, language, audiofd, ctrlfd);
+                                     if (res)
+                                             return res;
+                                     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 %= 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 Greek support
  *
  * The format is  weekday - day - month -year
- * 
+ *
  * A list of the files that you need to create
  * digits/day-[1..7]  : "Deytera .. Paraskeyh"
- * digits/months/1..12 : "Ianouariou .. Dekembriou"  
+ * digits/months/1..12 : "Ianouariou .. Dekembriou"
        Attention the months are in "gekinh klhsh"
  */
 static int ast_say_date_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
 {
        struct ast_tm tm;
        struct timeval when = { t, 0 };
-       
+
        char fn[256];
        int res = 0;
-       
+
 
        ast_localtime(&when, &tm, NULL);
        /* W E E K - D A Y */
@@ -7392,18 +8088,51 @@ static int ast_say_date_gr(struct ast_channel *chan, time_t t, const char *ints,
        /* Y E A R */
        if (!res)
                res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
-       return res; 
+       return res;
+}
+
+
+/* Japanese syntax */
+int ast_say_date_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+{
+      struct ast_tm tm;
+      struct timeval tv = { t, 0 };
+      char fn[256];
+      int res = 0;
+      ast_localtime(&tv, &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)
+              res = ast_streamfile(chan, "digits/nen", lang);
+      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, (char * ) NULL);
+      if (!res)
+              res = ast_streamfile(chan, "digits/nichi", lang);
+      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 Greek support
  *
  * A list of the files that you need to create
  * - digits/female/1..4 : "Mia, dyo , treis, tesseris "
  * - digits/kai : "KAI"
  * - didgits : "h wra"
- * - digits/p-m : "meta meshmbrias" 
+ * - digits/p-m : "meta meshmbrias"
  * - digits/a-m : "pro meshmbrias"
  */
 static int ast_say_time_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
@@ -7425,7 +8154,7 @@ static int ast_say_time_gr(struct ast_channel *chan, time_t t, const char *ints,
                hour -= 12;
                pm = 1;
        }
+
        res = gr_say_number_female(hour, chan, ints, lang);
        if (tm.tm_min) {
                if (!res)
@@ -7453,6 +8182,52 @@ static int ast_say_time_gr(struct ast_channel *chan, time_t t, const char *ints,
 }
 
 
+/* Japanese */
+static int ast_say_time_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+{
+
+      struct timeval tv = { t, 0 };
+      struct ast_tm tm;
+      int res = 0;
+      int hour, pm=0;
+
+      ast_localtime(&tv, &tm, NULL);
+      hour = tm.tm_hour;
+
+      if (!hour)
+              hour = 12;
+      else if (hour == 12)
+              pm = 1;
+      else if (hour > 12) {
+              hour -= 12;
+              pm = 1;
+      }
+
+      if (pm) {
+              if (!res)
+                      res = ast_streamfile(chan, "digits/p-m", lang);
+      } else {
+              if (!res)
+                      res = ast_streamfile(chan, "digits/a-m", lang);
+      }
+      if (hour == 9 || hour == 21) {
+              if (!res)
+                      res = ast_streamfile(chan, "digits/9_2", lang);
+      } else {
+              if (!res)
+                      res = ast_say_number(chan, hour, ints, lang, (char *) NULL);
+      }
+      if (!res)
+              res = ast_streamfile(chan, "digits/ji", lang);
+      if (!res)
+              res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
+      if (!res)
+              res = ast_streamfile(chan, "digits/fun", lang);
+      if (!res)
+              res = ast_waitstream(chan, ints);
+      return res;
+}
+
 
 /*! \brief Greek support
  */
@@ -7488,6 +8263,72 @@ static int ast_say_datetime_gr(struct ast_channel *chan, time_t t, const char *i
        return res;
 }
 
+/* Japanese syntax */
+int ast_say_datetime_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+{
+      struct timeval tv = { t, 0 };
+      struct ast_tm tm;
+      char fn[256];
+      int res = 0;
+      int hour, pm=0;
+
+      ast_localtime(&tv, &tm, NULL);
+
+      if (!res)
+              res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
+      if (!res)
+              res = ast_streamfile(chan, "digits/nen", lang);
+      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, (char *) NULL);
+      if (!res)
+              res = ast_streamfile(chan, "digits/nichi", lang);
+      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);
+      }
+
+      hour = tm.tm_hour;
+      if (!hour)
+              hour = 12;
+      else if (hour == 12)
+              pm = 1;
+      else if (hour > 12) {
+              hour -= 12;
+              pm = 1;
+      }
+      if (pm) {
+              if (!res)
+                      res = ast_streamfile(chan, "digits/p-m", lang);
+      } else {
+              if (!res)
+                      res = ast_streamfile(chan, "digits/a-m", lang);
+      }
+      if (hour == 9 || hour == 21) {
+              if (!res)
+                      res = ast_streamfile(chan, "digits/9_2", lang);
+      } else {
+              if (!res)
+                      res = ast_say_number(chan, hour, ints, lang, (char *) NULL);
+      }
+      if (!res)
+              res = ast_streamfile(chan, "digits/ji", lang);
+      if (!res)
+              res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
+      if (!res)
+              res = ast_streamfile(chan, "digits/fun", lang);
+      if (!res)
+              res = ast_waitstream(chan, ints);
+      return res;
+}
+
 /*! \brief Greek support
  */
 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)
@@ -7501,7 +8342,7 @@ static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const
                format = "AdBY 'digits/at' IMp";
 
        ast_localtime(&when, &tm, tzone);
-       
+
        for (offset=0 ; format[offset] != '\0' ; offset++) {
                ast_debug(1, "Parsing %c (offset %d) in %s\n", format[offset], offset, format);
                switch (format[offset]) {
@@ -7534,8 +8375,8 @@ static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const
                        break;
                case 'Y':
                        /* Year */
-                       
-                       ast_say_number_full_gr(chan, 1900+tm.tm_year, ints, chan->language, -1, -1);
+
+                       ast_say_number_full_gr(chan, 1900+tm.tm_year, ints, ast_channel_language(chan), -1, -1);
                        break;
                case 'I':
                case 'l':
@@ -7586,7 +8427,7 @@ static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const
                                struct timeval now = ast_tvnow();
                                struct ast_tm tmnow;
                                time_t beg_today;
-                               
+
                                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() */
@@ -7611,7 +8452,7 @@ static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const
                                struct timeval now = ast_tvnow();
                                struct ast_tm tmnow;
                                time_t beg_today;
-                               
+
                                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() */
@@ -7639,7 +8480,7 @@ static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const
                        if (!res)
                                res = ast_say_number_full_gr(chan, tm.tm_sec, ints, lang, -1, -1);
                        if (!res)
-                               ast_copy_string(nextmsg, "digits/seconds", sizeof(nextmsg));
+                               ast_copy_string(nextmsg, "seconds", sizeof(nextmsg));
                        res = wait_file(chan, ints, nextmsg, lang);
                        break;
                case 'T':
@@ -7661,6 +8502,274 @@ static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const
        return res;
 }
 
+/* Japanese syntax */
+int ast_say_date_with_format_ja(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone)
+{
+     struct timeval tv = { time, 0 };
+     struct ast_tm tm;
+     int res=0, offset, sndoffset;
+     char sndfile[256], nextmsg[256];
+
+     if (!format)
+           format = "YbdAPIMS";
+
+     ast_localtime(&tv, &tm, timezone);
+
+     for (offset=0 ; format[offset] != '\0' ; offset++) {
+             ast_log(LOG_DEBUG, "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 */
+                             for (sndoffset = 0 ; (format[++offset] != '\'') && (sndoffset < sizeof(sndfile) - 1) ; sndoffset++) {
+                                     sndfile[sndoffset] = format[offset];
+                             }
+                             sndfile[sndoffset] = '\0';
+                             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);
+                             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);
+                             break;
+                     case 'd':
+                     case 'e':
+                             /* First - Thirtyfirst */
+                             if (tm.tm_mday < 21) {
+                                     snprintf(nextmsg,sizeof(nextmsg), "digits/h-%d_2", tm.tm_mday);
+                                     res = wait_file(chan,ints,nextmsg,lang);
+                             } else if (tm.tm_mday < 30) {
+                                     /* Between 21 and 29 - two sounds */
+                                     res = wait_file(chan,ints, "digits/20",lang);
+                                     if (!res) {
+                                             snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_mday - 20);
+                                             res = wait_file(chan,ints,nextmsg,lang);
+                                     }
+                                     res = wait_file(chan,ints, "digits/nichi",lang);
+                             } else if (tm.tm_mday == 30) {
+                                     /* 30 */
+                                     res = wait_file(chan,ints, "digits/h-30_2",lang);
+                             } else {
+                                     /* 31 */
+                                     res = wait_file(chan,ints, "digits/30",lang);
+                                     res = wait_file(chan,ints, "digits/1",lang);
+                                     res = wait_file(chan,ints, "digits/nichi",lang);
+                             }
+                             break;
+                     case 'Y':
+                             /* Year */
+                             if (tm.tm_year > 99) {
+                                     res = wait_file(chan,ints, "digits/2",lang);
+                                     if (!res) {
+                                             res = wait_file(chan,ints, "digits/thousand",lang);
+                                     }
+                                     if (tm.tm_year > 100) {
+                                             if (!res) {
+                                                     /* This works until the end of 2020 */
+                                                     snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_year - 100);
+                                                     res = wait_file(chan,ints,nextmsg,lang);
+                                             }
+                                     }
+                             } 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. */
+                                              } else {
+                                                        res = wait_file(chan,ints, "digits/19",lang);
+                                             if (!res) {
+                                                     if (tm.tm_year <= 9) {
+                                                             /* 1901 - 1909 */
+                                                             res = wait_file(chan,ints, "digits/oh",lang);
+                                                             if (!res) {
+                                                                     snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_year);
+                                                                     res = wait_file(chan,ints,nextmsg,lang);
+                                                             }
+                                                     } else if (tm.tm_year <= 20) {
+                                                             /* 1910 - 1920 */
+                                                             snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_year);
+                                                             res = wait_file(chan,ints,nextmsg,lang);
+                                                     } else {
+                                                             /* 1921 - 1999 */
+                                                             int ten, one;
+                                                             ten = tm.tm_year / 10;
+                                                             one = tm.tm_year % 10;
+                                                             snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten * 10);
+                                                             res = wait_file(chan,ints,nextmsg,lang);
+                                                             if (!res) {
+                                                                     if (one != 0) {
+                                                                             snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one);
+                                                                             res = wait_file(chan,ints,nextmsg,lang);
+                                                                     }
+                                                             }
+                                                     }
+                                             }
+                                     }
+                             }
+                             res = wait_file(chan,ints, "digits/nen",lang);
+                             break;
+                     case 'P':
+                     case 'p':
+                             /* AM/PM */
+                             if (tm.tm_hour > 11)
+                                     snprintf(nextmsg,sizeof(nextmsg), "digits/p-m");
+                             else
+                                     snprintf(nextmsg,sizeof(nextmsg), "digits/a-m");
+                             res = wait_file(chan,ints,nextmsg,lang);
+                             break;
+                     case 'I':
+                     case 'l':
+                             /* 12-Hour */
+                             if (tm.tm_hour == 0)
+                                     snprintf(nextmsg,sizeof(nextmsg), "digits/12");
+                             else if (tm.tm_hour == 9 || tm.tm_hour == 21)
+                                     snprintf(nextmsg,sizeof(nextmsg), "digits/9_2");
+                             else if (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);
+                             if(!res) res = wait_file(chan,ints, "digits/ji",lang);
+                             break;
+                     case 'H':
+                     case 'k':
+                             if (!res) {
+                                     if (tm.tm_hour != 0) {
+                                             int remainder = tm.tm_hour;
+                                             if (tm.tm_hour > 20) {
+                                                     res = wait_file(chan,ints, "digits/20",lang);
+                                                     remainder -= 20;
+                                             }
+                                             if (!res) {
+                                                     snprintf(nextmsg,sizeof(nextmsg), "digits/%d", remainder);
+                                                     res = wait_file(chan,ints,nextmsg,lang);
+                                             }
+                                     }
+                             }
+                             res = wait_file(chan,ints, "digits/ji",lang);
+                             break;
+                     case 'M':
+                             /* Minute */
+                             if ((tm.tm_min < 21) || (tm.tm_min % 10 == 0)) {
+                                     snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_min);
+                                     res = wait_file(chan,ints,nextmsg,lang);
+                             } else {
+                                     int ten, one;
+                                     ten = (tm.tm_min / 10) * 10;
+                                     one = (tm.tm_min % 10);
+                                     snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten);
+                                     res = wait_file(chan,ints,nextmsg,lang);
+                                     if (!res) {
+                                             /* Fifty, not fifty-zero */
+                                             if (one != 0) {
+                                                     snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one);
+                                                     res = wait_file(chan,ints,nextmsg,lang);
+                                             }
+                                     }
+                             }
+                             res = wait_file(chan,ints, "digits/fun",lang);
+                             break;
+                     case 'Q':
+                             /* Shorthand for "Today", "Yesterday", or ABdY */
+                             {
+                                     struct timeval now;
+                                     struct ast_tm tmnow;
+                                     time_t beg_today;
+
+                                     gettimeofday(&now,NULL);
+                                     ast_localtime(&now,&tmnow,timezone);
+                                     /* 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 = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
+                                     if (beg_today < time) {
+                                             /* Today */
+                                             res = wait_file(chan,ints, "digits/today",lang);
+                                     } else if (beg_today - 86400 < time) {
+                                             /* Yesterday */
+                                              res = wait_file(chan,ints, "digits/yesterday",lang);
+                                     } else {
+                                              res = ast_say_date_with_format(chan, time, ints, lang, "ABdY", timezone);
+                                     }
+                             }
+                             break;
+                     case 'q':
+                             /* Shorthand for "" (today), "Yesterday", A (weekday), or ABdY */
+                             {
+                                     struct timeval now;
+                                     struct ast_tm tmnow;
+                                     time_t beg_today;
+
+                                     gettimeofday(&now,NULL);
+                                     ast_localtime(&now,&tmnow,timezone);
+                                     /* 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 = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
+                                     if (beg_today < time) {
+                                             /* Today */
+                                     } else if ((beg_today - 86400) < time) {
+                                             /* Yesterday */
+                                             res = wait_file(chan,ints, "digits/yesterday",lang);
+                                     } else if (beg_today - 86400 * 6 < time) {
+                                             /* Within the last week */
+                                             res = ast_say_date_with_format(chan, time, ints, lang, "A", timezone);
+                                     } else {
+                                             res = ast_say_date_with_format(chan, time, ints, lang, "ABdY", timezone);
+                                     }
+                             }
+                             break;
+                     case 'R':
+                             res = ast_say_date_with_format(chan, time, ints, lang, "HM", timezone);
+                             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);
+                             } else if ((tm.tm_sec < 21) || (tm.tm_sec % 10 == 0)) {
+                                     snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
+                                     res = wait_file(chan,ints,nextmsg,lang);
+                             } else {
+                                     int ten, one;
+                                     ten = (tm.tm_sec / 10) * 10;
+                                     one = (tm.tm_sec % 10);
+                                     snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten);
+                                     res = wait_file(chan,ints,nextmsg,lang);
+                                     if (!res) {
+                                             /* Fifty, not fifty-zero */
+                                             if (one != 0) {
+                                                     snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one);
+                                                     res = wait_file(chan,ints,nextmsg,lang);
+                                             }
+                                     }
+                             }
+                             res = wait_file(chan,ints, "digits/byou",lang);
+                             break;
+                     case 'T':
+                             res = ast_say_date_with_format(chan, time, ints, lang, "HMS", timezone);
+                             break;
+                     case ' ':
+                     case '    ':
+                             /* Just ignore spaces and tabs */
+                             break;
+                     default:
+                             /* Unknown character */
+                             ast_log(LOG_WARNING, "Unknown character in datetime format %s: %c at pos %d\n", format, format[offset], offset);
+             }
+             /* Jump out on DTMF */
+             if (res) {
+                     break;
+             }
+     }
+     return res;
+}
+
 /*! \brief Vietnamese syntax */
 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)
 {
@@ -7701,12 +8810,12 @@ int ast_say_date_with_format_vi(struct ast_channel *chan, time_t t, const char *
                                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':
                                /* 1 - 31 */
-                               res = ast_say_number(chan, tm.tm_mday, ints, lang, (char *) NULL);      
+                               res = ast_say_number(chan, tm.tm_mday, ints, lang, (char *) NULL);
                                break;
                        case 'Y':
                                /* Year */
@@ -8044,8 +9153,9 @@ static int ast_say_number_full_ka(struct ast_channel *chan, int num, const char
        char* s = 0;
        const char* remaining = fn;
 
-       if (!num)
+       if (!num) {
                return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+       }
 
 
        ast_translate_number_ka(num, fn, 512);
@@ -8058,21 +9168,23 @@ static int ast_say_number_full_ka(struct ast_channel *chan, int num, const char
 
                sprintf(new_string, "digits/");
                strncat(new_string, remaining, len);  /* we can't sprintf() it, it's not null-terminated. */
-/*             new_string[len + strlen("digits/")] = '\0'; */
+/*             new_string[len + strlen("digits/")] = '\0'; */
 
                if (!ast_streamfile(chan, new_string, 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);
 
                ast_free(new_string);
 
                remaining = s + 1;  /* position just after the found space char. */
-               while (*remaining == ' ')  /* skip multiple spaces */
+               while (*remaining == ' ') {  /* skip multiple spaces */
                        remaining++;
+               }
        }
 
 
@@ -8083,10 +9195,11 @@ static int ast_say_number_full_ka(struct ast_channel *chan, int num, const char
                sprintf(new_string, "digits/%s", remaining);
 
                if (!ast_streamfile(chan, new_string, 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);
 
@@ -8101,7 +9214,7 @@ static int ast_say_number_full_ka(struct ast_channel *chan, int num, const char
 
 
 
-/*! \brief Georgian syntax. e.g. "oriatas xuti tslis 5 noemberi". 
+/*! \brief Georgian syntax. e.g. "oriatas xuti tslis 5 noemberi".
 
 Georgian support for date/time requires the following files (*.gsm):
 
@@ -8119,28 +9232,31 @@ static int ast_say_date_ka(struct ast_channel *chan, time_t t, const char *ints,
        int res = 0;
        ast_localtime(&when, &tm, NULL);
 
-       if (!res)
+       if (!res) {
                res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
+       }
 
        if (!res) {
                snprintf(fn, sizeof(fn), "digits/tslis %d", tm.tm_wday);
                res = ast_streamfile(chan, fn, lang);
-               if (!res)
+               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)
+                       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)
+               if (!res) {
                        res = ast_waitstream(chan, ints);
+               }
        }
        return res;
 
@@ -8162,8 +9278,9 @@ static int ast_say_time_ka(struct ast_channel *chan, time_t t, const char *ints,
        res = ast_say_number(chan, tm.tm_hour, ints, lang, (char*)NULL);
        if (!res) {
                res = ast_streamfile(chan, "digits/saati_da", lang);
-               if (!res)
+               if (!res) {
                        res = ast_waitstream(chan, ints);
+               }
        }
 
        if (tm.tm_min) {
@@ -8172,8 +9289,9 @@ static int ast_say_time_ka(struct ast_channel *chan, time_t t, const char *ints,
 
                        if (!res) {
                                res = ast_streamfile(chan, "digits/tsuti", lang);
-                               if (!res)
+                               if (!res) {
                                        res = ast_waitstream(chan, ints);
+                               }
                        }
                }
        }
@@ -8191,8 +9309,9 @@ static int ast_say_datetime_ka(struct ast_channel *chan, time_t t, const char *i
 
        ast_localtime(&when, &tm, NULL);
        res = ast_say_date(chan, t, ints, lang);
-       if (!res)
+       if (!res) {
                ast_say_time(chan, t, ints, lang);
+       }
        return res;
 
 }
@@ -8215,13 +9334,15 @@ static int ast_say_datetime_from_now_ka(struct ast_channel *chan, time_t t, cons
        daydiff = now.tm_yday - tm.tm_yday;
        if ((daydiff < 0) || (daydiff > 6)) {
                /* Day of month and month */
-               if (!res)
+               if (!res) {
                        res = ast_say_number(chan, tm.tm_mday, ints, lang, (char *) NULL);
+               }
                if (!res) {
                        snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
                        res = ast_streamfile(chan, fn, lang);
-                       if (!res)
+                       if (!res) {
                                res = ast_waitstream(chan, ints);
+                       }
                }
 
        } else if (daydiff) {
@@ -8229,23 +9350,25 @@ static int ast_say_datetime_from_now_ka(struct ast_channel *chan, time_t t, cons
                if (!res) {
                        snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
                        res = ast_streamfile(chan, fn, lang);
-                       if (!res)
+                       if (!res) {
                                res = ast_waitstream(chan, ints);
+                       }
                }
        } /* Otherwise, it was today */
-       if (!res)
+       if (!res) {
                res = ast_say_time(chan, t, ints, lang);
+       }
 
        return res;
 }
 
-/*! \brief 
+/*! \brief
  * In English, we use the plural for everything but one. For example:
  *  - 1 degree
  *  - 2 degrees
  *  - 5 degrees
  * The filename for the plural form is generated by appending "s". Note that
- * purpose is to generate a unique filename, not to implement irregular 
+ * purpose is to generate a unique filename, not to implement irregular
  * declensions. Thus:
  *  - 1 man
  *  - 2 mans (the "mans" soundfile will of course say "men")
@@ -8262,7 +9385,7 @@ static const char *counted_noun_ending_en(int num)
 /*! \brief
  * Counting of objects in slavic languages such as Russian and Ukrainian the
  * rules are more complicated. There are two plural forms used in counting.
- * They are the genative singular which we represent with the suffix "x1" and 
+ * They are the genative singular which we represent with the suffix "x1" and
  * the genative plural which we represent with the suffix "x2". The base names
  * of the soundfiles remain in English. For example:
  *  - 1 degree (soudfile says "gradus")
@@ -8293,16 +9416,16 @@ int ast_say_counted_noun(struct ast_channel *chan, int num, const char noun[])
        char *temp;
        int temp_len;
        const char *ending;
-       if (!strncasecmp(chan->language, "ru", 2)) {        /* Russian */
+       if (!strncasecmp(ast_channel_language(chan), "ru", 2)) {        /* Russian */
                ending = counted_noun_ending_slavic(num);
-       } else if (!strncasecmp(chan->language, "ua", 2)) { /* Ukrainian */
+       } else if (!strncasecmp(ast_channel_language(chan), "ua", 2)) { /* Ukrainian */
                ending = counted_noun_ending_slavic(num);
-       } else if (!strncasecmp(chan->language, "pl", 2)) { /* Polish */
+       } else if (!strncasecmp(ast_channel_language(chan), "pl", 2)) { /* Polish */
                ending = counted_noun_ending_slavic(num);
        } else {                                            /* English and default */
                ending = counted_noun_ending_en(num);
        }
-       temp = alloca((temp_len = (strlen(noun) + strlen(ending) + 1)));
+       temp = ast_alloca((temp_len = (strlen(noun) + strlen(ending) + 1)));
        snprintf(temp, temp_len, "%s%s", noun, ending);
        return ast_play_and_wait(chan, temp);
 }
@@ -8335,16 +9458,16 @@ int ast_say_counted_adjective(struct ast_channel *chan, int num, const char adje
        char *temp;
        int temp_len;
        const char *ending;
-       if (!strncasecmp(chan->language, "ru", 2)) {           /* Russian */
+       if (!strncasecmp(ast_channel_language(chan), "ru", 2)) {           /* Russian */
                ending = counted_adjective_ending_ru(num, gender);
-       } else if (!strncasecmp(chan->language, "ua", 2)) {    /* Ukrainian */
+       } else if (!strncasecmp(ast_channel_language(chan), "ua", 2)) {    /* Ukrainian */
                ending = counted_adjective_ending_ru(num, gender);
-       } else if (!strncasecmp(chan->language, "pl", 2)) {    /* Polish */
+       } else if (!strncasecmp(ast_channel_language(chan), "pl", 2)) {    /* Polish */
                ending = counted_adjective_ending_ru(num, gender);
        } else {                                               /* English and default */
                ending = "";
        }
-       temp = alloca((temp_len = (strlen(adjective) + strlen(ending) + 1)));
+       temp = ast_alloca((temp_len = (strlen(adjective) + strlen(ending) + 1)));
        snprintf(temp, temp_len, "%s%s", adjective, ending);
        return ast_play_and_wait(chan, temp);
 }