date fix

app.py

@@ -1,18 +1,20 @@
+import logging
+logger = logging.getLogger(__name__)
+logging.basicConfig(level=logging.INFO)
+
 import gradio as gr
 import torah
+import date_ordinal
 from gematria import calculate_gematria, strip_diacritics
+
 import pandas as pd
 from deep_translator import GoogleTranslator
 from gradio_calendar import Calendar
-from date_ordinal import number_to_ordinal_word, date_to_words
 import inflect
 from datetime import datetime
-import logging
 import math
 import json
 
-logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.INFO)
 
 # --- Helper Functions ---
 
@@ -22,7 +24,7 @@ def translate_date_to_words(date, lang='en'):
     return "No date selected"
   date_string = date.strftime("%Y-%m-%d")
   logger.info(f"Date string: {date_string}")
-  date_in_words = date_to_words(date_string)
+  date_in_words = date_ordinal.date_to_words(date_string)
   logger.info(f"Date in words: {date_in_words}")
   translator = GoogleTranslator(source='auto', target=lang)
   translated_date_words = translator.translate(date_in_words)

date_ordinal.py

@@ -1,41 +1,39 @@
 import inflect
 from datetime import datetime
 
-
-
 # Custom function to convert number to ordinal words
 def number_to_ordinal_word(number):
-    ordinal_dict = {
-        1: "first", 2: "second", 3: "third", 4: "fourth", 5: "fifth",
-        6: "sixth", 7: "seventh", 8: "eighth", 9: "ninth", 10: "tenth",
-        11: "eleventh", 12: "twelfth", 13: "thirteenth", 14: "fourteenth",
-        15: "fifteenth", 16: "sixteenth", 17: "seventeenth", 18: "eighteenth",
-        19: "nineteenth", 20: "twentieth", 21: "twentyfirst", 22: "twentysecond",
-        23: "twentythird", 24: "twentyfourth", 25: "twentyfifth",
-        26: "twentysixth", 27: "twentyseventh", 28: "twentyeighth",
-        29: "twentyninth", 30: "thirtieth", 31: "thirtyfirst"
-    }
-    return ordinal_dict.get(number, "")
+  ordinal_dict = {
+    1: "first", 2: "second", 3: "third", 4: "fourth", 5: "fifth",
+    6: "sixth", 7: "seventh", 8: "eighth", 9: "ninth", 10: "tenth",
+    11: "eleventh", 12: "twelfth", 13: "thirteenth", 14: "fourteenth",
+    15: "fifteenth", 16: "sixteenth", 17: "seventeenth", 18: "eighteenth",
+    19: "nineteenth", 20: "twentieth", 21: "twentyfirst", 22: "twentysecond",
+    23: "twentythird", 24: "twentyfourth", 25: "twentyfifth",
+    26: "twentysixth", 27: "twentyseventh", 28: "twentyeighth",
+    29: "twentyninth", 30: "thirtieth", 31: "thirtyfirst"
+  }
+  return ordinal_dict.get(number, "")
 
 # Convert a numerical date to words with an ordinal day
 def date_to_words(date_string):
-
-    # Create an inflect engine
-    inf_engine = inflect.engine()
-
-    date_obj = datetime.strptime(date_string, "%Y-%m-%d")
-
-    # Get year in the desired format
-    year_words = inf_engine.number_to_words(date_obj.year, andword='')
-    year_formatted = year_words.replace(',', '')  # Remove commas
-
-    month = date_obj.strftime("%B")  # Full month name
-    day = date_obj.day
-    day_ordinal = number_to_ordinal_word(day)  # Get ordinal word for the day
-
-    return f"{day_ordinal} {month} {year_formatted}"
-
-# Example usage:
-#date_string = "2024-05-10"
-#date_in_words = date_to_words(date_string)
-#print(date_in_words)  # Outputs: "tenth May two thousand twenty-four"
+  # Create an inflect engine
+  inf_engine = inflect.engine()
+
+  date_obj = datetime.strptime(date_string, "%Y-%m-%d")
+
+  # Get year in the desired format
+  year = date_obj.year
+  if 1900 <= year <= 1999:
+    year_words = f"{inf_engine.number_to_words(year // 100, andword='') } hundred"
+    if year % 100 != 0:
+      year_words += f" {inf_engine.number_to_words(year % 100, andword='')}"
+  else:
+    year_words = inf_engine.number_to_words(year, andword='')
+  year_formatted = year_words.replace(',', '')  # Remove commas
+
+  month = date_obj.strftime("%B")  # Full month name
+  day = date_obj.day
+  day_ordinal = number_to_ordinal_word(day)  # Get ordinal word for the day
+
+  return f"{day_ordinal} {month} {year_formatted}"

torah.py

@@ -1,3 +1,7 @@
+import logging
+logger = logging.getLogger(__name__)
+logging.basicConfig(level=logging.INFO)
+
 import json
 import os
 import re
@@ -85,16 +89,16 @@ all_tests_passed = True
 for result, expected in test_results:
   if expected is None:  # Prüfe, ob kein Ergebnis erwartet wird
     if not result:
-      print(f"Test passed: Expected no results, got no results.")
+      logger.info(f"Test passed: Expected no results, got no results.")
     else:
-      print(f"Test failed: Expected no results, but got: {result}")
+      logger.info(f"Test failed: Expected no results, but got: {result}")
       all_tests_passed = False
   else:
     els_result_text = result[0]['els_result_text']
     if els_result_text == expected:
-      print(f"Test passed: Expected '{expected}', got '{els_result_text}'")
+      logger.info(f"Test passed: Expected '{expected}', got '{els_result_text}'")
     else:
-      print(f"Test failed: Expected '{expected}', but got '{els_result_text}'")
+      logger.info(f"Test failed: Expected '{expected}', but got '{els_result_text}'")
       all_tests_passed = False
 
 if all_tests_passed: