*** main/say.c.org	Sat Jul 19 04:06:10 2008
--- main/say.c	Sat Nov 15 02:06:05 2008
***************
*** 378,383 ****
--- 378,384 ----
  static int ast_say_date_with_format_pt(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
  static int ast_say_date_with_format_tw(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
  static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
+ static int ast_say_date_with_format_jp(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone);
  
  static int ast_say_time_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
  static int ast_say_time_de(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
***************
*** 389,394 ****
--- 390,396 ----
  static int ast_say_time_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
  static int ast_say_time_ge(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
  static int ast_say_time_he(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+ static int ast_say_time_jp(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
  
  static int ast_say_datetime_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
  static int ast_say_datetime_de(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
***************
*** 400,405 ****
--- 402,408 ----
  static int ast_say_datetime_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
  static int ast_say_datetime_ge(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
  static int ast_say_datetime_he(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
+ static int ast_say_datetime_jp(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
  
  static int ast_say_datetime_from_now_en(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
  static int ast_say_datetime_from_now_fr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
***************
*** 3197,3204 ****
--- 3200,3210 ----
  		return(ast_say_date_with_format_tw(chan, time, ints, lang, format, timezone));
  	} else if (!strcasecmp(lang, "gr") ) {	/* Greek syntax */
  		return(ast_say_date_with_format_gr(chan, time, ints, lang, format, timezone));
+ 	} else if (!strcasecmp(lang, "jp") ) {	/* Japanese syntax */
+ 		return(ast_say_date_with_format_jp(chan, time, ints, lang, format, timezone));
  	}
  
+ 
  	/* Default to English */
  	return(ast_say_date_with_format_en(chan, time, ints, lang, format, timezone));
  }
***************
*** 5662,5667 ****
--- 5668,5675 ----
  		return(ast_say_time_ge(chan, t, ints, lang));
  	} else if (!strcasecmp(lang, "he")) {	/* Hebrew syntax */
  		return (ast_say_time_he(chan, t, ints, lang));
+ 	} else if (!strcasecmp(lang, "jp")) {	/* Japanese syntax */
+ 		return (ast_say_time_jp(chan, t, ints, lang));
  	}
  
  	/* Default to English */
***************
*** 5926,5931 ****
--- 5934,5941 ----
  		return(ast_say_datetime_ge(chan, t, ints, lang));
  	} else if (!strcasecmp(lang, "he")) {	/* Hebrew syntax */
  		return (ast_say_datetime_he(chan, t, ints, lang));
+ 	} else if (!strcasecmp(lang, "jp")) {	/* Japanese syntax */
+ 		return (ast_say_datetime_jp(chan, t, ints, lang));
  	}
  
  	/* Default to English */
***************
*** 6899,6904 ****
--- 6909,7305 ----
  /*********************************** Georgian Support ***************************************/
  
  
+ 
+ /* Japanese syntax */
+ static int ast_say_time_jp(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+ {
+ 
+ 	struct tm tm;
+ 	int res = 0;
+ 	int hour, pm=0;
+ 
+ 	ast_localtime(&t,&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 (!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;
+ }
+ 
+ 
+ int ast_say_datetime_jp(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+ {
+ 	struct tm tm;
+ 	char fn[256];
+ 	int res = 0;
+ 	int hour, pm=0;
+ 	ast_localtime(&t,&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_streamfile(chan, "digits/gatsu", lang);
+ 	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 (!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;
+ }
+ 
+ 
+ int ast_say_date_with_format_jp(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone)
+ {
+ 	struct tm tm;
+ 	int res=0, offset, sndoffset;
+ 	char sndfile[256], nextmsg[256];
+ 
+ 	if (!format)
+ 		format = "YbdAPIMS";
+ 
+ 	ast_localtime(&time,&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 */
+ 				sndoffset=0;
+ 				for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; 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/%d", 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);
+ 					}
+ 				} else if (tm.tm_mday == 30) {
+ 					/* 30 */
+ 					res = wait_file(chan,ints, "digits/30",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 > 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, "hours",lang);
+ 				break;
+ 			case 'H':
+ 			case 'k':
+ 				/* 24-Hour */
+ 				if (format[offset] == 'H') {
+ 					/* e.g. oh-eight */
+ 					if (tm.tm_hour < 10) {
+ 						res = wait_file(chan,ints, "digits/0",lang);
+ 					}
+ 				} else {
+ 					/* e.g. eight */
+ 					if (tm.tm_hour == 0) {
+ 						res = wait_file(chan,ints, "digits/0",lang);
+ 					}
+ 				}
+ 				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, "hours",lang);
+ 				break;
+ 			case 'M':
+ 				/* Minute */
+ 				if (tm.tm_min < 10) {
+ 					res = wait_file(chan,ints, "digits/0",lang);
+ 					if (!res) {
+ 						snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_min);
+ 						res = wait_file(chan,ints,nextmsg,lang);
+ 					}
+ 				} else 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, "minutes",lang);
+ 				break;
+ 			case 'Q':
+ 				/* Shorthand for "Today", "Yesterday", or ABdY */
+ 				{
+ 					struct timeval now;
+ 					struct tm tmnow;
+ 					time_t beg_today;
+ 
+ 					gettimeofday(&now,NULL);
+ 					ast_localtime(&now.tv_sec,&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 tm tmnow;
+ 					time_t beg_today;
+ 
+ 					gettimeofday(&now,NULL);
+ 					ast_localtime(&now.tv_sec,&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 < 10) {
+ 					res = wait_file(chan,ints, "digits/0",lang);
+ 					if (!res) {
+ 						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;
+ }
+ 
  /*
  	Convert a number into a semi-localized string. Only for Georgian.
  	res must be of at least 256 bytes, preallocated.