Adds date formats support for the alternative formatter.

Author: sdispater

pendulum/formatting/alternative_formatter.py

@@ -20,6 +20,7 @@ class AlternativeFormatter(Formatter):
               '|mm?|ss?|S{1,9}' \
               '|x|X' \
               '|zz?|ZZ?' \
+              '|LTS|LT|LL?L?L?' \
               ')'
 
     _FORMAT_RE = re.compile(_TOKENS)
@@ -89,6 +90,15 @@ class AlternativeFormatter(Formatter):
         'zz': lambda dt: '{}'.format(dt.timezone_name),
     }
 
+    _DEFAULT_DATE_FORMATS = {
+        'LTS': 'h:mm:ss A',
+        'LT': 'h:mm A',
+        'L': 'MM/DD/YYYY',
+        'LL': 'MMMM D, YYYY',
+        'LLL': 'MMMM D, YYYY h:mm A',
+        'LLLL': 'dddd, MMMM D, YYYY h:mm A',
+    }
+
     def format(self, dt, fmt, locale=None):
         """
         Formats a Pendulum instance with a given format and locale.
@@ -131,6 +141,12 @@ def _format_token(self, dt, token, locale):
 
         :rtype: str
         """
+        if token in self._DEFAULT_DATE_FORMATS:
+            fmt = dt.translator().transchoice('date_formats', token, locale=locale)
+            if fmt == 'date_formats':
+                fmt = self._DEFAULT_DATE_FORMATS[token]
+
+            return self.format(dt, fmt, locale)
         if token in self._LOCALIZABLE_TOKENS:
             return self._format_localizable_token(dt, token, locale)
 
@@ -209,6 +225,11 @@ def _format_localizable_token(self, dt, token, locale):
         trans = dt.translator().transchoice(trans_id, count, locale=locale)
 
         if trans_id == 'ordinal':
-            return '{:d}{}'.format(count, trans)
+            trans = '{:d}{}'.format(count, trans)
+
+        if trans_id == trans:
+            # Unable to find the corresponding translation
+            # Defaulting to english
+            return self._format_localizable_token(dt, token, 'en')
 
         return trans

pendulum/lang/__init__.py

@@ -34,7 +34,7 @@
 from .mk import translations as mk_translations
 from .ms import translations as ms_translations
 from .nl import translations as nl_translations
-from .no import translations as no_translations
+from .nn import translations as nn_translations
 from .pl import translations as pl_translations
 from .pt_br import translations as pt_br_translations
 from .ro import translations as ro_translations
@@ -88,7 +88,7 @@
     "mk": mk_translations,
     "ms": ms_translations,
     "nl": nl_translations,
-    "no": no_translations,
+    "nn": nn_translations,
     "pl": pl_translations,
     "pt_br": pt_br_translations,
     "ro": ro_translations,

pendulum/lang/af.py

@@ -68,5 +68,15 @@
 
     # Meridians
     'meridian': lambda hour: 'VM' if 0 <= hour < 12 else 'NM',
+
+    # Date formats
+    'date_formats': {
+        'LTS': 'HH:mm:ss',
+        'LT': 'HH:mm',
+        'LLLL': 'dddd, D MMMM YYYY HH:mm',
+        'LLL': 'D MMMM YYYY HH:mm',
+        'LL': 'D MMMM YYYY',
+        'L': 'DD/MM/YYYY',
+    },
 }
 

pendulum/lang/ar.py

@@ -107,4 +107,14 @@
     'from_now': 'من الآن {time}',
     'after': 'بعد {time}',
     'before': 'قبل {time}',
+
+    # Date formats
+    'date_formats': {
+        'LTS': 'HH:mm:ss',
+        'LT': 'HH:mm',
+        'LLLL': 'dddd D MMMM YYYY HH:mm',
+        'LLL': 'D MMMM YYYY HH:mm',
+        'LL': 'D MMMM YYYY',
+        'L': 'D/\u200FM/\u200FYYYY',
+    },
 }

pendulum/lang/az.py

@@ -64,6 +64,15 @@
     'ago': '{time} öncə',
     'from_now': '{time} sonra',
     'after': '{time} sonra',
-    'before': '{time} öncə'
-}
+    'before': '{time} öncə',
 
+    # Date formats
+    'date_formats': {
+        'LTS': 'HH:mm:ss',
+        'LT': 'HH:mm',
+        'LLLL': 'dddd, D MMMM YYYY HH:mm',
+        'LLL': 'D MMMM YYYY HH:mm',
+        'LL': 'D MMMM YYYY',
+        'L': 'DD.MM.YYYY',
+    },
+}

pendulum/lang/bg.py

@@ -65,5 +65,14 @@
     'from_now': '{time} от сега',
     'after': 'след {time}',
     'before': 'преди {time}',
-}
 
+    # Date formats
+    'date_formats': {
+        'LTS': 'H:mm:ss',
+        'LT': 'H:mm',
+        'LLLL': 'dddd, D MMMM YYYY H:mm',
+        'LLL': 'D MMMM YYYY H:mm',
+        'LL': 'D MMMM YYYY',
+        'L': 'D.MM.YYYY',
+    },
+}

pendulum/lang/bn.py

@@ -66,5 +66,14 @@
 
     # Meridians
     'meridian': lambda hour: 'সকাল' if 0 <= hour < 12 else 'বিকাল',
-}
 
+    # Date formats
+    'date_formats': {
+        'LTS': 'A h:mm:ss সময়',
+        'LT': 'A h:mm সময়',
+        'LLLL': 'dddd, D MMMM YYYY, A h:mm সময়',
+        'LLL': 'D MMMM YYYY, A h:mm সময়',
+        'LL': 'D MMMM YYYY',
+        'L': 'DD/MM/YYYY',
+    },
+}

pendulum/lang/ca.py

@@ -65,5 +65,14 @@
     'from_now': 'Dins de {time}',
     'after': '{time} després',
     'before': '{time} abans',
-}
 
+    # Date formats
+    'date_formats': {
+        'LTS': 'H:mm:ss',
+        'LT': 'H:mm',
+        'LLLL': 'dddd D MMMM YYYY H:mm',
+        'LLL': 'D MMMM YYYY H:mm',
+        'LL': 'D MMMM YYYY',
+        'L': 'DD/MM/YYYY',
+    },
+}

pendulum/lang/cs.py

@@ -65,5 +65,14 @@
     'from_now': 'za {time}',
     'after': '{time} později',
     'before': '{time} předtím',
-}
 
+    # Date formats
+    'date_formats': {
+        'LTS': 'H:mm:ss',
+        'LT': 'H:mm',
+        'LLLL': 'dddd D. MMMM YYYY H:mm',
+        'LLL': 'D. MMMM YYYY H:mm',
+        'LL': 'D. MMMM YYYY',
+        'L': 'DD.MM.YYYY',
+    },
+}

pendulum/lang/da.py

@@ -65,5 +65,14 @@
     'from_now': 'om {time}',
     'after': '{time} efter',
     'before': '{time} før',
-}
 
+    # Date formats
+    'date_formats': {
+        'LTS': 'HH:mm:ss',
+        'LT': 'HH:mm',
+        'LLLL': 'dddd [d.] D. MMMM YYYY HH:mm',
+        'LLL': 'D. MMMM YYYY HH:mm',
+        'LL': 'D. MMMM YYYY',
+        'L': 'DD/MM/YYYY',
+    },
+}