Merged revisions 185468 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r185468 | mmichelson | 2009-03-31 14:45:30 -0500 (Tue, 31 Mar 2009) | 8 lines

  Fix Russian voicemail intro to say the word "messages" properly.

  (closes issue #14736)
  Reported by: chappell
  Patches:
        voicemail_no_messages.diff uploaded by chappell (license 8)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@185469 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 7d3b6e6..ff74c05 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -518,11 +518,6 @@ Dutch also uses:
 Spanish also uses:
 \arg \b vm-youhaveno
 
-Ukrainian requires the following additional soundfile:
-\arg \b vm-nove                'nove'
-\arg \b vm-stare       'stare'
-\arg \b digits/ua/1e   'odne'
-
 Italian requires the following additional soundfile:
 
 For vm_intro_it:
@@ -7320,7 +7315,8 @@ static int vm_intro_multilang(struct ast_channel *chan, struct vm_state *vms, co
        if (!res) {
                if (lastnum == 0) {
                        res = ast_play_and_wait(chan, "vm-no");
-               } else {
+               }
+               if (!res) {
                        res = ast_say_counted_noun(chan, lastnum, "vm-message");
                }
        }