Merge pull request #1250 in FS/freeswitch from ~MERWAN/freeswitch:master to master

* commit '8132248ba3ef9828ba9c2e00395aea7b7ceea174':
  [FS-10155] French digits are not spelled right
This commit is contained in:
Mike Jerris 2017-04-26 22:30:32 +00:00
commit 9b0f71b4c5
1 changed files with 10 additions and 2 deletions

View File

@ -110,17 +110,25 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
} else {
say_file("digits/%d%d.wav", b, c);
}
} else {
if (b == 7 || b == 9) {
say_file("digits/%d0.wav", b-1);
} else {
say_file("digits/%d0.wav", b);
}
}
}
if (c || (ftdNumber == 1 && (a || b || c))) {
if (c || ((ftdNumber == 1 && (a || b || c)) && (a && (b || c)))) {
/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "a=%d b=[%d] c=%d\n",a, b,c);*/
int fVal = c;
if (ftdNumber == 1)
fVal = itd;
if (b == 7 || b == 9) {
fVal += 10;
}
if (method == SSM_COUNTED) {
say_file("digits/h-%d.wav", fVal);
} else {