<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17825">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
George Joseph: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_queue.c: Support for Nordic syntax in announcements<br><br>adding support for playing the correct en/et for nordic languages<br>by adding 'n' for neuter gender in the relevant ast_say_number<br><br>ASTERISK-29827<br><br>Change-Id: I03ebc827d2f0dc95132ab2f42799893c70edc5b1<br>---<br>M apps/app_queue.c<br>A doc/CHANGES-staging/app_queue_nordic_language.txt<br>2 files changed, 8 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_queue.c b/apps/app_queue.c</span><br><span>index 8b67ffb..95eb05b 100644</span><br><span>--- a/apps/app_queue.c</span><br><span>+++ b/apps/app_queue.c</span><br><span>@@ -4178,7 +4178,7 @@</span><br><span> res = (</span><br><span> play_file(qe->chan, qe->parent->sound_thereare) ||</span><br><span> ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY,</span><br><span style="color: hsl(0, 100%, 40%);">- ast_channel_language(qe->chan), NULL) || /* Needs gender */</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_language(qe->chan), "n") || /* Needs gender */</span><br><span> play_file(qe->chan, qe->parent->sound_calls));</span><br><span> }</span><br><span> if (res) {</span><br><span>@@ -4209,7 +4209,7 @@</span><br><span> }</span><br><span> </span><br><span> if (avgholdmins >= 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- res = ast_say_number(qe->chan, avgholdmins, AST_DIGIT_ANY, ast_channel_language(qe->chan), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ res = ast_say_number(qe->chan, avgholdmins, AST_DIGIT_ANY, ast_channel_language(qe->chan), "n");</span><br><span> if (res) {</span><br><span> goto playout;</span><br><span> }</span><br><span>@@ -4227,7 +4227,7 @@</span><br><span> }</span><br><span> }</span><br><span> if (avgholdsecs >= 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- res = ast_say_number(qe->chan, avgholdsecs, AST_DIGIT_ANY, ast_channel_language(qe->chan), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ res = ast_say_number(qe->chan, avgholdsecs, AST_DIGIT_ANY, ast_channel_language(qe->chan), "n");</span><br><span> if (res) {</span><br><span> goto playout;</span><br><span> }</span><br><span>@@ -7105,13 +7105,13 @@</span><br><span> holdtime = labs((now - qe->start) / 60);</span><br><span> holdtimesecs = labs((now - qe->start) % 60);</span><br><span> if (holdtime > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_say_number(peer, holdtime, AST_DIGIT_ANY, ast_channel_language(peer), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_say_number(peer, holdtime, AST_DIGIT_ANY, ast_channel_language(peer), "n");</span><br><span> if (play_file(peer, qe->parent->sound_minutes) < 0) {</span><br><span> ast_log(LOG_ERROR, "play_file failed for '%s' on %s\n", qe->parent->sound_minutes, ast_channel_name(peer));</span><br><span> }</span><br><span> }</span><br><span> if (holdtimesecs > 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_say_number(peer, holdtimesecs, AST_DIGIT_ANY, ast_channel_language(peer), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_say_number(peer, holdtimesecs, AST_DIGIT_ANY, ast_channel_language(peer), "n");</span><br><span> if (play_file(peer, qe->parent->sound_seconds) < 0) {</span><br><span> ast_log(LOG_ERROR, "play_file failed for '%s' on %s\n", qe->parent->sound_seconds, ast_channel_name(peer));</span><br><span> }</span><br><span>diff --git a/doc/CHANGES-staging/app_queue_nordic_language.txt b/doc/CHANGES-staging/app_queue_nordic_language.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..72efd78</span><br><span>--- /dev/null</span><br><span>+++ b/doc/CHANGES-staging/app_queue_nordic_language.txt</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: app_queues</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+adding support for playing the correct en/et for nordic languages</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17825">change 17825</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/+/17825"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 19 </div>
<div style="display:none"> Gerrit-Change-Id: I03ebc827d2f0dc95132ab2f42799893c70edc5b1 </div>
<div style="display:none"> Gerrit-Change-Number: 17825 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Mark Petersen <bugs.digium.com@zombie.dk> </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-MessageType: merged </div>