Improves meridians formatting by supporting minutes

sdispater · sdispater · commit 3e2fa638d24b · 2016-08-29T15:32:41.000-05:00
diff --git a/pendulum/formatting/alternative_formatter.py b/pendulum/formatting/alternative_formatter.py
@@ -217,7 +217,7 @@ def _format_localizable_token(self, dt, token, locale):
             count = dt.day_of_year
             trans_id = 'ordinal'
         elif token == 'A':
-            count = dt.hour
+            count = (dt.hour, dt.minute)
             trans_id = 'meridian'
         else:
             return token
diff --git a/pendulum/formatting/classic_formatter.py b/pendulum/formatting/classic_formatter.py
@@ -66,7 +66,7 @@ def _localize_directive(self, dt, directive, locale):
             number = dt.month
         elif directive == 'p':
             id = 'meridian'
-            number = dt.hour
+            number = (dt.hour, dt.minute)
         else:
             raise ValueError('Unlocalizable directive [{}]'.format(directive))
 
diff --git a/pendulum/lang/af.py b/pendulum/lang/af.py
@@ -67,7 +67,7 @@
     'before': '{time} voor',
 
     # Meridians
-    'meridian': lambda hour: 'VM' if 0 <= hour < 12 else 'NM',
+    'meridian': lambda time: 'VM' if 0 <= time[0] < 12 else 'NM',
 
     # Date formats
     'date_formats': {
diff --git a/pendulum/lang/bn.py b/pendulum/lang/bn.py
@@ -65,7 +65,7 @@
     'before': '{time} আগে',
 
     # Meridians
-    'meridian': lambda hour: 'সকাল' if 0 <= hour < 12 else 'বিকাল',
+    'meridian': lambda time: 'সকাল' if 0 <= time[0] < 12 else 'বিকাল',
 
     # Date formats
     'date_formats': {
diff --git a/pendulum/lang/en.py b/pendulum/lang/en.py
@@ -70,7 +70,8 @@
     'ordinal': lambda x: 'th' if 10 <= x % 100 < 20 else {1: 'st', 2: 'nd', 3: 'rd'}.get(x % 10, "th"),
 
     # Meridians
-    'meridian': lambda hour: 'AM' if 0 <= hour < 12 else 'PM',
+    # [time] is a (hour, minute) tuple
+    'meridian': lambda time: 'AM' if 0 <= time[0] < 12 else 'PM',
 
     # Date formats
     'date_formats': {
@@ -81,7 +82,4 @@
         'LLL': 'MMMM D, YYYY h:mm A',
         'LLLL': 'dddd, MMMM D, YYYY h:mm A',
     },
-
-    # First day of week
-    'dow': 0,
 }
diff --git a/pendulum/lang/eo.py b/pendulum/lang/eo.py
@@ -67,7 +67,7 @@
     'before': '{time} antaŭe',
 
     # Meridians
-    'meridian': lambda hour: 'ATM' if 0 <= hour < 12 else 'PTM',
+    'meridian': lambda time: 'ATM' if 0 <= time[0] < 12 else 'PTM',
 
     # Date formats
     'date_formats': {
diff --git a/pendulum/lang/fa.py b/pendulum/lang/fa.py
@@ -67,7 +67,7 @@
     'before': '{time} پیش از',
 
     # Meridians
-    'meridian': lambda hour: 'قبل از ظهر' if 0 <= hour < 12 else 'بعد از ظهر',
+    'meridian': lambda time: 'قبل از ظهر' if 0 <= time[0] < 12 else 'بعد از ظهر',
 
     # Date formats
     'date_formats': {
diff --git a/pendulum/lang/hu.py b/pendulum/lang/hu.py
@@ -91,7 +91,7 @@
     'second_before': '{count} másodperccel',
 
     # Meridians
-    'meridian': lambda hour: 'DE' if 0 <= hour < 12 else 'DU',
+    'meridian': lambda time: 'DE' if 0 <= time[0] < 12 else 'DU',
 
     # Date formats
     'date_formats': {
diff --git a/pendulum/lang/ja.py b/pendulum/lang/ja.py
@@ -67,7 +67,7 @@
     'before': '{time} 前',
 
     # Meridians
-    'meridian': lambda hour: '午前' if 0 <= hour < 12 else '午後',
+    'meridian': lambda time: '午前' if 0 <= time[0] < 12 else '午後',
 
     # Date formats
     'date_formats': {
diff --git a/pendulum/lang/ko.py b/pendulum/lang/ko.py
@@ -67,7 +67,7 @@
     'before': '{time} 앞',
 
     # Meridians
-    'meridian': lambda hour: '오전' if 0 <= hour < 12 else '오후',
+    'meridian': lambda time: '오전' if 0 <= time[0] < 12 else '오후',
 
     # Date formats
     'date_formats': {
diff --git a/pendulum/lang/zh.py b/pendulum/lang/zh.py
@@ -1,5 +1,23 @@
 # -*- coding: utf-8 -*-
 
+
+def meridian(hour, minute):
+    hm = hour * 100 + minute
+
+    if hm < 600:
+        return '凌晨'
+    elif hm < 900:
+        return '早上'
+    elif hm < 1130:
+        return '上午'
+    elif hm < 1230:
+        return '中午'
+    elif hm < 1800:
+        return '下午'
+
+    return '晚上'
+
+
 translations = {
     # Days
     'days': {
@@ -66,6 +84,9 @@
     'after': '{time}后',
     'before': '{time}前',
 
+    # Meridians
+    'meridian': lambda time: meridian(*time),
+
     # Date formats
     'date_formats': {
         'LTS': 'Ah点m分s秒',
diff --git a/pendulum/lang/zh_tw.py b/pendulum/lang/zh_tw.py
@@ -1,5 +1,22 @@
 # -*- coding: utf-8 -*-
 
+
+def meridian(hour, minute):
+    hm = hour * 100 + minute
+
+    if hm < 600:
+        return '凌晨'
+    elif hm < 900:
+        return '早上'
+    elif hm < 1130:
+        return '上午'
+    elif hm < 1230:
+        return '中午'
+    elif hm < 1800:
+        return '下午'
+
+    return '晚上'
+
 translations = {
     # Days
     'days': {
@@ -66,6 +83,9 @@
     'after': '{time}後',
     'before': '{time}前',
 
+    # Meridians
+    'meridian': lambda time: meridian(*time),
+
     # Date formats
     'date_formats': {
         'LTS': 'Ah點m分s秒',
