diff --git a/TimeZones-v2.15.zip b/TimeZones-v2.16.zip similarity index 73% rename from TimeZones-v2.15.zip rename to TimeZones-v2.16.zip index 3fb15b8..3e65982 100644 Binary files a/TimeZones-v2.15.zip and b/TimeZones-v2.16.zip differ diff --git a/source/GeoLite2-City-Locations-en.csv b/source/GeoLite2-City-Locations-en.csv index 69d9b71..fa96f13 100644 --- 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 \ No newline at end of file diff --git a/source/changelog.txt b/source/changelog.txt index 6246cd4..1b424c5 100644 --- 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 \ No newline at end of file +For changelog check Workflow About \ No newline at end of file diff --git a/source/flags/coordinated_universal_time_(utc).png b/source/flags/coordinated_universal_time_(utc).png new file mode 100644 index 0000000..6bae1bc Binary files /dev/null and b/source/flags/coordinated_universal_time_(utc).png differ diff --git a/source/flags/jordan.png b/source/flags/hashemite_kingdom_of_jordan.png similarity index 100% rename from source/flags/jordan.png rename to source/flags/hashemite_kingdom_of_jordan.png diff --git a/source/info.plist b/source/info.plist index 86d6ada..cb51fb3 100644 --- a/source/info.plist +++ b/source/info.plist @@ -58,6 +58,32 @@ + 576752B3-B93B-49C1-8E41-B0E31110799B + + + destinationuid + BC542037-8795-4FE1-8534-AF381F4197FC + modifiers + 0 + modifiersubtext + + vitoclose + + + + 600941C7-2A17-46A0-ABD4-C1568FBA7DBD + + + destinationuid + 4D5D6C9D-E596-4EB1-A0A7-634814560B7F + modifiers + 0 + modifiersubtext + + vitoclose + + + 7C2B2778-8AEE-4861-9E54-DD7E3C7B49F7 @@ -88,7 +114,7 @@ destinationuid - BC542037-8795-4FE1-8534-AF381F4197FC + 576752B3-B93B-49C1-8E41-B0E31110799B modifiers 0 modifiersubtext @@ -123,6 +149,8 @@ + BC542037-8795-4FE1-8534-AF381F4197FC + BD27CF53-3880-47C9-9AAC-4B443E7BA1BD @@ -227,6 +255,19 @@ + ECAFAB55-5A45-4C0D-9578-3B43945E6B61 + + + destinationuid + 600941C7-2A17-46A0-ABD4-C1568FBA7DBD + modifiers + 0 + modifiersubtext + + vitoclose + + + F15F2405-5743-4407-9BFF-A45E6783BA88 @@ -288,7 +329,7 @@ config largetypetext - {query} + {query} (copied to clipboard) type alfred.workflow.output.largetype @@ -373,6 +414,23 @@ version 2 + + config + + autopaste + + clipboardtext + {query} + transient + + + type + alfred.workflow.output.clipboard + uid + 576752B3-B93B-49C1-8E41-B0E31110799B + version + 2 + config @@ -711,6 +769,50 @@ version 1 + + config + + concurrently + + escaping + 4 + script + ./changeParameter.sh "TIME_FORMAT" "Both" + scriptargtype + 0 + scriptfile + + type + 0 + + type + alfred.workflow.action.script + uid + 600941C7-2A17-46A0-ABD4-C1568FBA7DBD + version + 2 + + + config + + argumenttype + 2 + keyword + timezone both + subtext + Change displayed time format to hybrid, e.g. 14:30 (2:30 pm) + text + Change time format to both 24 and 12h (am/pm) + withspace + + + type + alfred.workflow.input.keyword + uid + ECAFAB55-5A45-4C0D-9578-3B43945E6B61 + version + 1 + config @@ -887,7 +989,7 @@ readme - TimeZones v2.15 + 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 -> 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 xpos 290 ypos - 1040 + 1160 3E37F651-EEB7-451F-B0AD-28710998F443 @@ -1124,6 +1234,20 @@ v1.0 ypos 1280 + 576752B3-B93B-49C1-8E41-B0E31110799B + + xpos + 700 + ypos + 10 + + 600941C7-2A17-46A0-ABD4-C1568FBA7DBD + + xpos + 490 + ypos + 920 + 66A14357-6BF2-48B9-8B55-A5B426EEE69E xpos @@ -1150,7 +1274,7 @@ v1.0 xpos 690 ypos - 920 + 1040 8FB97B65-0E08-4EC2-A78E-EB05887599EF @@ -1183,7 +1307,7 @@ v1.0 BC542037-8795-4FE1-8534-AF381F4197FC xpos - 700 + 890 ypos 10 @@ -1213,7 +1337,7 @@ v1.0 xpos 490 ypos - 1040 + 1160 D8D3E88A-E982-4F27-B3AA-46DAD6C5D87F @@ -1234,7 +1358,7 @@ v1.0 xpos 290 ypos - 920 + 1040 E8F7A1D7-00B7-44A7-9C43-3AFA322C666E @@ -1243,6 +1367,13 @@ v1.0 ypos 560 + ECAFAB55-5A45-4C0D-9578-3B43945E6B61 + + xpos + 290 + ypos + 920 + F15F2405-5743-4407-9BFF-A45E6783BA88 xpos @@ -1255,11 +1386,11 @@ v1.0 xpos 490 ypos - 920 + 1040 version - 2.15 + 2.16 webaddress https://jhartman.pl/tag/time-zones/ diff --git a/source/timezone_list.sh b/source/timezone_list.sh index 78ebd69..377e4fa 100755 --- a/source/timezone_list.sh +++ b/source/timezone_list.sh @@ -143,11 +143,17 @@ match=0 #use to determine if there are any matches to the current query in Alfr if [[ "$TIME_FORMAT" = "24h" ]]; then TIME_FORMAT_STR='%0k:%M' +fi -else +if [[ "$TIME_FORMAT" = "12h" ]]; then TIME_FORMAT_STR='%-l:%M %p' fi +if [[ "$TIME_FORMAT" = "Both" ]]; then + # Both - 24hr (12hr) + TIME_FORMAT_STR='%0k:%M (%-l:%M %p)' +fi + sortkey=1 while IFS='|' read -r city country timezone country_code telephone_code favourite @@ -159,9 +165,11 @@ while IFS='|' read -r city country timezone country_code telephone_code favourit continue fi - if [ -n "$telephone_code" ] + if [[ -n "$telephone_code" ]] then telephone_code_string=" (+$telephone_code)" + else + telephone_code_string="" fi if [[ "$favourite" == "0" ]] @@ -184,10 +192,10 @@ while IFS='|' read -r city country timezone country_code telephone_code favourit city_date=$(TZ=$timezone date $setTimeOptionArguments +"%A, %d %B %Y" ) #Determine flag icon - country_flag=$(echo "$country" | tr '[A-Z]' '[a-z]') - country_flag=${country_flag// /_} - flag_icon=$country_flag.png - if [ ! -e ./flags/$flag_icon ]; then + country_flag="$(echo "$country" | tr '[A-Z]' '[a-z]')" + country_flag="${country_flag// /_}" + flag_icon="$country_flag.png" + if [[ ! -e "./flags/$flag_icon" ]]; then flag_icon="_no_flag.png" fi