<p>Kevin Harwell <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13863">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Benjamin Keith Ford: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">say: Remove unused "plural" option from main/say<br><br>There are exceptions for plural objects, but they are detected using the<br>supplied NUMBER, not using an extra option.<br><br>Change-Id: I95d1d1b2796b1aba92048a2dbae8a3856ed8a113<br>---<br>M include/asterisk/say.h<br>M main/say.c<br>2 files changed, 9 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/say.h b/include/asterisk/say.h</span><br><span>index 93c525d..a4aa90c 100644</span><br><span>--- a/include/asterisk/say.h</span><br><span>+++ b/include/asterisk/say.h</span><br><span>@@ -72,7 +72,7 @@</span><br><span> * \param num number to say on the channel</span><br><span> * \param ints which dtmf to interrupt on</span><br><span> * \param lang language to speak the number</span><br><span style="color: hsl(0, 100%, 40%);">- * \param options set to 'f' for female, 'm' for male, 'c' for commune, 'n' for neuter, 'p' for plural</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param options set to 'f' for female, 'm' for male, 'c' for commune, 'n' for neuter</span><br><span> * \details</span><br><span> * Vocally says a number on a given channel</span><br><span> * \retval 0 on success</span><br><span>@@ -91,7 +91,7 @@</span><br><span> * \param num number to say on the channel</span><br><span> * \param ints which dtmf to interrupt on</span><br><span> * \param lang language to speak the enumeration</span><br><span style="color: hsl(0, 100%, 40%);">- * \param options set to 'f' for female, 'm' for male, 'c' for commune, 'n' for neuter, 'p' for plural</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param options set to 'f' for female, 'm' for male, 'c' for commune, 'n' for neuter</span><br><span> * \details</span><br><span> * Vocally says an enumeration on a given channel (first, sencond, third, forth, thirtyfirst, hundredth, ....)</span><br><span> * Especially useful for dates and messages. Says 'last' if num equals to INT_MAX</span><br><span>diff --git a/main/say.c b/main/say.c</span><br><span>index e1b0620..71d04f1 100644</span><br><span>--- a/main/say.c</span><br><span>+++ b/main/say.c</span><br><span>@@ -329,10 +329,12 @@</span><br><span> \arg \b hu - Hungarian</span><br><span> </span><br><span> \par Gender:</span><br><span style="color: hsl(0, 100%, 40%);">- For Some languages the numbers differ for gender and plural.</span><br><span style="color: hsl(120, 100%, 40%);">+ For some languages the numbers differ for gender of the countable object.</span><br><span style="color: hsl(120, 100%, 40%);">+ Commonly for "one", like "un"/"une" in French. Note that the interface</span><br><span style="color: hsl(120, 100%, 40%);">+ is somewhat peculiar, as differing languages can have conflicting</span><br><span style="color: hsl(120, 100%, 40%);">+ genders.</span><br><span> \arg Use the option argument 'f' for female, 'm' for male and 'n' for neuter in languages like Portuguese, French, Spanish and German.</span><br><span> \arg use the option argument 'c' is for commune and 'n' for neuter gender in nordic languages like Danish, Swedish and Norwegian.</span><br><span style="color: hsl(0, 100%, 40%);">- use the option argument 'p' for plural enumerations like in German</span><br><span> </span><br><span> Date/Time functions currently have less languages supported than saynumber().</span><br><span> </span><br><span>@@ -3024,7 +3026,7 @@</span><br><span> /*! \brief ast_say_enumeration_full_da: Danish syntax */</span><br><span> 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)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender; 'p' plural */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender */</span><br><span> int res = 0, t = 0;</span><br><span> char fn[256] = "", fna[256] = "";</span><br><span> char *gender;</span><br><span>@@ -3187,7 +3189,7 @@</span><br><span> /*! \brief ast_say_enumeration_full_de: German syntax */</span><br><span> 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)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender; 'p' plural */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender */</span><br><span> int res = 0, t = 0;</span><br><span> char fn[256] = "", fna[256] = "";</span><br><span> char *gender;</span><br><span>@@ -3438,7 +3440,7 @@</span><br><span> /*! \brief ast_say_enumeration_full_is: Icelandic syntax */</span><br><span> 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)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender; 'p' plural */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* options can be: '' or 'm' male gender; 'f' female gender; 'n' neuter gender */</span><br><span> int res = 0, t = 0;</span><br><span> char fn[256] = "", fna[256] = "";</span><br><span> char *gender;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13863">change 13863</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/13863"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17 </div>
<div style="display:none"> Gerrit-Change-Id: I95d1d1b2796b1aba92048a2dbae8a3856ed8a113 </div>
<div style="display:none"> Gerrit-Change-Number: 13863 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Walter Doekes <walter+asterisk@wjd.nu> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>