From 7a38157ce501a8b4bd223cd1005f4932026daf7d Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Thu, 29 Jan 2015 16:17:52 +0100 Subject: [PATCH] MT#11239 MT#11219 rename prompts x1..9 to 1..9-and (cherry picked from commit a69ba12ae0660f966d678ed7b9d3316ac6f54f10) --- debian/patches/series | 1 + .../patches/sipwise/0006-rename_xdigits.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 debian/patches/sipwise/0006-rename_xdigits.patch diff --git a/debian/patches/series b/debian/patches/series index 1f6173e1..7795481a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,5 +4,6 @@ sipwise/0002-dsm-mod_conference-conference.playMixInList-action.patch sipwise/0003-dsm-mod_utils-utils.getCountRight-getCountLeft-actio.patch sipwise/0004-dsm-arrayIndex-action-get-the-index-of-a-string-in-a.patch sipwise/0005-dsm-clearArray-and-clearStruct-actions.patch +sipwise/0006-rename_xdigits.patch no_config.patch py_sems_path.patch diff --git a/debian/patches/sipwise/0006-rename_xdigits.patch b/debian/patches/sipwise/0006-rename_xdigits.patch new file mode 100644 index 00000000..09fef04d --- /dev/null +++ b/debian/patches/sipwise/0006-rename_xdigits.patch @@ -0,0 +1,36 @@ +commit d1f87cfcb35f4fe27078f7760e9b4a5fff8e189c +Author: Andrew Pogrebennyk +Date: Thu Jan 29 12:04:00 2015 +0100 + + rename prompts x1..9.wav to 1..9-and.wav + +diff --git a/apps/dsm/mods/mod_utils/ModUtils.cpp b/apps/dsm/mods/mod_utils/ModUtils.cpp +index 03acf43..1a8f649 100644 +--- a/apps/dsm/mods/mod_utils/ModUtils.cpp ++++ b/apps/dsm/mods/mod_utils/ModUtils.cpp +@@ -90,10 +90,10 @@ vector utils_get_count_files(DSMSession* sc_sess, unsigned int cnt, + if (right) { + // language has single digits before 10s + res.push_back(basedir+int2str(num.quot * 10)+suffix); +- res.push_back(basedir+("x"+int2str(num.rem))+suffix); ++ res.push_back(basedir+(int2str(num.rem)+"-and")+suffix); + } else { + // language has single digits before 10s +- res.push_back(basedir+("x"+int2str(num.rem))+suffix); ++ res.push_back(basedir+(int2str(num.rem)+"-and")+suffix); + res.push_back(basedir+int2str(num.quot * 10)+suffix); + } + +@@ -129,10 +129,10 @@ bool utils_play_count(DSMSession* sc_sess, unsigned int cnt, + if (right) { + // language has single digits before 10s + sc_sess->playFile(basedir+int2str(num.quot * 10)+suffix, false); +- sc_sess->playFile(basedir+("x"+int2str(num.rem))+suffix, false); ++ sc_sess->playFile(basedir+(int2str(num.rem)+"-and")+suffix, false); + } else { + // language has single digits before 10s +- sc_sess->playFile(basedir+("x"+int2str(num.rem))+suffix, false); ++ sc_sess->playFile(basedir+(int2str(num.rem)+"-and")+suffix, false); + sc_sess->playFile(basedir+int2str(num.quot * 10)+suffix, false); + } +