[asterisk-commits] russell: branch russell/sla_rewrite r51362 - in /team/russell/sla_rewrite: ./...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Jan 22 10:50:06 2007
New Revision: 51362

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51362
Log:
Merged revisions 51348,51350,51360 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r51348 | qwell | 2007-01-20 00:16:06 -0600 (Sat, 20 Jan 2007) | 8 lines

Fix German language support in say.conf

Properly support 21, 31, 41, 51, 61, 71, 81, and 91.
  einundzwanzig has the same format as zweiundzwanzig (as do all other "_ZX" spoken numerals)

Fix support for numbers in the 10,000,000 to 99,999,999 range.
Add support for numbers in the 100,000,000 to 999,999,999 range.

................
r51350 | qwell | 2007-01-20 00:53:49 -0600 (Sat, 20 Jan 2007) | 5 lines

Fix Italian numeral support in say.conf for "_[2-9]00" case.

"2131" would've translated to something along the lines of (pardon my..Italian {or lack thereof})
  "duecentocentotrentuno", which makes no sense at all.

................
r51360 | file | 2007-01-22 10:28:11 -0600 (Mon, 22 Jan 2007) | 9 lines

Blocked revisions 51359 via svnmerge

........
r51359 | file | 2007-01-22 11:23:03 -0500 (Mon, 22 Jan 2007) | 2 lines

Explicitly declare what codecs are supported by default globally since using a bitmask for all may include ones we don't need. (issue #8357 reported by gknispel_proformatique)

........

................

Modified:
    team/russell/sla_rewrite/   (props changed)
    team/russell/sla_rewrite/configs/say.conf.sample

Propchange: team/russell/sla_rewrite/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/russell/sla_rewrite/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 22 10:50:06 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-51345
+/branches/1.4:1-51361

Modified: team/russell/sla_rewrite/configs/say.conf.sample
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/configs/say.conf.sample?view=diff&rev=51362&r1=51361&r2=51362
==============================================================================
--- team/russell/sla_rewrite/configs/say.conf.sample (original)
+++ team/russell/sla_rewrite/configs/say.conf.sample Mon Jan 22 10:50:06 2007
@@ -126,7 +126,7 @@
     _[n]um:[2-9]0 =>  digits/${SAY}
     _[n]um:[2-9][1-9] =>  digits/${SAY:0:1}0, num:${SAY:1}
     _[n]um:1XX => digits/hundred, num:${SAY:1}
-    _[n]um:[2-9]1XX => num:${SAY:0:1}, digits/hundred, num:${SAY:1}
+    _[n]um:[2-9]XX => num:${SAY:0:1}, digits/hundred, num:${SAY:1}
 
     _[n]um:1XXX => digits/thousand, num:${SAY:1}
     _[n]um:[2-9]XXX => num:${SAY:0:1}, digits/thousands, num:${SAY:1}
@@ -147,13 +147,12 @@
     _date::. => date:AdBY:${SAY}
     _time::. => date:IMp:${SAY}
 
-
 [de](date-base,digit-base)
     _[n]um:0. => num:${SAY:1}
     _[n]um:X => digits/${SAY}
     _[n]um:1X => digits/${SAY}
     _[n]um:[2-9]0 => digits/${SAY}
-    _[n]um:[2-9][2-9] => digits/${SAY:1}-and, digits/${SAY:0:1}0
+    _[n]um:[2-9][1-9] => digits/${SAY:1}-and, digits/${SAY:0:1}0
     _[n]um:1XX => digits/ein, digits/hundred, num:${SAY:1}
     _[n]um:[2-9]XX => digits/${SAY:0:1}, digits/hundred, num:${SAY:1}
     _[n]um:1XXX => digits/ein, digits/thousand, num:${SAY:1}
@@ -163,7 +162,8 @@
     _[n]um:XXXXXX => digits/${SAY:0:1}, digits/hundred, num:${SAY:1}
     _[n]um:1XXXXXX => digits/eine, digits/million, num:${SAY:1}
     _[n]um:[2-9]XXXXXX => digits/${SAY:0:1}, digits/millions, num:${SAY:1}
-    _[n]um:XXXXXXXX => num:${SAY:0:1}, digits/millions, num:${SAY:2}
+    _[n]um:XXXXXXXX => num:${SAY:0:2}, digits/millions, num:${SAY:2}
+    _[n]um:XXXXXXXXX => num:${SAY:0:3}, digits/millions, num:${SAY:3}
 
     _datetime::. => date:AdBY 'digits/at' IMp:${SAY}
     _date::. => date:AdBY:${SAY}