From 0cbccaebebf671332669a4e54a5fa0ede062fdd9 Mon Sep 17 00:00:00 2001
From: Nick Pope <nick.pope@flightdataservices.com>
Date: Thu, 12 Nov 2020 14:19:17 +0000
Subject: Simplified TimeFormat.g().

---
 django/utils/dateformat.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'django')

diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
index c4d9d035e4..9bd05a437b 100644
--- a/django/utils/dateformat.py
+++ b/django/utils/dateformat.py
@@ -100,11 +100,7 @@ class TimeFormat(Formatter):
 
     def g(self):
         "Hour, 12-hour format without leading zeros; i.e. '1' to '12'"
-        if self.data.hour == 0:
-            return 12
-        if self.data.hour > 12:
-            return self.data.hour - 12
-        return self.data.hour
+        return self.data.hour % 12 or 12
 
     def G(self):
         "Hour, 24-hour format without leading zeros; i.e. '0' to '23'"
-- 
cgit v1.3