summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/lang/english.lang17
-rw-r--r--apps/menus/main_menu.c20
2 files changed, 32 insertions, 5 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 29e2d1df79..02296bd2ab 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -11105,3 +11105,20 @@
11105 rtc: "A M" 11105 rtc: "A M"
11106 </voice> 11106 </voice>
11107</phrase> 11107</phrase>
11108<phrase>
11109 id: VOICE_OH
11110 desc: spoken only, for wall clock announce
11111 user:
11112 <source>
11113 *: none
11114 rtc: ""
11115 </source>
11116 <dest>
11117 *: none
11118 rtc: ""
11119 </dest>
11120 <voice>
11121 *: none
11122 rtc: "oh"
11123 </voice>
11124</phrase>
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index b6fee4416d..822301fe52 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -227,30 +227,40 @@ static bool show_info(void)
227 /* Voice the minutes */ 227 /* Voice the minutes */
228 if (tm->tm_min == 0) 228 if (tm->tm_min == 0)
229 { 229 {
230 /*say o'clock if the minute is 0. */ 230 /* Say o'clock if the minute is 0. */
231 talk_id(VOICE_OCLOCK, true); 231 talk_id(VOICE_OCLOCK, true);
232 } 232 }
233 else 233 else
234 { 234 {
235 /* Pronounce the leading 0 */
236 if(tm->tm_min < 10)
237 {
238 talk_id(VOICE_OH, true);
239 }
235 talk_number(tm->tm_min, true); 240 talk_number(tm->tm_min, true);
236 } 241 }
237
238 talk_id(am_pm_id, true); 242 talk_id(am_pm_id, true);
239 } 243 }
240 else 244 else
241 { 245 {
242 /*voice the time in 24 hour format*/ 246 /* Voice the time in 24 hour format */
243 talk_number(tm->tm_hour, true); 247 talk_number(tm->tm_hour, true);
244 if (tm->tm_min == 0) 248 if (tm->tm_min == 0)
245 { 249 {
246 /*say o'clock if the minute is 0. */ 250 talk_id(VOICE_HUNDRED, true);
247 talk_id(VOICE_OCLOCK, true); 251 talk_id(VOICE_HOUR, true);
248 } 252 }
249 else 253 else
250 { 254 {
255 /* Pronounce the leading 0 */
256 if(tm->tm_min < 10)
257 {
258 talk_id(VOICE_OH, true);
259 }
251 talk_number(tm->tm_min, true); 260 talk_number(tm->tm_min, true);
252 } 261 }
253 } 262 }
263
254 talk_id(LANG_MONTH_JANUARY + tm->tm_mon, true); 264 talk_id(LANG_MONTH_JANUARY + tm->tm_mon, true);
255 talk_number(tm->tm_mday, true); 265 talk_number(tm->tm_mday, true);
256 talk_number(1900 + tm->tm_year, true); 266 talk_number(1900 + tm->tm_year, true);