Add AMPM format

README.md

@@ -15,17 +15,20 @@
 #### Usage:
 
 ##### Default Format
-![usage vars](screenshots/usage.png)
+![default](screenshots/usage.png)
 
 - Hold `alt` to copy ISO with microseconds
-![usage vars](screenshots/usage_alt.png)
+![alt modifier](screenshots/usage_alt.png)
 
 - Hold `cmd` to copy ISO without microseconds
-![usage vars](screenshots/usage_cmd.png)
+![cmd modifier](screenshots/usage_cmd.png)
+
+##### AM/PM format
+![ampm](screenshots/usage_ampm.png)
 
 ##### ISO Format (with microseconds)
-![usage vars](screenshots/usage_iso_with_microseconds.png)
+![iso with microseconds](screenshots/usage_iso_with_microseconds.png)
 
 ##### ISO Format (without microseconds)
-![usage vars](screenshots/usage_iso_without_microseconds.png)
+![iso without microseconds](screenshots/usage_iso_without_microseconds.png)
 

info.plist

@@ -1845,12 +1845,16 @@
 			<key>config</key>
 			<dict>
 				<key>default</key>
-				<string>FORMAT_DEFAULT</string>
+				<string>FORMAT_DEFAULT_24HS</string>
 				<key>pairs</key>
 				<array>
 					<array>
-						<string>Default format</string>
-						<string>FORMAT_DEFAULT</string>
+						<string>Default format (24hs)</string>
+						<string>FORMAT_DEFAULT_24HS</string>
+					</array>
+					<array>
+						<string>Default format (am/pm)</string>
+						<string>FORMAT_DEFAULT_12HS</string>
 					</array>
 					<array>
 						<string>ISO8601 (with microseconds)</string>
@@ -9853,7 +9857,7 @@
 		</dict>
 	</array>
 	<key>version</key>
-	<string>2.0.0</string>
+	<string>2.1.0</string>
 	<key>webaddress</key>
 	<string>https://github.com/fedecalendino/alfred-world-clock</string>
 </dict>

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "World Clock"
-version = "2.0.0"
+version = "2.1.0"
 description = "Check time in multiple timezones."
 documentation = "https://github.com/fedecalendino/alfred-world-clock/blob/main/README.md"
 homepage = "https://github.com/fedecalendino/alfred-world-clock"

src/formatters.py

@@ -1,8 +1,12 @@
 from datetime import datetime
 
 
-def default(now: datetime) -> str:
-    return now.strftime("%H%:%M:%S (%B %d, %Y)")
+def default_12hs(now: datetime) -> str:
+    return now.strftime("%I:%M:%S %p (%B %d, %Y)")
+
+
+def default_24hs(now: datetime) -> str:
+    return now.strftime("%H:%M:%S (%B %d, %Y)")
 
 
 def iso8601(now: datetime) -> str:
@@ -14,7 +18,9 @@ def iso8601_without_microseconds(now: datetime) -> str:
 
 
 FORMATTERS = {
-    "FORMAT_DEFAULT": default,
+    "FORMAT_DEFAULT": default_24hs,
+    "FORMAT_DEFAULT_12HS": default_12hs,
+    "FORMAT_DEFAULT_24HS": default_24hs,
     "FORMAT_ISO8601_WITH_MICROSECONDS": iso8601,
     "FORMAT_ISO8601_WITHOUT_MICROSECONDS": iso8601_without_microseconds,
 }

src/main.py

@@ -45,7 +45,7 @@ def get_timezones(workflow, home_tz):
 
 
 def get_formatter(workflow):
-    timestamp_format = workflow.env.get("TIMESTAMP_FORMAT", formatters.default)
+    timestamp_format = workflow.env.get("TIMESTAMP_FORMAT", "FORMAT_DEFAULT")
     return formatters.FORMATTERS[timestamp_format]