v2.16 - Fixes for #25 #22 and other

16 August 2020 * Pull Request Fix incorrect City -> Country mapping #35 * Converted time copied to Clipboard after hitting Enter * Added hybrid time format: 24hr (12hr), i.e. 14:30 (2:30 pm). Change using 'timezone both' * #22, #25: Support for UTC timezone (timezone add utc)
jaroslawhartman · Aug 16, 2020 · 9cf11a3 · 9cf11a3
1 parent a307dee
commit 9cf11a3
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 82 deletions.
diff --git a/TimeZones-v2.15.zip → TimeZones-v2.16.zip b/TimeZones-v2.15.zip → TimeZones-v2.16.zip
diff --git a/source/GeoLite2-City-Locations-en.csv b/source/GeoLite2-City-Locations-en.csv
@@ -10641,6 +10641,7 @@ geoname_id,locale_code,continent_code,continent_name,country_iso_code,country_na
 1546748,en,AN,Antarctica,TF,"French Southern Territories",,,,,,,,0
 1547314,en,AN,Antarctica,HM,"Heard Island and McDonald Islands",,,,,,,Indian/Kerguelen,0
 1547376,en,AS,Asia,CC,"Cocos [Keeling] Islands",,,,,,,Indian/Cocos,0
+1548994,en,AS,Asia,CN,China,JS,Jiangsu,,,Taiwan,,Asia/Shanghai,0
 1551048,en,AS,Asia,CN,China,GZ,Guizhou,,,Baima,,Asia/Shanghai,0
 1551076,en,AS,Asia,CN,China,GZ,Guizhou,,,Zhongshan,,Asia/Shanghai,0
 1551487,en,AS,Asia,CN,China,GZ,Guizhou,,,Suzuo,,Asia/Shanghai,0
@@ -103727,3 +103728,4 @@ geoname_id,locale_code,continent_code,continent_name,country_iso_code,country_na
 11903646,en,EU,Europe,AT,Austria,7,Tyrol,,,Angerberg,,Europe/Vienna,1
 11903690,en,EU,Europe,SK,Slovakia,BL,Bratislava,,,Vinosady,,Europe/Prague,1
 11909785,en,AS,Asia,KR,"Republic of Korea",46,Jeollanam-do,,,Haman,,Asia/Seoul,0
+99999999,utc,UTC,N/A,N/A,"Coordinated Universal Time (UTC)",N/A,N/A,,,"Coordinated Universal Time (UTC)",,UTC,0
diff --git a/source/changelog.txt b/source/changelog.txt
@@ -1,66 +1 @@
-v2.0
-22 September 2018
-
-Fix after google deprecated map APIs
-
-
-v1.7
-22 March 2014
-
-* List now always shows in same the order. (Achieved by removing “uid” parameter.)
-
-v1.61a
-16 March 2014
-
-*Removed Alleyoop update.json file. That’s all.
-
-v1.61
-2 April 2013
-
-*Small fix for Netherlands flag matching.
-
-v1.6
-31 March 2013
-
-* Now supports custom "one-off" lookups for places you don't want to permanently add to your main list. Just keep typing the place name after the "tz" keyword (or hotkey) - as soon as it doesn't match any of the places in your list, it will look up the custom place you've entered.
-* Added support for phyllisstein's Alleyoop auto-updater. (http://www.alfredforum.com/topic/1582-alleyoop-update-alfred-workflows/)
-* [EXPERIMENTAL] - support for autocomplete for adding place names. You'll need to add a keyword yourself to the script filter if you want to try it out. The reason I haven't enabled it by default is that I've found it kind of slow and I'm not sure it's actually an improvement over the current method. Let me know what you think.
-* Added (unofficial) Antarctica flag to flag repository. (Try tz south pole. ;) )
-
-
-v1.5  
-28 March 2013
-
-* Major overhaul to now use Google's Geocoding API and Timezone API to acquire the required data. Should be a **lot** more reliable and consistent, as well as more flexible with input names.
-* Flag icons! The workflow compares the returned country name with a bundled repository of flag icons and does a simple name match. Please report any missing or incorrect flag errors you encounter so I can improve the workflow.
-* More data retrieved and displayed, including Timezone name, country, etc.
-* When doing a full "update", a text file is saved to the Desktop showing which cities have changed.
-* General enhancements and tweaks.
-
-v1.4  
-20 Mar 2013
-
-* You can now move your list of saved cities to a file location of your choice (eg. Dropbox, to sync between machines). Keyword: timezone move
-
-v1.3  
-18 Feb 2013
-
-* Fixes to account for changes to the Wolfram Alpha API
-* When doing a full "update", it won't fail the whole update if one city fails. A list of failed updates is saved to your Desktop.
-
-v1.2  
-4 Feb 2013
-
-* fixes to make "update" work better/properly/at all.
-
-v1.1  
-3 Feb 2013
-
-* Fixed the problem with cities with half-hour UTC offsets (eg. Adelaide—UTC+10.5, New Delhi—UTC+5.5
-* You can search the list of displayed cities (useful if you've got a lot) — just start typing after the "tz"
-* Hotkey to launch the list (set to Ctrl-Z by default)
-
-v1.0  
-2 Feb 2013
-
-* Initial release
+For changelog check Workflow About
diff --git a/source/flags/coordinated_universal_time_(utc).png b/source/flags/coordinated_universal_time_(utc).png
diff --git a/source/flags/jordan.png → source/flags/hashemite_kingdom_of_jordan.png b/source/flags/jordan.png → source/flags/hashemite_kingdom_of_jordan.png
diff --git a/source/info.plist b/source/info.plist
@@ -58,6 +58,32 @@
 				<false/>
 			</dict>
 		</array>
+		<key>576752B3-B93B-49C1-8E41-B0E31110799B</key>
+		<array>
+			<dict>
+				<key>destinationuid</key>
+				<string>BC542037-8795-4FE1-8534-AF381F4197FC</string>
+				<key>modifiers</key>
+				<integer>0</integer>
+				<key>modifiersubtext</key>
+				<string></string>
+				<key>vitoclose</key>
+				<false/>
+			</dict>
+		</array>
+		<key>600941C7-2A17-46A0-ABD4-C1568FBA7DBD</key>
+		<array>
+			<dict>
+				<key>destinationuid</key>
+				<string>4D5D6C9D-E596-4EB1-A0A7-634814560B7F</string>
+				<key>modifiers</key>
+				<integer>0</integer>
+				<key>modifiersubtext</key>
+				<string></string>
+				<key>vitoclose</key>
+				<false/>
+			</dict>
+		</array>
 		<key>7C2B2778-8AEE-4861-9E54-DD7E3C7B49F7</key>
 		<array>
 			<dict>
@@ -88,7 +114,7 @@
 		<array>
 			<dict>
 				<key>destinationuid</key>
-				<string>BC542037-8795-4FE1-8534-AF381F4197FC</string>
+				<string>576752B3-B93B-49C1-8E41-B0E31110799B</string>
 				<key>modifiers</key>
 				<integer>0</integer>
 				<key>modifiersubtext</key>
@@ -123,6 +149,8 @@
 				<false/>
 			</dict>
 		</array>
+		<key>BC542037-8795-4FE1-8534-AF381F4197FC</key>
+		<array/>
 		<key>BD27CF53-3880-47C9-9AAC-4B443E7BA1BD</key>
 		<array>
 			<dict>
@@ -227,6 +255,19 @@
 				<false/>
 			</dict>
 		</array>
+		<key>ECAFAB55-5A45-4C0D-9578-3B43945E6B61</key>
+		<array>
+			<dict>
+				<key>destinationuid</key>
+				<string>600941C7-2A17-46A0-ABD4-C1568FBA7DBD</string>
+				<key>modifiers</key>
+				<integer>0</integer>
+				<key>modifiersubtext</key>
+				<string></string>
+				<key>vitoclose</key>
+				<false/>
+			</dict>
+		</array>
 		<key>F15F2405-5743-4407-9BFF-A45E6783BA88</key>
 		<array>
 			<dict>
@@ -288,7 +329,7 @@
 			<key>config</key>
 			<dict>
 				<key>largetypetext</key>
-				<string>{query}</string>
+				<string>{query} (copied to clipboard)</string>
 			</dict>
 			<key>type</key>
 			<string>alfred.workflow.output.largetype</string>
@@ -373,6 +414,23 @@
 			<key>version</key>
 			<integer>2</integer>
 		</dict>
+		<dict>
+			<key>config</key>
+			<dict>
+				<key>autopaste</key>
+				<false/>
+				<key>clipboardtext</key>
+				<string>{query}</string>
+				<key>transient</key>
+				<false/>
+			</dict>
+			<key>type</key>
+			<string>alfred.workflow.output.clipboard</string>
+			<key>uid</key>
+			<string>576752B3-B93B-49C1-8E41-B0E31110799B</string>
+			<key>version</key>
+			<integer>2</integer>
+		</dict>
 		<dict>
 			<key>config</key>
 			<dict>
@@ -711,6 +769,50 @@
 			<key>version</key>
 			<integer>1</integer>
 		</dict>
+		<dict>
+			<key>config</key>
+			<dict>
+				<key>concurrently</key>
+				<false/>
+				<key>escaping</key>
+				<integer>4</integer>
+				<key>script</key>
+				<string>./changeParameter.sh "TIME_FORMAT" "Both"</string>
+				<key>scriptargtype</key>
+				<integer>0</integer>
+				<key>scriptfile</key>
+				<string></string>
+				<key>type</key>
+				<integer>0</integer>
+			</dict>
+			<key>type</key>
+			<string>alfred.workflow.action.script</string>
+			<key>uid</key>
+			<string>600941C7-2A17-46A0-ABD4-C1568FBA7DBD</string>
+			<key>version</key>
+			<integer>2</integer>
+		</dict>
+		<dict>
+			<key>config</key>
+			<dict>
+				<key>argumenttype</key>
+				<integer>2</integer>
+				<key>keyword</key>
+				<string>timezone both</string>
+				<key>subtext</key>
+				<string>Change displayed time format to hybrid, e.g. 14:30 (2:30 pm)</string>
+				<key>text</key>
+				<string>Change time format to both 24 and 12h (am/pm)</string>
+				<key>withspace</key>
+				<false/>
+			</dict>
+			<key>type</key>
+			<string>alfred.workflow.input.keyword</string>
+			<key>uid</key>
+			<string>ECAFAB55-5A45-4C0D-9578-3B43945E6B61</string>
+			<key>version</key>
+			<integer>1</integer>
+		</dict>
 		<dict>
 			<key>config</key>
 			<dict>
@@ -887,7 +989,7 @@
 		</dict>
 	</array>
 	<key>readme</key>
-	<string>TimeZones v2.15
+	<string>TimeZones v2.16
 1 September 2019
 
 
@@ -934,6 +1036,14 @@ CHANGELOG
 
 All issues tracked on GitHub https://github.com/jaroslawhartman/TimeZones-Alfred/issues
 
+2.16
+16 August 2020
+* Pull Request Fix incorrect City -&gt; Country mapping #35
+* Converted time copied to Clipboard after hitting Enter
+* Added hybrid time format: 24hr (12hr), i.e. 14:30 (2:30 pm). Change using 'timezone both'
+* #22, #25: Support for UTC timezone (timezone add utc)
+
+
 v2.15
 1 September 2019
 * Missing flag for Åland (#29)
@@ -1101,7 +1211,7 @@ v1.0
 			<key>xpos</key>
 			<integer>290</integer>
 			<key>ypos</key>
-			<integer>1040</integer>
+			<integer>1160</integer>
 		</dict>
 		<key>3E37F651-EEB7-451F-B0AD-28710998F443</key>
 		<dict>
@@ -1124,6 +1234,20 @@ v1.0
 			<key>ypos</key>
 			<integer>1280</integer>
 		</dict>
+		<key>576752B3-B93B-49C1-8E41-B0E31110799B</key>
+		<dict>
+			<key>xpos</key>
+			<integer>700</integer>
+			<key>ypos</key>
+			<integer>10</integer>
+		</dict>
+		<key>600941C7-2A17-46A0-ABD4-C1568FBA7DBD</key>
+		<dict>
+			<key>xpos</key>
+			<integer>490</integer>
+			<key>ypos</key>
+			<integer>920</integer>
+		</dict>
 		<key>66A14357-6BF2-48B9-8B55-A5B426EEE69E</key>
 		<dict>
 			<key>xpos</key>
@@ -1150,7 +1274,7 @@ v1.0
 			<key>xpos</key>
 			<integer>690</integer>
 			<key>ypos</key>
-			<integer>920</integer>
+			<integer>1040</integer>
 		</dict>
 		<key>8FB97B65-0E08-4EC2-A78E-EB05887599EF</key>
 		<dict>
@@ -1183,7 +1307,7 @@ v1.0
 		<key>BC542037-8795-4FE1-8534-AF381F4197FC</key>
 		<dict>
 			<key>xpos</key>
-			<integer>700</integer>
+			<integer>890</integer>
 			<key>ypos</key>
 			<integer>10</integer>
 		</dict>
@@ -1213,7 +1337,7 @@ v1.0
 			<key>xpos</key>
 			<integer>490</integer>
 			<key>ypos</key>
-			<integer>1040</integer>
+			<integer>1160</integer>
 		</dict>
 		<key>D8D3E88A-E982-4F27-B3AA-46DAD6C5D87F</key>
 		<dict>
@@ -1234,7 +1358,7 @@ v1.0
 			<key>xpos</key>
 			<integer>290</integer>
 			<key>ypos</key>
-			<integer>920</integer>
+			<integer>1040</integer>
 		</dict>
 		<key>E8F7A1D7-00B7-44A7-9C43-3AFA322C666E</key>
 		<dict>
@@ -1243,6 +1367,13 @@ v1.0
 			<key>ypos</key>
 			<integer>560</integer>
 		</dict>
+		<key>ECAFAB55-5A45-4C0D-9578-3B43945E6B61</key>
+		<dict>
+			<key>xpos</key>
+			<integer>290</integer>
+			<key>ypos</key>
+			<integer>920</integer>
+		</dict>
 		<key>F15F2405-5743-4407-9BFF-A45E6783BA88</key>
 		<dict>
 			<key>xpos</key>
@@ -1255,11 +1386,11 @@ v1.0
 			<key>xpos</key>
 			<integer>490</integer>
 			<key>ypos</key>
-			<integer>920</integer>
+			<integer>1040</integer>
 		</dict>
 	</dict>
 	<key>version</key>
-	<string>2.15</string>
+	<string>2.16</string>
 	<key>webaddress</key>
 	<string>https://jhartman.pl/tag/time-zones/</string>
 </dict>