Merge pull request #174 from mathoudebine/feature/allow-custom-date-time-formatting

Allow custom date/time formatting from babel module

Author: mathoudebine

library/stats.py

@@ -21,11 +21,13 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import datetime
+import locale
 import math
 import os
 import platform
 import sys
 
+import babel.dates
 from psutil._common import bytes2human
 
 import library.config as config
@@ -756,9 +758,17 @@ class Date:
     @staticmethod
     def stats():
         date_now = datetime.datetime.now()
+
+        if platform.system() == "Windows":
+            # Windows does not have LC_TIME environment variable, use deprecated getdefaultlocale() that returns language code following RFC 1766
+            lc_time = locale.getdefaultlocale()[0]
+        else:
+            lc_time = babel.dates.LC_TIME
+
         if config.THEME_DATA['STATS']['DATE']['DAY']['TEXT'].get("SHOW", False):
+            date_format = config.THEME_DATA['STATS']['DATE']['DAY']['TEXT'].get("FORMAT", 'medium')
             display.lcd.DisplayText(
-                text=f"{date_now.strftime('%x')}",
+                text=f"{babel.dates.format_date(date_now, format=date_format, locale=lc_time)}",
                 x=config.THEME_DATA['STATS']['DATE']['DAY']['TEXT'].get("X", 0),
                 y=config.THEME_DATA['STATS']['DATE']['DAY']['TEXT'].get("Y", 0),
                 font=config.THEME_DATA['STATS']['DATE']['DAY']['TEXT'].get("FONT",
@@ -773,8 +783,9 @@ def stats():
             )
 
         if config.THEME_DATA['STATS']['DATE']['HOUR']['TEXT'].get("SHOW", False):
+            time_format = config.THEME_DATA['STATS']['DATE']['HOUR']['TEXT'].get("FORMAT", 'medium')
             display.lcd.DisplayText(
-                text=f"{date_now.strftime('%X')}",
+                text=f"{babel.dates.format_time(date_now, format=time_format, locale=lc_time)}",
                 x=config.THEME_DATA['STATS']['DATE']['HOUR']['TEXT'].get("X", 0),
                 y=config.THEME_DATA['STATS']['DATE']['HOUR']['TEXT'].get("Y", 0),
                 font=config.THEME_DATA['STATS']['DATE']['HOUR']['TEXT'].get("FONT",

requirements.txt

@@ -5,6 +5,7 @@ PyYAML~=6.0       # For themes files
 psutil~=5.9.4     # CPU / disk / network metrics
 GPUtil~=1.4.0     # Nvidia GPU
 pystray~=0.19.4   # Tray icon (all OS)
+babel~=2.11.0     # Date/time formatting
 
 # Following packages are for AMD GPU on Linux
 # Note: you may need to manually install Cython first

res/themes/LandscapeEarth/theme.yaml

@@ -39,7 +39,7 @@ STATS:
       TEXT:
         SHOW: True
         SHOW_UNIT: True
-        X: 50
+        X: 48
         Y: 281
         FONT: generale-mono/GeneraleMonoA.ttf
         FONT_SIZE: 16
@@ -106,6 +106,7 @@ STATS:
     INTERVAL: 1
     DAY:
       TEXT:
+        FORMAT: medium
         SHOW: True
         X: 14
         Y: 64
@@ -115,10 +116,11 @@ STATS:
         BACKGROUND_IMAGE: background.png
     HOUR:
       TEXT:
+        FORMAT: short
         SHOW: True
         X: 14
         Y: 30
         FONT: generale-mono/GeneraleMonoA.ttf
-        FONT_SIZE: 20
+        FONT_SIZE: 26
         FONT_COLOR: 255, 255, 255
         BACKGROUND_COLOR: 16, 28, 57