<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6067">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">say.c: Fix file locations for second, seconds, minute, minutes files<br><br>The seconds and minutes files have always existed in the base language<br>directory of the Core package. So say.c has always been calling the wrong<br>location (under digits/) for those two files and in the case of second and<br>minute they didn't exist in the Core packages at all.<br><br>The 1.6 sounds release moves the second and minute files into Core from<br>Extra for the languages that already had them. A future release will include<br>the second and minute files for languages that didn't already have them.<br><br>This patch just changes all the target locations for second, seconds,<br>minute, and minutes that were under the digits subdir to be under the root of<br>sounds instead. Which is where the sounds will be for some languages after 1.6<br>sounds and for all languages after a future release.<br><br>ASTERISK-25810 #close<br><br>Change-Id: I05d9d4bee6a7237030530a46e7eb3df15f13f702<br>Reported-by: Nicolas Riendeau<br>---<br>M main/say.c<br>1 file changed, 21 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/say.c b/main/say.c<br>index 1624194..48bd0ee 100644<br>--- a/main/say.c<br>+++ b/main/say.c<br>@@ -4082,9 +4082,9 @@<br> }<br> if (!res && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */<br> if (tm.tm_min == 1) {<br>- res = wait_file(chan, ints, "digits/minute", lang);<br>+ res = wait_file(chan, ints, "minute", lang);<br> } else {<br>- res = wait_file(chan, ints, "digits/minutes", lang);<br>+ res = wait_file(chan, ints, "minutes", lang);<br> }<br> }<br> break;<br>@@ -4158,7 +4158,7 @@<br> if (!res) {<br> res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");<br> if (!res) {<br>- res = wait_file(chan, ints, "digits/seconds", lang);<br>+ res = wait_file(chan, ints, "seconds", lang);<br> }<br> }<br> break;<br>@@ -4285,9 +4285,9 @@<br> <br> if (!res && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */<br> if (tm.tm_min == 1) {<br>- res = wait_file(chan, ints, "digits/minute", lang);<br>+ res = wait_file(chan, ints, "minute", lang);<br> } else {<br>- res = wait_file(chan, ints, "digits/minutes", lang);<br>+ res = wait_file(chan, ints, "minutes", lang);<br> }<br> }<br> break;<br>@@ -4361,7 +4361,7 @@<br> if (!res) {<br> res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");<br> if (!res) {<br>- res = wait_file(chan, ints, tm.tm_sec == 1 ? "digits/second" : "digits/seconds", lang);<br>+ res = wait_file(chan, ints, tm.tm_sec == 1 ? "second" : "seconds", lang);<br> }<br> }<br> break;<br>@@ -5081,7 +5081,7 @@<br> /* Seconds */<br> res = ast_say_number(chan, tm.tm_sec, ints, lang, (char * ) NULL);<br> if (!res) {<br>- res = wait_file(chan, ints, "digits/second", lang);<br>+ res = wait_file(chan, ints, "second", lang);<br> }<br> break;<br> case 'T':<br>@@ -5732,9 +5732,9 @@<br> one = tm.tm_sec % 10;<br> <br> if (one > 1 && one < 5 && ten != 1)<br>- res = wait_file(chan, ints, "digits/seconds", lang);<br>+ res = wait_file(chan, ints, "seconds", lang);<br> else<br>- res = wait_file(chan, ints, "digits/second", lang);<br>+ res = wait_file(chan, ints, "second", lang);<br> }<br> }<br> }<br>@@ -5898,9 +5898,9 @@<br> res = ast_say_number(chan, tm.tm_min, ints, lang, NULL);<br> if (!res) {<br> if (tm.tm_min > 1) {<br>- res = wait_file(chan, ints, "digits/minutes", lang);<br>+ res = wait_file(chan, ints, "minutes", lang);<br> } else {<br>- res = wait_file(chan, ints, "digits/minute", lang);<br>+ res = wait_file(chan, ints, "minute", lang);<br> }<br> }<br> } else {<br>@@ -5996,9 +5996,9 @@<br> res = ast_say_number(chan, tm.tm_sec, ints, lang, NULL);<br> if (!res) {<br> if (tm.tm_sec > 1) {<br>- res = wait_file(chan, ints, "digits/seconds", lang);<br>+ res = wait_file(chan, ints, "seconds", lang);<br> } else {<br>- res = wait_file(chan, ints, "digits/second", lang);<br>+ res = wait_file(chan, ints, "second", lang);<br> }<br> }<br> } else {<br>@@ -6212,7 +6212,7 @@<br> }<br> }<br> if (!res) {<br>- res = wait_file(chan, ints, "digits/minute", lang);<br>+ res = wait_file(chan, ints, "minute", lang);<br> }<br> break;<br> case 'P':<br>@@ -6296,7 +6296,7 @@<br> }<br> }<br> if (!res) {<br>- res = wait_file(chan, ints, "digits/second", lang);<br>+ res = wait_file(chan, ints, "second", lang);<br> }<br> break;<br> case 'T':<br>@@ -6451,7 +6451,7 @@<br> if (tm.tm_min > 0) {<br> res = ast_say_number(chan, tm.tm_min, ints, lang, "f");<br> if (!res)<br>- res = ast_streamfile(chan, "digits/minute", lang);<br>+ res = ast_streamfile(chan, "minute", lang);<br> }<br> return res;<br> }<br>@@ -6546,9 +6546,9 @@<br> res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);<br> if (!res) {<br> if (tm.tm_min > 1)<br>- res = wait_file(chan, ints, "digits/minutes", lang);<br>+ res = wait_file(chan, ints, "minutes", lang);<br> else<br>- res = wait_file(chan, ints, "digits/minute", lang);<br>+ res = wait_file(chan, ints, "minute", lang);<br> }<br> }<br> return res;<br>@@ -6608,7 +6608,7 @@<br> if (!res)<br> res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);<br> if (!res)<br>- res = ast_streamfile(chan, "digits/minute", lang);<br>+ res = ast_streamfile(chan, "minute", lang);<br> if (!res)<br> res = ast_waitstream(chan, ints);<br> return res;<br>@@ -7031,7 +7031,7 @@<br> if (!res)<br> res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);<br> if (!res)<br>- res = ast_streamfile(chan, "digits/minute", lang);<br>+ res = ast_streamfile(chan, "minute", lang);<br> if (!res)<br> res = ast_waitstream(chan, ints);<br> return res;<br>@@ -7909,7 +7909,7 @@<br> if (!res)<br> res = ast_say_number_full_gr(chan, tm.tm_sec, ints, lang, -1, -1);<br> if (!res)<br>- ast_copy_string(nextmsg, "digits/seconds", sizeof(nextmsg));<br>+ ast_copy_string(nextmsg, "seconds", sizeof(nextmsg));<br> res = wait_file(chan, ints, nextmsg, lang);<br> break;<br> case 'T':<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6067">change 6067</a>. To unsubscribe, 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/6067"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I05d9d4bee6a7237030530a46e7eb3df15f13f702 </div>
<div style="display:none"> Gerrit-Change-Number: 6067 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Rusty Newton <rnewton@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>