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
This commit is contained in:
parent
838583783f
commit
0b5c6fddf1
|
@ -72,7 +72,7 @@ static int say_stub(struct ast_channel *chan, ...)
|
||||||
* \param num number to say on the channel
|
* \param num number to say on the channel
|
||||||
* \param ints which dtmf to interrupt on
|
* \param ints which dtmf to interrupt on
|
||||||
* \param lang language to speak the number
|
* \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
|
* \details
|
||||||
* Vocally says a number on a given channel
|
* Vocally says a number on a given channel
|
||||||
* \retval 0 on success
|
* \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 num number to say on the channel
|
||||||
* \param ints which dtmf to interrupt on
|
* \param ints which dtmf to interrupt on
|
||||||
* \param lang language to speak the enumeration
|
* \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
|
* \details
|
||||||
* Vocally says an enumeration on a given channel (first, sencond, third, forth, thirtyfirst, hundredth, ....)
|
* 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
|
* Especially useful for dates and messages. Says 'last' if num equals to INT_MAX
|
||||||
|
|
12
main/say.c
12
main/say.c
|
@ -329,10 +329,12 @@ static int say_digit_str_full(struct ast_channel *chan, const char *str, const c
|
||||||
\arg \b hu - Hungarian
|
\arg \b hu - Hungarian
|
||||||
|
|
||||||
\par Gender:
|
\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 '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.
|
\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().
|
Date/Time functions currently have less languages supported than saynumber().
|
||||||
|
|
||||||
|
@ -3024,7 +3026,7 @@ static int ast_say_enumeration_full_vi(struct ast_channel *chan, int num, const
|
||||||
/*! \brief ast_say_enumeration_full_da: Danish syntax */
|
/*! \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)
|
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;
|
int res = 0, t = 0;
|
||||||
char fn[256] = "", fna[256] = "";
|
char fn[256] = "", fna[256] = "";
|
||||||
char *gender;
|
char *gender;
|
||||||
|
@ -3187,7 +3189,7 @@ static int ast_say_enumeration_full_da(struct ast_channel *chan, int num, const
|
||||||
/*! \brief ast_say_enumeration_full_de: German syntax */
|
/*! \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)
|
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;
|
int res = 0, t = 0;
|
||||||
char fn[256] = "", fna[256] = "";
|
char fn[256] = "", fna[256] = "";
|
||||||
char *gender;
|
char *gender;
|
||||||
|
@ -3438,7 +3440,7 @@ static int ast_say_enumeration_full_he(struct ast_channel *chan, int num, const
|
||||||
/*! \brief ast_say_enumeration_full_is: Icelandic syntax */
|
/*! \brief ast_say_enumeration_full_is: Icelandic syntax */
|
||||||
static int ast_say_enumeration_full_is(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
|
static int ast_say_enumeration_full_is(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;
|
int res = 0, t = 0;
|
||||||
char fn[256] = "", fna[256] = "";
|
char fn[256] = "", fna[256] = "";
|
||||||
char *gender;
|
char *gender;
|
||||||
|
|
Loading…
Reference in New Issue