more test coverage

caronc · Aug 20, 2023 · 56cb513 · 56cb513
1 parent 6207cdb
commit 56cb513
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/apprise/AppriseLocale.py b/apprise/AppriseLocale.py
@@ -72,8 +72,8 @@ class AppriseLocale:
 
     # Locale regular expression
     _local_re = re.compile(
-        r'^\s*(?P<lang>[a-z]{2})([_:]((?P<country>[a-z]{2}))?'
-        r'(\.(?P<enc>[a-z0-9]+))?|.+)?', re.IGNORECASE)
+        r'^((?P<ansii>C)|(?P<lang>([a-z]{2}))([_:](?P<country>[a-z]{2}))?)'
+        r'(\.(?P<enc>[a-z0-9-]+))?$', re.IGNORECASE)
 
     # Define our default encoding
     _default_encoding = 'utf-8'

diff --git a/test/test_cli.py → test/test_apprise_cli.py b/test/test_cli.py → test/test_apprise_cli.py
diff --git a/test/test_apprise_translations.py b/test/test_apprise_translations.py
@@ -177,7 +177,8 @@ def test_apprise_trans_gettext_lang_at(mock_getlocale):
         # We can still perform simple lookups; they access a dummy wrapper:
         assert al.gettext('test') == 'test'
 
-    with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', LANG="en_CA"):
+    with environ('LANGUAGE', 'LC_CTYPE', LC_ALL='C.UTF-8', LANG="en_CA"):
+        # the UTF-8 entry is skipped over
         AppriseLocale.AppriseLocale._default_language = 'fr'
 
         # We will detect the english language (found in the LANG= environment
@@ -266,7 +267,7 @@ def test_detect_language_using_env(mock_getlocale):
             AppriseLocale.AppriseLocale.detect_language(), str)
 
     # Detect French language.
-    with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', LANG="fr_CA"):
+    with environ('LANGUAGE', 'LC_ALL', LC_CTYPE="garbage", LANG="fr_CA"):
         assert AppriseLocale.AppriseLocale.detect_language() == 'fr'
 
     # The following unsets all environment variables and sets LC_CTYPE