Merged revisions 373769,373774 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r373769 | mmichelson | 2012-09-25 17:54:13 -0500 (Tue, 25 Sep 2012) | 11 lines

  Remove dead code and documentation for nonexistent feature.

  multiplelogin was removed from chan_agent back in 1.6.0 when
  AgentCallbackLogin() was removed.

  (closes issue AST-948)
  reported by Steve Pitts
  ........

  Merged revisions 373768 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r373774 | mmichelson | 2012-09-25 18:08:46 -0500 (Tue, 25 Sep 2012) | 10 lines

  Fix saying of date in Dutch.

  The Dutch say the date before the month.

  (closes issue ASTERISK-20353)
  Reported by: Teun Ouwehand
  ........

  Merged revisions 373773 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@373803 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 49ed7f9818a8773b6cf71b425aa8d9e772a6a522..de8842d368ffe99433abde9199cffc8d07f779ae 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -223,7 +223,6 @@ static int autologoff;
 static int wrapuptime;
 static int ackcall;
 static int endcall;
-static int multiplelogin = 1;
 static int autologoffunavail = 0;
 static char acceptdtmf = DEFAULT_ACCEPTDTMF;
 static char enddtmf = DEFAULT_ENDDTMF;
@@ -1195,9 +1194,6 @@ static int read_agent_config(int reload)
        urlprefix[0] = '\0';
        savecallsin[0] = '\0';
 
-       /* Read in [general] section for persistence */
-       multiplelogin = ast_true(ast_variable_retrieve(cfg, "general", "multiplelogin"));
-
        /* Read in the [agents] section */
        v = ast_variable_browse(cfg, "agents");
        while(v) {

diff --git a/configs/agents.conf.sample b/configs/agents.conf.sample
index c92872198b5250900ffdcbff4161d5ed6733415c..29e6e07eadbb4e8ed5269ae3dbd8bf727b750666 100644 (file)
--- a/configs/agents.conf.sample
+++ b/configs/agents.conf.sample
@@ -3,9 +3,6 @@
 ;
 
 [general]
-; Enable or disable a single extension from logging in as multiple agents.
-; The default value is "yes".
-;multiplelogin=yes
 
 [agents]
 ;

diff --git a/main/say.c b/main/say.c
index e71df657bd4555d3cbe98872845e802a42698d03..bca1eb0463be8cc73eeee11e519f145956eb9ebf 100644 (file)
--- a/main/say.c
+++ b/main/say.c
@@ -5298,7 +5298,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
        char sndfile[256], nextmsg[256];
 
        if (format == NULL)
-               format = "ABdY 'digits/at' IMp";
+               format = "AdBY 'digits/at' IMp";
 
        ast_localtime(&when, &tm, tzone);
 
@@ -5420,7 +5420,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
                                res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'Q':
-                               /* Shorthand for "Today", "Yesterday", or ABdY */
+                               /* Shorthand for "Today", "Yesterday", or AdBY */
                                /* XXX As emphasized elsewhere, this should the native way in your
                                 * language to say the date, with changes in what you say, depending
                                 * upon how recent the date is. XXX */
@@ -5440,12 +5440,12 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
                                                /* Yesterday */
                                                res = wait_file(chan, ints, "digits/yesterday", lang);
                                        } else {
-                                               res = ast_say_date_with_format_nl(chan, t, ints, lang, "ABdY", tzone);
+                                               res = ast_say_date_with_format_nl(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;
                        case 'q':
-                               /* Shorthand for "" (today), "Yesterday", A (weekday), or ABdY */
+                               /* Shorthand for "" (today), "Yesterday", A (weekday), or AdBY */
                                {
                                        struct timeval now = ast_tvnow();
                                        struct ast_tm tmnow;
@@ -5464,7 +5464,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
                                                /* Within the last week */
                                                res = ast_say_date_with_format_nl(chan, t, ints, lang, "A", tzone);
                                        } else {
-                                               res = ast_say_date_with_format_nl(chan, t, ints, lang, "ABdY", tzone);
+                                               res = ast_say_date_with_format_nl(chan, t, ints, lang, "AdBY", tzone);
                                        }
                                }
                                break;