say: Remove unused "plural" option from main/say

There are exceptions for plural objects, but they are detected using the
supplied NUMBER, not using an extra option.

Change-Id: I95d1d1b2796b1aba92048a2dbae8a3856ed8a113

diff --git a/include/asterisk/say.h b/include/asterisk/say.h
index 93c525dd21c21ac584254b32b6243d7ea56a593a..a4aa90cdf38b99e7179c21a8619804279e427adc 100644 (file)
--- a/include/asterisk/say.h
+++ b/include/asterisk/say.h
@@ -72,7 +72,7 @@ static int say_stub(struct ast_channel *chan, ...)
  * \param num number to say on the channel
  * \param ints which dtmf to interrupt on
  * \param lang language to speak the number
- * \param options set to 'f' for female, 'm' for male, 'c' for commune, 'n' for neuter, 'p' for plural
+ * \param options set to 'f' for female, 'm' for male, 'c' for commune, 'n' for neuter
  * \details
  * Vocally says a number on a given channel
  * \retval 0 on success
@@ -91,7 +91,7 @@ SAY_EXTERN int (* ast_say_number_full)(struct ast_channel *chan, int num, const
  * \param num number to say on the channel
  * \param ints which dtmf to interrupt on
  * \param lang language to speak the enumeration
- * \param options set to 'f' for female, 'm' for male, 'c' for commune, 'n' for neuter, 'p' for plural
+ * \param options set to 'f' for female, 'm' for male, 'c' for commune, 'n' for neuter
  * \details
  * Vocally says an enumeration on a given channel (first, sencond, third, forth, thirtyfirst, hundredth, ....)
  * Especially useful for dates and messages. Says 'last' if num equals to INT_MAX

diff --git a/main/say.c b/main/say.c
index c3f546c601a95f6ab29ea9ffd0a50b731b2ad035..eae1769ad543bfedb055e9200ca2e93d79012f01 100644 (file)
--- a/main/say.c
+++ b/main/say.c
@@ -330,10 +330,12 @@ static int say_digit_str_full(struct ast_channel *chan, const char *str, const c
       \arg \b hu    - Hungarian
 
  \par Gender:
- For Some languages the numbers differ for gender and plural.
+ For some languages the numbers differ for gender of the countable object.
+ Commonly for "one", like "un"/"une" in French. Note that the interface
+ is somewhat peculiar, as differing languages can have conflicting
+ genders.
  \arg Use the option argument 'f' for female, 'm' for male and 'n' for neuter in languages like Portuguese, French, Spanish and German.
  \arg use the option argument 'c' is for commune and 'n' for neuter gender in nordic languages like Danish, Swedish and Norwegian.
- use the option argument 'p' for plural enumerations like in German
 
  Date/Time functions currently have less languages supported than saynumber().
 
@@ -2918,7 +2920,7 @@ static int ast_say_enumeration_full_vi(struct ast_channel *chan, int num, const
 /*! \brief  ast_say_enumeration_full_da: Danish syntax */
 static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
-       /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender; 'p' plural */
+       /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender */
        int res = 0, t = 0;
        char fn[256] = "", fna[256] = "";
        char *gender;
@@ -3081,7 +3083,7 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
 /*! \brief  ast_say_enumeration_full_de: German syntax */
 static int ast_say_enumeration_full_de(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
-       /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender; 'p' plural */
+       /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender */
        int res = 0, t = 0;
        char fn[256] = "", fna[256] = "";
        char *gender;