Work around two time-handling bugs

Unit detection was not considering localization in two places. Fix the simple issue in find_errors_in_progress() by translating units to compare against. The second error is more complex, details are in thinkle#931. Disable broken parsing of number words for now. Signed-off-by: Martin Pohlack <[email protected]>
martinp26 · Jun 20, 2020 · d5d77fc · d5d77fc
1 parent ee332a7
commit d5d77fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gourmet/convert.py b/gourmet/convert.py
@@ -644,7 +644,8 @@ def integerp (num, approx=0.01):
     lambda x,y: ((len(y)>len(x) and 1) or (len(x)>len(y) and -1) or 0)
     )
 
-NUMBER_WORD_REGEXP = '|'.join(all_number_words).replace(' ','\s+')
+#NUMBER_WORD_REGEXP = '|'.join(all_number_words).replace(' ','\s+')
+NUMBER_WORD_REGEXP = None
 FRACTION_WORD_REGEXP = '|'.join(filter(lambda n: NUMBER_WORDS[n]<1.0,
                                        all_number_words)
                                 ).replace(' ','\s+')

diff --git a/gourmet/gtk_extras/timeEntry.py b/gourmet/gtk_extras/timeEntry.py
@@ -47,7 +47,7 @@ def find_errors_in_progress (self, txt):
                 return None
             else:
                 partial_unit = words[-1]
-            for u in self.conv.unit_to_seconds.keys():
+            for u in _(self.conv.unit_to_seconds.keys()):
                 if u.lower().find(partial_unit.lower())==0:
                     return None
                     #self._hide_warning_slowly()