German language improvements (bug #1606)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2948 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 95 insertions, 25 deletions

diff --git a/contrib/i18n.testsuite.conf b/contrib/i18n.testsuite.conf
index 7be99dbe0..8c4d1f705 100755
--- a/contrib/i18n.testsuite.conf
+++ b/contrib/i18n.testsuite.conf
@@ -4,63 +4,133 @@
 exten => 841,1,Answer
 exten => 841,2,Wait,1		; Allow VoIP sessions time to initialise
 exten => 841,3,SetLanguage(en)
-exten => 841,4,SayNumber(183)	; one hundred eighty three (NB This sounds wrong to me!)
+exten => 841,4,SayNumber(183)	; one hundred eighty three (NB UK English would say one hundred & eighty three)
+exten => 841,5,Wait,1
+exten => 841,6,SayUnixTime()	; Say current date & time in "ABdY 'digits/at' IMp" format
 ; French
 exten => 842,1,Answer
 exten => 842,2,Wait,1		; Allow VoIP sessions time to initialise
 exten => 842,3,SetLanguage(fr)
-exten => 842,4,SayNumber(183)	; hundred eighty three
-exten => 842,5,SayNumber(283)	; two hundred eighty three
-exten => 842,6,SayNumber(1063)	; thousand sixty three
-exten => 842,7,SayNumber(2063)	; two thousand sixty three
+exten => 842,4,SayNumber(1)	; one
+exten => 842,5,Wait,1
+exten => 842,6,SayNumber(1,f)	; one (feminine)
+exten => 842,7,Wait,1
+exten => 842,8,SayNumber(181)	; hundred eighty three
+exten => 842,9,Wait,1
+exten => 842,10,SayNumber(281)	; two hundred eighty three
+exten => 842,11,Wait,1
+exten => 842,12,SayNumber(1061)	; thousand sixty three
+exten => 842,13,Wait,1
+exten => 842,14,SayNumber(2061)	; two thousand sixty three
+exten => 842,15,Wait,1
+exten => 842,16,SayUnixTime()
 ; Spanish
 exten => 843,1,Answer
 exten => 843,2,Wait,1		; Allow VoIP sessions time to initialise
 exten => 843,3,SetLanguage(es)
-exten => 843,4,SayNumber(21)	; "twentyone"
-exten => 843,5,SayNumber(200)	; "twohundred"
-exten => 843,6,SayNumber(1000000)	; one million
-exten => 843,7,SayNumber(2000000)	; two millions
+exten => 843,4,Playback(digits/hundred)
+exten => 843,5,Wait,1
+exten => 843,6,SayNumber(1)	; one
+exten => 843,7,Wait,1
+exten => 843,8,SayNumber(1,f)	; one (feminine)
+exten => 843,9,Wait,1
+exten => 843,10,SayNumber(11)	; "dieci uno"
+exten => 843,11,Wait,1
+exten => 843,12,SayNumber(21)	; "veinti uno"
+exten => 843,13,Wait,1
+exten => 843,14,SayNumber(31)	; "thirty & one"
+exten => 843,15,Wait,1
+exten => 843,16,SayNumber(100)	; "cien"
+exten => 843,17,Wait,1
+exten => 843,18,SayNumber(101)	; "ciento uno"
+exten => 843,19,Wait,1
+exten => 843,20,SayNumber(200)	; "twohundred"
+exten => 843,21,Wait,1
+exten => 843,22,SayNumber(1000000)	; one million
+exten => 843,23,Wait,1
+exten => 843,24,SayNumber(2000000)	; two millions
+exten => 843,25,Wait,1
+exten => 843,26,SayUnixTime()
 ; Portuguese
 exten => 844,1,Answer
 exten => 844,2,Wait,1		; Allow VoIP sessions time to initialise
 exten => 844,3,SetLanguage(pt)
 exten => 844,4,SayNumber(1)	; one
-exten => 844,5,SayNumber(1,f)	; one (feminine)
-exten => 844,6,SayNumber(2)	; two
-exten => 844,7,SayNumber(2,f)	; two (feminine)
-exten => 844,8,SayNumber(183)	; hundred& eighty three
+exten => 844,5,Wait,1
+exten => 844,6,SayNumber(1,f)	; one (feminine)
+exten => 844,7,Wait,1
+exten => 844,8,SayNumber(2)	; two
+exten => 844,9,Wait,1
+exten => 844,10,SayNumber(2,f)	; two (feminine)
+exten => 844,11,Wait,1
+exten => 844,12,SayNumber(183)	; hundred& eighty three
+exten => 844,13,Wait,1
+exten => 844,14,SayUnixTime()
 ; Italian
 exten => 845,1,Answer
 exten => 845,2,Wait,1		; Allow VoIP sessions time to initialise
 exten => 845,3,SetLanguage(it)
 exten => 845,4,SayNumber(21)	; "twentyone"
-exten => 845,5,SayNumber(183)	; hundred eighty three
-exten => 845,6,SayNumber(283)	; two hundred eighty three
-exten => 845,7,SayNumber(1063)	; thousand sixty three
-exten => 845,8,SayNumber(2063)	; two thousands sixty three
+exten => 845,5,Wait,1
+exten => 845,6,SayNumber(183)	; hundred eighty three
+exten => 845,7,Wait,1
+exten => 845,8,SayNumber(283)	; two hundred eighty three
+exten => 845,9,SayNumber(1063)	; thousand sixty three
+exten => 845,10,Wait,1
+exten => 845,11,SayNumber(2063)	; two thousands sixty three
+exten => 845,12,Wait,1
+exten => 845,13,SayUnixTime()
 ; Dutch
 exten => 846,1,Answer
 exten => 846,2,Wait,1		; Allow VoIP sessions time to initialise
 exten => 846,3,SetLanguage(nl)
+exten => 846,4,SayUnixTime(||ABdY'digits/at'R)
+exten => 846,5,Wait,1
 ; Danish
 exten => 847,1,Answer
 exten => 847,2,Wait,1		; Allow VoIP sessions time to initialise
 exten => 847,3,SetLanguage(da)
 exten => 847,4,SayNumber(68)	; eight-& sixty
-exten => 847,5,SayNumber(2034)	; two thousand & four-& thirty
-exten => 847,6,SayNumber(1000000)	; one million
-exten => 847,7,SayNumber(2000000)	; two millions
-; German (not yet implemented)
+exten => 847,5,Wait,1
+exten => 847,6,SayNumber(2034)	; two thousand & four-& thirty
+exten => 847,7,Wait,1
+exten => 847,8,SayNumber(1000000)	; one million
+exten => 847,9,Wait,1
+exten => 847,10,SayNumber(2000000)	; two millions
+exten => 847,11,Wait,1
+exten => 847,12,SayUnixTime()
+; German
 exten => 848,1,Answer
 exten => 848,2,Wait,1		; Allow VoIP sessions time to initialise
 exten => 848,3,SetLanguage(de)
 exten => 848,4,SayNumber(68)	; eight-& sixty
-exten => 848,5,SayNumber(2034)	; two thousand & four-& thirty
-exten => 848,6,SayNumber(1000000)	; one million
-exten => 848,7,SayNumber(2000000)	; two millions
+exten => 848,5,Wait,1
+exten => 848,6,SayNumber(100)	; "hundert"
+exten => 848,7,Wait,1
+exten => 848,8,SayNumber(101)	; "einhundert-einS"
+exten => 848,9,Wait,1
+exten => 848,10,SayNumber(1000)	; "tausend"
+exten => 848,11,Wait,1
+exten => 848,12,SayNumber(1001)	; "eintausend-einS" X tausend-einS
+exten => 848,13,Wait,1
+exten => 848,14,SayNumber(2134)	; two thousand one hundred four-& thirty
+exten => 848,15,Wait,1
+exten => 848,16,SayNumber(1001000)	; one million one thousand X million tausend
+exten => 848,17,Wait,1
+exten => 848,18,SayNumber(2002000)	; two millions two thousand
+exten => 848,19,Wait,1
+exten => 848,20,SayUnixTime()
 ; Swedish
 exten => 849,1,Answer
 exten => 849,2,Wait,1		; Allow VoIP sessions time to initialise
 exten => 849,3,SetLanguage(se)
-
+exten => 849,4,SayUnixTime()
+exten => 849,5,Wait,1
+; Temp
+exten => 850,1,Answer
+exten => 850,2,Wait,1		; Allow VoIP sessions time to initialise
+exten => 850,3,SetLanguage(de)
+exten => 850,4,Playback(digits/1)
+exten => 850,5,Wait,1
+exten => 850,6,Playback(digits/de-eins)
+exten => 850,7,Wait,1