Merge pull request #1600 from peterp415/cat-fed-clock-12p

Hour 12 is 12PM; display it as 12p not 12a

Author: CollinCunningham

MagTag_Cat_Fed_Clock/code.py

@@ -39,6 +39,8 @@ def hh_mm(time_struct, twelve_hour=True):
         elif time_struct.tm_hour > 0:
             hour_string = str(time_struct.tm_hour) # 1-12
             postfix = "a"
+            if time_struct.tm_hour == 12:
+                postfix = "p" # 12 -> 12 (pm)
         else:
             hour_string = '12' # 0 -> 12 (am)
             postfix = "a"