storm/talking-clock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrote the 24 hour format support to use the textual numbers.

Browse Source
This commit is contained in:
Storm dragon 2016-01-28 19:03:23 -05:00
parent 152f9b3628
commit 1804403139
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/talking-clock
View File

@ -342,7 +342,21 @@ if [ "$speakTime" == "true" ] ; then
#if 24 time is set, override the above with correct settings. #if 24 time is set, override the above with correct settings.
if [ "$format" = "24" ] ; then if [ "$format" = "24" ] ; then
#Make it read purdy for speech synthesizers. #Make it read purdy for speech synthesizers.
timeString="$(date +'%H:%M' | sed -e 's/^00:00$/zero hundred hours/' -e 's/:00$/ hundred hours/' -e 's/:0/ o /' -e 's/^0//')" timeStringHour="$(date +'%-H')"
if [ $timeStringHour -eq "0" ]; then
timeString="zero"
elif [ $timeStringHour -lt 10 ]; then
timeString="O $(number_to_text $timeStringHour)"
else
timeString="$(number_to_text $timeStringHour)"
fi
if [ $minute -eq "0" ]; then
timeString="${timeString} hundred hours"
elif [ $minute -lt 10 ]; then
timeString="${timeString} O $(number_to_text $minute)"
else
timeString="${timeString} $(number_to_text $minute)"
fi
fi fi
#Add temperature if zipcode is set #Add temperature if zipcode is set
if [ -n "$zipcode" ] ; then if [ -n "$zipcode" ] ; then
@ -352,7 +366,11 @@ if [ "$speakTime" == "true" ] ; then
temperature="$(curl -s "http://weather.yahooapis.com/forecastrss?p=${zipcode}&u=f" | grep -A 1 "Current Conditions:" | tr -Cd '[:digit:]-')" temperature="$(curl -s "http://weather.yahooapis.com/forecastrss?p=${zipcode}&u=f" | grep -A 1 "Current Conditions:" | tr -Cd '[:digit:]-')"
fi fi
if [ -n "$temperature" ] ; then if [ -n "$temperature" ] ; then
timeString="$timeString $(number_to_text $temperature) degrees." if [ "$format" = "24" ]; then
timeString="$timeString and $(number_to_text $temperature) degrees."
else
timeString="$timeString $(number_to_text $temperature) degrees."
fi
fi fi
fi fi
case "$voice" in case "$voice" in