address review feedback

core/numbers/numbers.py

@@ -1,4 +1,4 @@
-from typing import Iterator, Union
+from typing import Iterator, Union, math
 
 from talon import Context, Module
 
@@ -32,8 +32,6 @@ def get_spoken_form_under_one_hundred(
 ):
     """Helper function to get dictionary of spoken forms for non-negative numbers in the range [start, end] under 100"""
 
-    import math
-
     result = {}
 
     for value in range(start, end + 1):

core/text/currency_denomination.talon-list → core/text/currency.talon-list

@@ -1,8 +1,8 @@
-list: user.currency_denomination
+list: user.currency
 -
 dollar: $
 dollars: $
 euro: €
 euros: €
 pound: £
-pounds: £
+pounds: £

core/text/text_and_dictation.py

@@ -21,9 +21,7 @@
 mod.list("hours_twelve", desc="Names for hours up to 12")
 mod.list("hours", desc="Names for hours up to 24")
 mod.list("minutes", desc="Names for minutes, 01 up to 59")
-mod.list(
-    "currency_denomination", desc="Currency denominations that can be used within prose"
-)
+mod.list("currency", desc="Currency types (e.g., dollars, euros) that can be used within prose")
 
 ctx = Context()
 # Maps spoken forms to DictationFormat method names (see DictationFormat below).
@@ -45,9 +43,9 @@
     "frowny": ":-(",
 }
 
-ctx.lists["user.hours_twelve"] = get_spoken_form_under_one_hundred(1, 12, True, True)
-ctx.lists["user.hours"] = get_spoken_form_under_one_hundred(1, 23, True, True)
-ctx.lists["user.minutes"] = get_spoken_form_under_one_hundred(1, 59, True, False)
+ctx.lists["user.hours_twelve"] = get_spoken_form_under_one_hundred(1, 12, include_oh_variant_for_single_digits = True, include_default_variant_for_single_digits = True)  
+ctx.lists["user.hours"] = get_spoken_form_under_one_hundred(1, 23, include_oh_variant_for_single_digits = True, include_default_variant_for_single_digits = True)
+ctx.lists["user.minutes"] = get_spoken_form_under_one_hundred(1, 59, include_oh_variant_for_single_digits = True, include_default_variant_for_single_digits = False)
 
 
 @mod.capture(rule="{user.prose_modifiers}")
@@ -88,10 +86,10 @@ def prose_percent(m) -> str:
 
 
 @mod.capture(
-    rule="<user.number_string> {user.currency_denomination} [[and] <user.number_string> [cents|pence]]"
+    rule="<user.number_string> {user.currency} [[and] <user.number_string> [cents|pence]]"
 )
-def prose_money(m) -> str:
-    s = m.currency_denomination + m.number_string_1
+def prose_currency(m) -> str:
+    s = m.currency + m.number_string_1
     if hasattr(m, "number_string_2"):
         s += "." + m.number_string_2
     return s