The Events Calendar - Version 4.5.8.1

Version Description

= [4.3] =

Please see the changelog for the complete list of changes in this release. Remember to always make a backup of your database and files before updating!

Download this release

Release Info

Developer barry.hughes
Plugin Icon The Events Calendar
Version 4.5.8.1
Comparing to
See all releases

Code changes from version 4.5.8 to 4.5.8.1

Files changed (15) hide show
  1. lang/the-events-calendar-ca.mo +0 -0
  2. lang/the-events-calendar-ca.po +8 -8
  3. lang/the-events-calendar-de_DE.mo +0 -0
  4. lang/the-events-calendar-de_DE.po +5 -5
  5. lang/the-events-calendar-en_GB.mo +0 -0
  6. lang/the-events-calendar-en_GB.po +4 -4
  7. lang/the-events-calendar-ja.mo +0 -0
  8. lang/the-events-calendar-ja.po +29 -29
  9. lang/the-events-calendar.pot +42 -35
  10. readme.txt +5 -1
  11. src/Tribe/Aggregator/API/Import.php +2 -2
  12. src/Tribe/Aggregator/Record/Abstract.php +38 -2
  13. src/Tribe/Aggregator/Service.php +22 -1
  14. src/Tribe/Main.php +1 -1
  15. the-events-calendar.php +1 -1
lang/the-events-calendar-ca.mo CHANGED
Binary file
lang/the-events-calendar-ca.po CHANGED
@@ -2,7 +2,7 @@
2
  # This file is distributed under the same license as the Plugins - The Events Calendar - Stable (latest release) package.
3
  msgid ""
4
  msgstr ""
5
- "PO-Revision-Date: 2017-05-18 10:00:11+0000\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
@@ -123,7 +123,7 @@ msgstr ""
123
 
124
  #: src/admin-views/aggregator/settings.php:460
125
  msgid "Other URLs"
126
- msgstr ""
127
 
128
  #: src/admin-views/aggregator/settings.php:411
129
  msgid "Fetch source event's settings (e.g. Show Google Maps Link or Sticky in Month View) when importing from another site using The Events Calendar."
@@ -1362,7 +1362,7 @@ msgstr ""
1362
 
1363
  #: common/src/admin-views/app-shop.php:31
1364
  msgid "Installed"
1365
- msgstr ""
1366
 
1367
  #: common/src/admin-views/app-shop.php:29
1368
  msgid "Installed Add-Ons"
@@ -1486,7 +1486,7 @@ msgstr ""
1486
 
1487
  #: src/admin-views/aggregator/tabs/import-form.php:188
1488
  msgid "Category:"
1489
- msgstr ""
1490
 
1491
  #: src/admin-views/aggregator/tabs/import-form.php:176
1492
  msgid "Status:"
@@ -3677,11 +3677,11 @@ msgstr "Editar el Lloc"
3677
 
3678
  #: src/views/list/nav.php:34
3679
  msgid "Next %s"
3680
- msgstr ""
3681
 
3682
  #: src/views/list/nav.php:26
3683
  msgid "Previous %s"
3684
- msgstr ""
3685
 
3686
  #: src/io/csv/admin-views/result.php:26
3687
  msgid "%1$s%2$s%3$sInserted:%4$s A new item was inserted successfully. %5$s%2$s%3$sUpdated:%4$s An item was found with the same name and/or start date. The existing item was updated with the new value from the file.%5$s%2$s%3$sSkipped:%4$s A row was found in the CSV file that could not be imported. Please see below for the invalid rows.%5$s%6$s"
@@ -3701,7 +3701,7 @@ msgstr ""
3701
 
3702
  #: src/functions/template-tags/day.php:108
3703
  msgid "Next Day"
3704
- msgstr ""
3705
 
3706
  #: src/functions/template-tags/day.php:106
3707
  msgid "Previous Day"
@@ -4007,7 +4007,7 @@ msgstr ""
4007
 
4008
  #: common/src/Tribe/Admin/Help_Page.php:825
4009
  msgid "Active Users:"
4010
- msgstr ""
4011
 
4012
  #: common/src/Tribe/Admin/Help_Page.php:802
4013
  msgid "Install Plugin"
2
  # This file is distributed under the same license as the Plugins - The Events Calendar - Stable (latest release) package.
3
  msgid ""
4
  msgstr ""
5
+ "PO-Revision-Date: 2017-07-19 15:23:21+0000\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
123
 
124
  #: src/admin-views/aggregator/settings.php:460
125
  msgid "Other URLs"
126
+ msgstr "Altres URLs"
127
 
128
  #: src/admin-views/aggregator/settings.php:411
129
  msgid "Fetch source event's settings (e.g. Show Google Maps Link or Sticky in Month View) when importing from another site using The Events Calendar."
1362
 
1363
  #: common/src/admin-views/app-shop.php:31
1364
  msgid "Installed"
1365
+ msgstr "Instal·lat"
1366
 
1367
  #: common/src/admin-views/app-shop.php:29
1368
  msgid "Installed Add-Ons"
1486
 
1487
  #: src/admin-views/aggregator/tabs/import-form.php:188
1488
  msgid "Category:"
1489
+ msgstr "Categoria"
1490
 
1491
  #: src/admin-views/aggregator/tabs/import-form.php:176
1492
  msgid "Status:"
3677
 
3678
  #: src/views/list/nav.php:34
3679
  msgid "Next %s"
3680
+ msgstr "Següent %s"
3681
 
3682
  #: src/views/list/nav.php:26
3683
  msgid "Previous %s"
3684
+ msgstr "Anterior %s"
3685
 
3686
  #: src/io/csv/admin-views/result.php:26
3687
  msgid "%1$s%2$s%3$sInserted:%4$s A new item was inserted successfully. %5$s%2$s%3$sUpdated:%4$s An item was found with the same name and/or start date. The existing item was updated with the new value from the file.%5$s%2$s%3$sSkipped:%4$s A row was found in the CSV file that could not be imported. Please see below for the invalid rows.%5$s%6$s"
3701
 
3702
  #: src/functions/template-tags/day.php:108
3703
  msgid "Next Day"
3704
+ msgstr "Següent dia"
3705
 
3706
  #: src/functions/template-tags/day.php:106
3707
  msgid "Previous Day"
4007
 
4008
  #: common/src/Tribe/Admin/Help_Page.php:825
4009
  msgid "Active Users:"
4010
+ msgstr "Usuaris Actius:"
4011
 
4012
  #: common/src/Tribe/Admin/Help_Page.php:802
4013
  msgid "Install Plugin"
lang/the-events-calendar-de_DE.mo CHANGED
Binary file
lang/the-events-calendar-de_DE.po CHANGED
@@ -2,7 +2,7 @@
2
  # This file is distributed under the same license as the Plugins - The Events Calendar - Stable (latest release) package.
3
  msgid ""
4
  msgstr ""
5
- "PO-Revision-Date: 2017-06-29 09:35:43+0000\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
@@ -2358,7 +2358,7 @@ msgstr "löschen"
2358
 
2359
  #: src/Tribe/Aggregator/Tabs/Scheduled.php:181
2360
  msgid "queued"
2361
- msgstr "anstehend"
2362
 
2363
  #: src/Tribe/Aggregator/Tabs/Scheduled.php:94
2364
  msgid "Scheduled Imports"
@@ -4310,7 +4310,7 @@ msgstr "%1$s für %2$s - %3$s"
4310
 
4311
  #: src/functions/template-tags/loop.php:140
4312
  msgid "Upcoming %s"
4313
- msgstr "Anstehende %s"
4314
 
4315
  #: src/functions/template-tags/google-map.php:47
4316
  msgid "+ Google Map"
@@ -7159,7 +7159,7 @@ msgstr "Anfangsdatum"
7159
 
7160
  #: src/Tribe/Admin_List.php:246 src/Tribe/Main.php:1713
7161
  msgid "%s Categories"
7162
- msgstr "Kategorien"
7163
 
7164
  #: src/Tribe/Admin/Timezone_Updater.php:105
7165
  msgid "A problem stopped the timezone update process from completing. Please refresh and try again."
@@ -7239,4 +7239,4 @@ msgstr "Vereinigte Staaten"
7239
 
7240
  #: src/Tribe/Venue.php:315
7241
  msgid "Unnamed Venue"
7242
- msgstr "Unbenannter Veranstaltungsort"ort"
2
  # This file is distributed under the same license as the Plugins - The Events Calendar - Stable (latest release) package.
3
  msgid ""
4
  msgstr ""
5
+ "PO-Revision-Date: 2017-07-18 12:12:35+0000\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
2358
 
2359
  #: src/Tribe/Aggregator/Tabs/Scheduled.php:181
2360
  msgid "queued"
2361
+ msgstr "anstehend: "
2362
 
2363
  #: src/Tribe/Aggregator/Tabs/Scheduled.php:94
2364
  msgid "Scheduled Imports"
4310
 
4311
  #: src/functions/template-tags/loop.php:140
4312
  msgid "Upcoming %s"
4313
+ msgstr "%s anstehende"
4314
 
4315
  #: src/functions/template-tags/google-map.php:47
4316
  msgid "+ Google Map"
7159
 
7160
  #: src/Tribe/Admin_List.php:246 src/Tribe/Main.php:1713
7161
  msgid "%s Categories"
7162
+ msgstr "%ss-Kategorien"
7163
 
7164
  #: src/Tribe/Admin/Timezone_Updater.php:105
7165
  msgid "A problem stopped the timezone update process from completing. Please refresh and try again."
7239
 
7240
  #: src/Tribe/Venue.php:315
7241
  msgid "Unnamed Venue"
7242
+ msgstr "Unbenannter Veranstaltungsort"
lang/the-events-calendar-en_GB.mo CHANGED
Binary file
lang/the-events-calendar-en_GB.po CHANGED
@@ -2,7 +2,7 @@
2
  # This file is distributed under the same license as the Plugins - The Events Calendar - Stable (latest release) package.
3
  msgid ""
4
  msgstr ""
5
- "PO-Revision-Date: 2017-06-29 10:15:08+0000\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
@@ -13,15 +13,15 @@ msgstr ""
13
 
14
  #: src/Tribe/Customizer/General_Theme.php:305
15
  msgid "Featured Highlight Color"
16
- msgstr ""
17
 
18
  #: src/Tribe/Aggregator/Service.php:188
19
  msgid "The response from the Event Aggregator server was badly formed and could not be understood. Please try again."
20
- msgstr ""
21
 
22
  #: common/src/Tribe/Plugins_API.php:218
23
  msgid "Import events from across the web! Event Aggregator makes it easy to run scheduled or manual imports from Facebook, Meetup, Google Calendar, and iCalendar, along with uploads from CSV and ICS files. You can also import directly from other sites running The Events Calendar thanks to our built-in REST API support."
24
- msgstr ""
25
 
26
  #: src/Tribe/Linked_Posts.php:913 src/Tribe/Linked_Posts.php:918
27
  msgid "Create or Find %s"
2
  # This file is distributed under the same license as the Plugins - The Events Calendar - Stable (latest release) package.
3
  msgid ""
4
  msgstr ""
5
+ "PO-Revision-Date: 2017-07-14 19:16:02+0000\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
13
 
14
  #: src/Tribe/Customizer/General_Theme.php:305
15
  msgid "Featured Highlight Color"
16
+ msgstr "Featured Highlight Colour"
17
 
18
  #: src/Tribe/Aggregator/Service.php:188
19
  msgid "The response from the Event Aggregator server was badly formed and could not be understood. Please try again."
20
+ msgstr "The response from the Event Aggregator server was badly formed and could not be understood. Please try again."
21
 
22
  #: common/src/Tribe/Plugins_API.php:218
23
  msgid "Import events from across the web! Event Aggregator makes it easy to run scheduled or manual imports from Facebook, Meetup, Google Calendar, and iCalendar, along with uploads from CSV and ICS files. You can also import directly from other sites running The Events Calendar thanks to our built-in REST API support."
24
+ msgstr "Import events from across the web! Event Aggregator makes it easy to run scheduled or manual imports from Facebook, Meetup, Google Calendar, and iCalendar, along with uploads from CSV and ICS files. You can also import directly from other sites running The Events Calendar thanks to our built-in REST API support."
25
 
26
  #: src/Tribe/Linked_Posts.php:913 src/Tribe/Linked_Posts.php:918
27
  msgid "Create or Find %s"
lang/the-events-calendar-ja.mo CHANGED
Binary file
lang/the-events-calendar-ja.po CHANGED
@@ -2,7 +2,7 @@
2
  # This file is distributed under the same license as the Plugins - The Events Calendar - Stable (latest release) package.
3
  msgid ""
4
  msgstr ""
5
- "PO-Revision-Date: 2017-07-07 06:43:36+0000\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
@@ -49,7 +49,7 @@ msgstr ""
49
 
50
  #: common/src/Tribe/Plugins_API.php:61
51
  msgid "More Details"
52
- msgstr ""
53
 
54
  #: common/src/Tribe/Plugins_API.php:60
55
  msgid "More information about %s"
@@ -61,7 +61,7 @@ msgstr "今すぐ購入"
61
 
62
  #: common/src/Tribe/Plugins_API.php:51
63
  msgid "Buy %s now"
64
- msgstr ""
65
 
66
  #: common/src/Tribe/PUE/Checker.php:1093
67
  msgid "There is a new version of %1$s available. %2$s"
@@ -186,7 +186,7 @@ msgstr ""
186
 
187
  #: src/Tribe/REST/V1/Endpoints/Swagger_Documentation.php:89
188
  msgid "The Events Calendar REST API"
189
- msgstr ""
190
 
191
  #: src/Tribe/REST/V1/Endpoints/Swagger_Documentation.php:90
192
  msgid "The Events Calendar REST API allows accessing upcoming events information easily and conveniently."
@@ -378,7 +378,7 @@ msgstr ""
378
 
379
  #: src/Tribe/REST/V1/Documentation/Organizer_Definition_Provider.php:56
380
  msgid "The URL to the organizer page"
381
- msgstr ""
382
 
383
  #: src/Tribe/REST/V1/Documentation/Organizer_Definition_Provider.php:60
384
  msgid "The organizer name"
@@ -446,7 +446,7 @@ msgstr "会場住所"
446
 
447
  #: src/Tribe/REST/V1/Documentation/Venue_Definition_Provider.php:87
448
  msgid "The venue city"
449
- msgstr ""
450
 
451
  #: src/Tribe/REST/V1/Documentation/Venue_Definition_Provider.php:91
452
  msgid "The venue country"
@@ -666,7 +666,7 @@ msgstr ""
666
 
667
  #: src/admin-views/aggregator/settings.php:361
668
  msgid "Other URL Import Settings"
669
- msgstr ""
670
 
671
  #: src/admin-views/aggregator/origins/url.php:91
672
  msgid "you can modify this setting here."
@@ -807,7 +807,7 @@ msgstr "all"
807
 
808
  #: common/src/Tribe/Validate.php:245
809
  msgid "%s must be a whole number."
810
- msgstr ""
811
 
812
  #: common/src/Tribe/Documentation/Swagger/Term_Definition_Provider.php:52
813
  msgid "The URL to the term archive page"
@@ -1328,7 +1328,7 @@ msgstr "イベントのヘルプ"
1328
 
1329
  #: common/src/Tribe/PUE/Checker.php:1668
1330
  msgid "Expired license. Consult your network administrator."
1331
- msgstr ""
1332
 
1333
  #: common/src/Tribe/PUE/Checker.php:1667
1334
  msgid "No license entered. Consult your network administrator."
@@ -1348,7 +1348,7 @@ msgstr ""
1348
 
1349
  #: common/src/Tribe/PUE/Checker.php:536
1350
  msgid "Override network license key"
1351
- msgstr ""
1352
 
1353
  #: common/src/Tribe/PUE/Checker.php:527 common/src/Tribe/PUE/Checker.php:561
1354
  msgid "License Key Status:"
@@ -1439,7 +1439,7 @@ msgstr "Meetup API キー"
1439
 
1440
  #: src/admin-views/tribe-options-addons-api.php:94
1441
  msgid "You need a Meetup API Key to import your events from Meetup."
1442
- msgstr ""
1443
 
1444
  #: src/admin-views/tribe-options-addons-api.php:82
1445
  msgid "You need to connect Event Aggregator to Facebook to import your events from Facebook."
@@ -1659,7 +1659,7 @@ msgstr ""
1659
 
1660
  #: src/admin-views/aggregator/status.php:30
1661
  msgid "You do not have a license"
1662
- msgstr ""
1663
 
1664
  #: src/admin-views/aggregator/status.php:23
1665
  msgid "Your license is valid"
@@ -1749,7 +1749,7 @@ msgstr ""
1749
 
1750
  #: src/admin-views/aggregator/settings.php:190
1751
  msgid "ICS File Import Settings"
1752
- msgstr ""
1753
 
1754
  #: src/admin-views/aggregator/settings.php:166
1755
  msgid "The default event category for events imported via iCalendar"
@@ -1761,7 +1761,7 @@ msgstr ""
1761
 
1762
  #: src/admin-views/aggregator/settings.php:150
1763
  msgid "iCalendar Import Settings"
1764
- msgstr ""
1765
 
1766
  #: src/admin-views/aggregator/settings.php:137
1767
  #: src/admin-views/aggregator/settings.php:177
@@ -1913,7 +1913,7 @@ msgstr ""
1913
 
1914
  #: src/admin-views/aggregator/origins/ics.php:10
1915
  msgid "Upload an ICS File"
1916
- msgstr ""
1917
 
1918
  #: src/admin-views/aggregator/origins/ics.php:7
1919
  msgid "Select your ICS file from the WordPress media library. You may need to first upload the file from your computer to the library."
@@ -2524,11 +2524,11 @@ msgstr ""
2524
 
2525
  #: src/Tribe/Aggregator/Tabs/Abstract.php:189
2526
  msgid "Please provide the URL that you wish to import."
2527
- msgstr ""
2528
 
2529
  #: src/Tribe/Aggregator/Tabs/Abstract.php:135
2530
  msgid "Please provide the file that you wish to import."
2531
- msgstr ""
2532
 
2533
  #: src/Tribe/Aggregator/Tabs/Abstract.php:59
2534
  msgid "There was a problem processing your import. Please try again."
@@ -2588,7 +2588,7 @@ msgstr ""
2588
 
2589
  #: src/Tribe/Aggregator/Service.php:514
2590
  msgid "The image associated with your event is not accessible with your API key."
2591
- msgstr ""
2592
 
2593
  #: src/Tribe/Aggregator/Service.php:513
2594
  msgid "The image associated with your event could not be imported."
@@ -2941,7 +2941,7 @@ msgstr ""
2941
 
2942
  #: src/Tribe/Aggregator/Page.php:95
2943
  msgid "Please wait while your preview is fetched."
2944
- msgstr ""
2945
 
2946
  #: src/Tribe/Aggregator/Page.php:93
2947
  msgid "Hide Filters"
@@ -3020,7 +3020,7 @@ msgstr ""
3020
 
3021
  #: src/Tribe/Aggregator/Migrate.php:294
3022
  msgid "We did not find any Facebook Events settings to migrate."
3023
- msgstr ""
3024
 
3025
  #: src/Tribe/Aggregator/Migrate.php:287
3026
  msgid "You do not have permission to migrate Facebook Events settings to Event Aggregator"
@@ -3032,11 +3032,11 @@ msgstr ""
3032
 
3033
  #: src/Tribe/Aggregator/Migrate.php:80
3034
  msgid "Migrate iCal Importer settings"
3035
- msgstr ""
3036
 
3037
  #: src/Tribe/Aggregator/Migrate.php:76
3038
  msgid "Migrate Facebook Events settings"
3039
- msgstr ""
3040
 
3041
  #: src/Tribe/Aggregator/Migrate.php:73
3042
  msgid "Thanks for activating Event Aggregator! It looks like you have some settings and imports configured on our legacy importer plugins. To complete your transition, we need to transfer those options to our new system."
@@ -3196,7 +3196,7 @@ msgstr ""
3196
  #: src/Tribe/Aggregator/API/Origins.php:51
3197
  #: src/admin-views/aggregator/settings.php:456
3198
  msgid "ICS File"
3199
- msgstr ""
3200
 
3201
  #: src/Tribe/Aggregator/API/Origins.php:46
3202
  #: src/Tribe/Aggregator/Record/iCal.php:14
@@ -3232,11 +3232,11 @@ msgstr ""
3232
  #: common/src/admin-views/tribe-options-licenses.php:11
3233
  #: common/src/admin-views/tribe-options-licenses.php:16
3234
  msgid " (opens in new window)"
3235
- msgstr ""
3236
 
3237
  #: common/src/admin-views/tribe-options-help.php:48
3238
  msgid "Event Log"
3239
- msgstr ""
3240
 
3241
  #: common/src/admin-views/tribe-options-help.php:35
3242
  msgid "The details of your calendar plugin and settings is often needed for you or our staff to help troubleshoot an issue. Please opt-in below to automatically share your system information with our support team. This will allow us to assist you faster if you post in our forums."
@@ -3308,7 +3308,7 @@ msgstr " (新しいウィンドウで開きます)"
3308
 
3309
  #: common/src/Tribe/PUE/Checker.php:957 common/src/Tribe/PUE/Notices.php:288
3310
  msgid "Renew Your License Now"
3311
- msgstr ""
3312
 
3313
  #: common/src/Tribe/Main.php:268
3314
  msgid ": Selected 1 row"
@@ -3544,7 +3544,7 @@ msgstr "ダウンロードログ"
3544
 
3545
  #: common/src/admin-views/event-log.php:100
3546
  msgid "The selected log file is empty or has not been generated yet."
3547
- msgstr ""
3548
 
3549
  #: common/src/admin-views/event-log.php:43
3550
  msgid "Method"
@@ -6215,7 +6215,7 @@ msgstr "アルバ"
6215
 
6216
  #: common/src/Tribe/View_Helpers.php:57
6217
  msgid "Armenia"
6218
- msgstr "アルメリア"
6219
 
6220
  #: common/src/Tribe/View_Helpers.php:56
6221
  msgid "Argentina"
@@ -6243,7 +6243,7 @@ msgstr "アンドラ"
6243
 
6244
  #: common/src/Tribe/View_Helpers.php:50
6245
  msgid "American Samoa"
6246
- msgstr "米サモア"
6247
 
6248
  #: common/src/Tribe/View_Helpers.php:49
6249
  msgid "Algeria"
2
  # This file is distributed under the same license as the Plugins - The Events Calendar - Stable (latest release) package.
3
  msgid ""
4
  msgstr ""
5
+ "PO-Revision-Date: 2017-07-17 09:53:55+0000\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
49
 
50
  #: common/src/Tribe/Plugins_API.php:61
51
  msgid "More Details"
52
+ msgstr "詳細情報"
53
 
54
  #: common/src/Tribe/Plugins_API.php:60
55
  msgid "More information about %s"
61
 
62
  #: common/src/Tribe/Plugins_API.php:51
63
  msgid "Buy %s now"
64
+ msgstr "今すぐ %s を購入"
65
 
66
  #: common/src/Tribe/PUE/Checker.php:1093
67
  msgid "There is a new version of %1$s available. %2$s"
186
 
187
  #: src/Tribe/REST/V1/Endpoints/Swagger_Documentation.php:89
188
  msgid "The Events Calendar REST API"
189
+ msgstr "The Events Calendar REST API"
190
 
191
  #: src/Tribe/REST/V1/Endpoints/Swagger_Documentation.php:90
192
  msgid "The Events Calendar REST API allows accessing upcoming events information easily and conveniently."
378
 
379
  #: src/Tribe/REST/V1/Documentation/Organizer_Definition_Provider.php:56
380
  msgid "The URL to the organizer page"
381
+ msgstr "主催者ページの URL"
382
 
383
  #: src/Tribe/REST/V1/Documentation/Organizer_Definition_Provider.php:60
384
  msgid "The organizer name"
446
 
447
  #: src/Tribe/REST/V1/Documentation/Venue_Definition_Provider.php:87
448
  msgid "The venue city"
449
+ msgstr "会場都市"
450
 
451
  #: src/Tribe/REST/V1/Documentation/Venue_Definition_Provider.php:91
452
  msgid "The venue country"
666
 
667
  #: src/admin-views/aggregator/settings.php:361
668
  msgid "Other URL Import Settings"
669
+ msgstr "その他の URL のインポート設定"
670
 
671
  #: src/admin-views/aggregator/origins/url.php:91
672
  msgid "you can modify this setting here."
807
 
808
  #: common/src/Tribe/Validate.php:245
809
  msgid "%s must be a whole number."
810
+ msgstr "%s は整数でなければなりません。"
811
 
812
  #: common/src/Tribe/Documentation/Swagger/Term_Definition_Provider.php:52
813
  msgid "The URL to the term archive page"
1328
 
1329
  #: common/src/Tribe/PUE/Checker.php:1668
1330
  msgid "Expired license. Consult your network administrator."
1331
+ msgstr "ライセンスの有効期限が切れました。 ネットワーク管理者に相談してください。"
1332
 
1333
  #: common/src/Tribe/PUE/Checker.php:1667
1334
  msgid "No license entered. Consult your network administrator."
1348
 
1349
  #: common/src/Tribe/PUE/Checker.php:536
1350
  msgid "Override network license key"
1351
+ msgstr "ネットワークライセンスキーを上書きする"
1352
 
1353
  #: common/src/Tribe/PUE/Checker.php:527 common/src/Tribe/PUE/Checker.php:561
1354
  msgid "License Key Status:"
1439
 
1440
  #: src/admin-views/tribe-options-addons-api.php:94
1441
  msgid "You need a Meetup API Key to import your events from Meetup."
1442
+ msgstr "Meetup からイベントをインポートするには Meetup API キーが必要です。"
1443
 
1444
  #: src/admin-views/tribe-options-addons-api.php:82
1445
  msgid "You need to connect Event Aggregator to Facebook to import your events from Facebook."
1659
 
1660
  #: src/admin-views/aggregator/status.php:30
1661
  msgid "You do not have a license"
1662
+ msgstr "ライセンスを持っていません"
1663
 
1664
  #: src/admin-views/aggregator/status.php:23
1665
  msgid "Your license is valid"
1749
 
1750
  #: src/admin-views/aggregator/settings.php:190
1751
  msgid "ICS File Import Settings"
1752
+ msgstr "ICS ファイルのインポート設定"
1753
 
1754
  #: src/admin-views/aggregator/settings.php:166
1755
  msgid "The default event category for events imported via iCalendar"
1761
 
1762
  #: src/admin-views/aggregator/settings.php:150
1763
  msgid "iCalendar Import Settings"
1764
+ msgstr "iCalendar インポート設定"
1765
 
1766
  #: src/admin-views/aggregator/settings.php:137
1767
  #: src/admin-views/aggregator/settings.php:177
1913
 
1914
  #: src/admin-views/aggregator/origins/ics.php:10
1915
  msgid "Upload an ICS File"
1916
+ msgstr "ICS ファイルアップロード"
1917
 
1918
  #: src/admin-views/aggregator/origins/ics.php:7
1919
  msgid "Select your ICS file from the WordPress media library. You may need to first upload the file from your computer to the library."
2524
 
2525
  #: src/Tribe/Aggregator/Tabs/Abstract.php:189
2526
  msgid "Please provide the URL that you wish to import."
2527
+ msgstr "インポートする URL を入力してください。"
2528
 
2529
  #: src/Tribe/Aggregator/Tabs/Abstract.php:135
2530
  msgid "Please provide the file that you wish to import."
2531
+ msgstr "インポートするファイルを指定してください。"
2532
 
2533
  #: src/Tribe/Aggregator/Tabs/Abstract.php:59
2534
  msgid "There was a problem processing your import. Please try again."
2588
 
2589
  #: src/Tribe/Aggregator/Service.php:514
2590
  msgid "The image associated with your event is not accessible with your API key."
2591
+ msgstr "イベントに関連付けられている画像には API キーでアクセスできません。"
2592
 
2593
  #: src/Tribe/Aggregator/Service.php:513
2594
  msgid "The image associated with your event could not be imported."
2941
 
2942
  #: src/Tribe/Aggregator/Page.php:95
2943
  msgid "Please wait while your preview is fetched."
2944
+ msgstr "プレビューを取得している間お待ちください。"
2945
 
2946
  #: src/Tribe/Aggregator/Page.php:93
2947
  msgid "Hide Filters"
3020
 
3021
  #: src/Tribe/Aggregator/Migrate.php:294
3022
  msgid "We did not find any Facebook Events settings to migrate."
3023
+ msgstr "移行する Facebook イベント設定は見つかりませんでした。"
3024
 
3025
  #: src/Tribe/Aggregator/Migrate.php:287
3026
  msgid "You do not have permission to migrate Facebook Events settings to Event Aggregator"
3032
 
3033
  #: src/Tribe/Aggregator/Migrate.php:80
3034
  msgid "Migrate iCal Importer settings"
3035
+ msgstr "iCal Importer の設定を移行する"
3036
 
3037
  #: src/Tribe/Aggregator/Migrate.php:76
3038
  msgid "Migrate Facebook Events settings"
3039
+ msgstr "Facebook イベントの設定を移行する"
3040
 
3041
  #: src/Tribe/Aggregator/Migrate.php:73
3042
  msgid "Thanks for activating Event Aggregator! It looks like you have some settings and imports configured on our legacy importer plugins. To complete your transition, we need to transfer those options to our new system."
3196
  #: src/Tribe/Aggregator/API/Origins.php:51
3197
  #: src/admin-views/aggregator/settings.php:456
3198
  msgid "ICS File"
3199
+ msgstr "ICS ファイル"
3200
 
3201
  #: src/Tribe/Aggregator/API/Origins.php:46
3202
  #: src/Tribe/Aggregator/Record/iCal.php:14
3232
  #: common/src/admin-views/tribe-options-licenses.php:11
3233
  #: common/src/admin-views/tribe-options-licenses.php:16
3234
  msgid " (opens in new window)"
3235
+ msgstr " (新しいウィンドウで開きます)"
3236
 
3237
  #: common/src/admin-views/tribe-options-help.php:48
3238
  msgid "Event Log"
3239
+ msgstr "イベントログ"
3240
 
3241
  #: common/src/admin-views/tribe-options-help.php:35
3242
  msgid "The details of your calendar plugin and settings is often needed for you or our staff to help troubleshoot an issue. Please opt-in below to automatically share your system information with our support team. This will allow us to assist you faster if you post in our forums."
3308
 
3309
  #: common/src/Tribe/PUE/Checker.php:957 common/src/Tribe/PUE/Notices.php:288
3310
  msgid "Renew Your License Now"
3311
+ msgstr "今すぐライセンスを更新する"
3312
 
3313
  #: common/src/Tribe/Main.php:268
3314
  msgid ": Selected 1 row"
3544
 
3545
  #: common/src/admin-views/event-log.php:100
3546
  msgid "The selected log file is empty or has not been generated yet."
3547
+ msgstr "選択したログファイルは空であるかまだ生成されていません。"
3548
 
3549
  #: common/src/admin-views/event-log.php:43
3550
  msgid "Method"
6215
 
6216
  #: common/src/Tribe/View_Helpers.php:57
6217
  msgid "Armenia"
6218
+ msgstr "アルメニア"
6219
 
6220
  #: common/src/Tribe/View_Helpers.php:56
6221
  msgid "Argentina"
6243
 
6244
  #: common/src/Tribe/View_Helpers.php:50
6245
  msgid "American Samoa"
6246
+ msgstr "アメリカ領サモア"
6247
 
6248
  #: common/src/Tribe/View_Helpers.php:49
6249
  msgid "Algeria"
lang/the-events-calendar.pot CHANGED
@@ -2,14 +2,14 @@
2
  # This file is distributed under the same license as the The Events Calendar package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: The Events Calendar 4.5.8\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/the-events-"
7
  "calendar\n"
8
- "POT-Creation-Date: 2017-07-12 14:59:49+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
- "PO-Revision-Date: 2017-07-12 14:59\n"
13
  "Last-Translator: \n"
14
  "Language-Team: \n"
15
 
@@ -94,7 +94,7 @@ msgctxt "%s Event count in admin list"
94
  msgid "All %s"
95
  msgstr ""
96
 
97
- #: src/Tribe/Aggregator/API/Origins.php:31 src/Tribe/Aggregator/Service.php:239
98
  msgid "CSV File"
99
  msgstr ""
100
 
@@ -179,7 +179,7 @@ msgid ""
179
  "The image associated with your event could not be attached to the event."
180
  msgstr ""
181
 
182
- #: src/Tribe/Aggregator/Errors.php:46 src/Tribe/Aggregator/Service.php:521
183
  msgid ""
184
  "The daily limit of %d import requests to the Event Aggregator service has "
185
  "been reached. Please try again later."
@@ -261,7 +261,8 @@ msgid ""
261
  "Licenses before using this service."
262
  msgstr ""
263
 
264
- #: src/Tribe/Aggregator/Errors.php:65 src/Tribe/Aggregator/Service.php:176
 
265
  msgid ""
266
  "There may be an issue with the Event Aggregator server. Please try your "
267
  "import again later."
@@ -482,15 +483,15 @@ msgstr ""
482
  msgid "Record: "
483
  msgstr ""
484
 
485
- #: src/Tribe/Aggregator/Record/Abstract.php:916
486
  msgid "Deleted Attachment: %d"
487
  msgstr ""
488
 
489
- #: src/Tribe/Aggregator/Record/Abstract.php:931
490
  msgid " (opens in a new window)"
491
  msgstr ""
492
 
493
- #: src/Tribe/Aggregator/Record/Abstract.php:957
494
  msgid ""
495
  "When this import was last scheduled to run, the daily limit for your Event "
496
  "Aggregator license had already been reached."
@@ -854,21 +855,27 @@ msgid ""
854
  "tribe_aggregator_connection_timeout filter."
855
  msgstr ""
856
 
857
- #: src/Tribe/Aggregator/Service.php:188
 
 
 
 
 
 
858
  msgid ""
859
  "The response from the Event Aggregator server was badly formed and could not "
860
  "be understood. Please try again."
861
  msgstr ""
862
 
863
- #: src/Tribe/Aggregator/Service.php:508
864
  msgid "Sorry, but something went wrong. Please try again."
865
  msgstr ""
866
 
867
- #: src/Tribe/Aggregator/Service.php:509
868
  msgid "Events could not be imported. The import parameters were invalid."
869
  msgstr ""
870
 
871
- #: src/Tribe/Aggregator/Service.php:510
872
  msgid ""
873
  "Events cannot be imported because Facebook has returned an error. This could "
874
  "mean that the event ID does not exist, the event or source is marked as "
@@ -878,98 +885,98 @@ msgid ""
878
  "knowledgebase</a>."
879
  msgstr ""
880
 
881
- #: src/Tribe/Aggregator/Service.php:511
882
  msgid "No upcoming Facebook events found."
883
  msgstr ""
884
 
885
- #: src/Tribe/Aggregator/Service.php:512
886
  msgid "The URL provided could not be reached."
887
  msgstr ""
888
 
889
- #: src/Tribe/Aggregator/Service.php:513
890
  msgid "The URL provided failed to load."
891
  msgstr ""
892
 
893
- #: src/Tribe/Aggregator/Service.php:514
894
  msgid "The image associated with your event could not be imported."
895
  msgstr ""
896
 
897
- #: src/Tribe/Aggregator/Service.php:515
898
  msgid ""
899
  "The image associated with your event is not accessible with your API key."
900
  msgstr ""
901
 
902
- #: src/Tribe/Aggregator/Service.php:516
903
  msgid ""
904
  "The import failed for an unknown reason. Please try again. If the problem "
905
  "persists, please contact support."
906
  msgstr ""
907
 
908
- #: src/Tribe/Aggregator/Service.php:517
909
  msgid ""
910
  "Events could not be imported. The URL provided did not have events in the "
911
  "proper format."
912
  msgstr ""
913
 
914
- #: src/Tribe/Aggregator/Service.php:518
915
  msgid ""
916
  "The file provided could not be opened. Please confirm that it is a properly "
917
  "formatted .ics file."
918
  msgstr ""
919
 
920
- #: src/Tribe/Aggregator/Service.php:519
921
  msgid "Your Meetup API key is invalid."
922
  msgstr ""
923
 
924
- #: src/Tribe/Aggregator/Service.php:520
925
  msgid ""
926
  "Event Aggregator cannot reach Meetup.com because you exceeded the request "
927
  "limit for your Meetup API key."
928
  msgstr ""
929
 
930
- #: src/Tribe/Aggregator/Service.php:522
931
  msgid "The import is in progress."
932
  msgstr ""
933
 
934
- #: src/Tribe/Aggregator/Service.php:523
935
  msgid "The import will be starting soon."
936
  msgstr ""
937
 
938
- #: src/Tribe/Aggregator/Service.php:524
939
  msgid "Success"
940
  msgstr ""
941
 
942
- #: src/Tribe/Aggregator/Service.php:525
943
  msgid "Import created"
944
  msgstr ""
945
 
946
- #: src/Tribe/Aggregator/Service.php:526
947
  msgid "Successfully fetched Facebook Token"
948
  msgstr ""
949
 
950
- #: src/Tribe/Aggregator/Service.php:527
951
  msgid "Successfully loaded import origins"
952
  msgstr ""
953
 
954
- #: src/Tribe/Aggregator/Service.php:528
955
  msgid "Import is complete"
956
  msgstr ""
957
 
958
- #: src/Tribe/Aggregator/Service.php:529
959
  msgid "Import queued"
960
  msgstr ""
961
 
962
- #: src/Tribe/Aggregator/Service.php:530
963
  msgid "Events could not be imported. The URL provided could not be reached."
964
  msgstr ""
965
 
966
- #: src/Tribe/Aggregator/Service.php:531
967
  msgid ""
968
  "The requested source does not have any upcoming and published events "
969
  "matching the search criteria."
970
  msgstr ""
971
 
972
- #: src/Tribe/Aggregator/Service.php:548
973
  msgid "Unknown service message"
974
  msgstr ""
975
 
@@ -2188,7 +2195,7 @@ msgstr ""
2188
  msgid "Upcoming Events"
2189
  msgstr ""
2190
 
2191
- #. #-#-#-#-# the-events-calendar.pot (The Events Calendar 4.5.8) #-#-#-#-#
2192
  #. Plugin Name of the plugin/theme
2193
  #: src/Tribe/Main.php:714 src/Tribe/Main.php:1049
2194
  msgid "The Events Calendar"
2
  # This file is distributed under the same license as the The Events Calendar package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: The Events Calendar 4.5.8.1\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/the-events-"
7
  "calendar\n"
8
+ "POT-Creation-Date: 2017-07-21 15:09:46+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
+ "PO-Revision-Date: 2017-07-21 15:09\n"
13
  "Last-Translator: \n"
14
  "Language-Team: \n"
15
 
94
  msgid "All %s"
95
  msgstr ""
96
 
97
+ #: src/Tribe/Aggregator/API/Origins.php:31 src/Tribe/Aggregator/Service.php:260
98
  msgid "CSV File"
99
  msgstr ""
100
 
179
  "The image associated with your event could not be attached to the event."
180
  msgstr ""
181
 
182
+ #: src/Tribe/Aggregator/Errors.php:46 src/Tribe/Aggregator/Service.php:542
183
  msgid ""
184
  "The daily limit of %d import requests to the Event Aggregator service has "
185
  "been reached. Please try again later."
261
  "Licenses before using this service."
262
  msgstr ""
263
 
264
+ #: src/Tribe/Aggregator/Errors.php:65 src/Tribe/Aggregator/Service.php:188
265
+ #: src/Tribe/Aggregator/Service.php:196
266
  msgid ""
267
  "There may be an issue with the Event Aggregator server. Please try your "
268
  "import again later."
483
  msgid "Record: "
484
  msgstr ""
485
 
486
+ #: src/Tribe/Aggregator/Record/Abstract.php:923
487
  msgid "Deleted Attachment: %d"
488
  msgstr ""
489
 
490
+ #: src/Tribe/Aggregator/Record/Abstract.php:938
491
  msgid " (opens in a new window)"
492
  msgstr ""
493
 
494
+ #: src/Tribe/Aggregator/Record/Abstract.php:964
495
  msgid ""
496
  "When this import was last scheduled to run, the daily limit for your Event "
497
  "Aggregator license had already been reached."
855
  "tribe_aggregator_connection_timeout filter."
856
  msgstr ""
857
 
858
+ #: src/Tribe/Aggregator/Service.php:179
859
+ msgid ""
860
+ "Event Aggregator server has blocked your request. Please try your import "
861
+ "again later or contact support to know why."
862
+ msgstr ""
863
+
864
+ #: src/Tribe/Aggregator/Service.php:209
865
  msgid ""
866
  "The response from the Event Aggregator server was badly formed and could not "
867
  "be understood. Please try again."
868
  msgstr ""
869
 
870
+ #: src/Tribe/Aggregator/Service.php:529
871
  msgid "Sorry, but something went wrong. Please try again."
872
  msgstr ""
873
 
874
+ #: src/Tribe/Aggregator/Service.php:530
875
  msgid "Events could not be imported. The import parameters were invalid."
876
  msgstr ""
877
 
878
+ #: src/Tribe/Aggregator/Service.php:531
879
  msgid ""
880
  "Events cannot be imported because Facebook has returned an error. This could "
881
  "mean that the event ID does not exist, the event or source is marked as "
885
  "knowledgebase</a>."
886
  msgstr ""
887
 
888
+ #: src/Tribe/Aggregator/Service.php:532
889
  msgid "No upcoming Facebook events found."
890
  msgstr ""
891
 
892
+ #: src/Tribe/Aggregator/Service.php:533
893
  msgid "The URL provided could not be reached."
894
  msgstr ""
895
 
896
+ #: src/Tribe/Aggregator/Service.php:534
897
  msgid "The URL provided failed to load."
898
  msgstr ""
899
 
900
+ #: src/Tribe/Aggregator/Service.php:535
901
  msgid "The image associated with your event could not be imported."
902
  msgstr ""
903
 
904
+ #: src/Tribe/Aggregator/Service.php:536
905
  msgid ""
906
  "The image associated with your event is not accessible with your API key."
907
  msgstr ""
908
 
909
+ #: src/Tribe/Aggregator/Service.php:537
910
  msgid ""
911
  "The import failed for an unknown reason. Please try again. If the problem "
912
  "persists, please contact support."
913
  msgstr ""
914
 
915
+ #: src/Tribe/Aggregator/Service.php:538
916
  msgid ""
917
  "Events could not be imported. The URL provided did not have events in the "
918
  "proper format."
919
  msgstr ""
920
 
921
+ #: src/Tribe/Aggregator/Service.php:539
922
  msgid ""
923
  "The file provided could not be opened. Please confirm that it is a properly "
924
  "formatted .ics file."
925
  msgstr ""
926
 
927
+ #: src/Tribe/Aggregator/Service.php:540
928
  msgid "Your Meetup API key is invalid."
929
  msgstr ""
930
 
931
+ #: src/Tribe/Aggregator/Service.php:541
932
  msgid ""
933
  "Event Aggregator cannot reach Meetup.com because you exceeded the request "
934
  "limit for your Meetup API key."
935
  msgstr ""
936
 
937
+ #: src/Tribe/Aggregator/Service.php:543
938
  msgid "The import is in progress."
939
  msgstr ""
940
 
941
+ #: src/Tribe/Aggregator/Service.php:544
942
  msgid "The import will be starting soon."
943
  msgstr ""
944
 
945
+ #: src/Tribe/Aggregator/Service.php:545
946
  msgid "Success"
947
  msgstr ""
948
 
949
+ #: src/Tribe/Aggregator/Service.php:546
950
  msgid "Import created"
951
  msgstr ""
952
 
953
+ #: src/Tribe/Aggregator/Service.php:547
954
  msgid "Successfully fetched Facebook Token"
955
  msgstr ""
956
 
957
+ #: src/Tribe/Aggregator/Service.php:548
958
  msgid "Successfully loaded import origins"
959
  msgstr ""
960
 
961
+ #: src/Tribe/Aggregator/Service.php:549
962
  msgid "Import is complete"
963
  msgstr ""
964
 
965
+ #: src/Tribe/Aggregator/Service.php:550
966
  msgid "Import queued"
967
  msgstr ""
968
 
969
+ #: src/Tribe/Aggregator/Service.php:551
970
  msgid "Events could not be imported. The URL provided could not be reached."
971
  msgstr ""
972
 
973
+ #: src/Tribe/Aggregator/Service.php:552
974
  msgid ""
975
  "The requested source does not have any upcoming and published events "
976
  "matching the search criteria."
977
  msgstr ""
978
 
979
+ #: src/Tribe/Aggregator/Service.php:569
980
  msgid "Unknown service message"
981
  msgstr ""
982
 
2195
  msgid "Upcoming Events"
2196
  msgstr ""
2197
 
2198
+ #. #-#-#-#-# the-events-calendar.pot (The Events Calendar 4.5.8.1) #-#-#-#-#
2199
  #. Plugin Name of the plugin/theme
2200
  #: src/Tribe/Main.php:714 src/Tribe/Main.php:1049
2201
  msgid "The Events Calendar"
readme.txt CHANGED
@@ -4,7 +4,7 @@ Contributors: ModernTribe, aguseo, borkweb, barry.hughes, bordoni, brianjessee,
4
  Tags: events, calendar, event, venue, organizer, dates, date, google maps, conference, workshop, concert, meeting, seminar, summit, class, modern tribe, tribe, widget
5
  Donate link: http://m.tri.be/29
6
  Requires at least: 3.9
7
- Stable tag: 4.5.8
8
  Tested up to: 4.8
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -327,6 +327,10 @@ Please see the changelog for the complete list of changes in this release. Remem
327
 
328
  == Changelog ==
329
 
 
 
 
 
330
  = [4.5.8] 2017-07-13 =
331
 
332
  * Fix - Remove permalink logic for recurring events (Events Calendar PRO will implement instead) [74153]
4
  Tags: events, calendar, event, venue, organizer, dates, date, google maps, conference, workshop, concert, meeting, seminar, summit, class, modern tribe, tribe, widget
5
  Donate link: http://m.tri.be/29
6
  Requires at least: 3.9
7
+ Stable tag: 4.5.8.1
8
  Tested up to: 4.8
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
327
 
328
  == Changelog ==
329
 
330
+ = [4.5.8.1] 2017-07-21 =
331
+
332
+ * Fix - Fixed an issue where failed EA Imports would hang for a long time before failing [83344]
333
+
334
  = [4.5.8] 2017-07-13 =
335
 
336
  * Fix - Remove permalink logic for recurring events (Events Calendar PRO will implement instead) [74153]
src/Tribe/Aggregator/API/Import.php CHANGED
@@ -60,7 +60,7 @@ class Tribe__Events__Aggregator__API__Import extends Tribe__Events__Aggregator__
60
  *
61
  * @param string $import_id Event Aggregator import id
62
  *
63
- * @return stdClass|WP_Error
64
  */
65
  public function get( $import_id, $data = array() ) {
66
  $response = $this->service->get_import( $import_id, $data );
@@ -85,7 +85,7 @@ class Tribe__Events__Aggregator__API__Import extends Tribe__Events__Aggregator__
85
  // let's try to use the localized version of the message if available
86
  if ( ! empty( $response->message_code ) ) {
87
  $default = ! empty( $response->message ) ? $response->message : $this->service->get_unknown_message();
88
- $response->message = $this->service->get_service_message( $response->message_code, $default );
89
  }
90
 
91
  if ( 'success_import-complete' !== $response->message_code ) {
60
  *
61
  * @param string $import_id Event Aggregator import id
62
  *
63
+ * @return stdClass|WP_Error A class containing the service response or a WP_Error if the service could not be reached.
64
  */
65
  public function get( $import_id, $data = array() ) {
66
  $response = $this->service->get_import( $import_id, $data );
85
  // let's try to use the localized version of the message if available
86
  if ( ! empty( $response->message_code ) ) {
87
  $default = ! empty( $response->message ) ? $response->message : $this->service->get_unknown_message();
88
+ $response->message = $this->service->get_service_message( $response->message_code, array(), $default );
89
  }
90
 
91
  if ( 'success_import-complete' !== $response->message_code ) {
src/Tribe/Aggregator/Record/Abstract.php CHANGED
@@ -634,8 +634,9 @@ abstract class Tribe__Events__Aggregator__Record__Abstract {
634
  }
635
 
636
  public function get_import_data() {
 
637
  $aggregator = tribe( 'events-aggregator.main' );
638
- $data = array();
639
 
640
  // For now only apply this to the URL type
641
  if ( 'url' === $this->type ) {
@@ -645,7 +646,13 @@ abstract class Tribe__Events__Aggregator__Record__Abstract {
645
  );
646
  }
647
 
648
- return $aggregator->api( 'import' )->get( $this->meta['import_id'], $data );
 
 
 
 
 
 
649
  }
650
 
651
  public function delete( $force = false ) {
@@ -1830,4 +1837,33 @@ abstract class Tribe__Events__Aggregator__Record__Abstract {
1830
 
1831
  return $wpdb->last_error !== $this->last_wpdb_error;
1832
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1833
  }
634
  }
635
 
636
  public function get_import_data() {
637
+ /** @var \Tribe__Events__Aggregator $aggregator */
638
  $aggregator = tribe( 'events-aggregator.main' );
639
+ $data = array();
640
 
641
  // For now only apply this to the URL type
642
  if ( 'url' === $this->type ) {
646
  );
647
  }
648
 
649
+ /** @var \Tribe__Events__Aggregator__API__Import $import_api */
650
+ $import_api = $aggregator->api( 'import' );
651
+ $import_data = $import_api->get( $this->meta['import_id'], $data );
652
+
653
+ $import_data = $this->maybe_cast_to_error( $import_data );
654
+
655
+ return $import_data;
656
  }
657
 
658
  public function delete( $force = false ) {
1837
 
1838
  return $wpdb->last_error !== $this->last_wpdb_error;
1839
  }
1840
+
1841
+ /**
1842
+ * Cast error responses from the Service to WP_Errors to ease processing down the line.
1843
+ *
1844
+ * If a response is a WP_Error already or is not an error response then it will not be modified.
1845
+ *
1846
+ * @since TBD
1847
+ *
1848
+ * @param WP_Error|object $import_data
1849
+ *
1850
+ * @return array|\WP_Error
1851
+ */
1852
+ protected function maybe_cast_to_error( $import_data ) {
1853
+ if ( is_wp_error( $import_data ) ) {
1854
+ return $import_data;
1855
+ }
1856
+
1857
+ if ( ! empty( $import_data->status ) && 'error' === $import_data->status ) {
1858
+ $import_data = (array) $import_data;
1859
+ $code = Tribe__Utils__Array::get( $import_data, 'message_code', 'error:import-failed' );
1860
+ /** @var \Tribe__Events__Aggregator__Service $service */
1861
+ $service = tribe( 'events-aggregator.service' );
1862
+ $message = Tribe__Utils__Array::get( $import_data, 'message', $service->get_service_message( 'error:import-failed' ) );
1863
+ $data = Tribe__Utils__Array::get( $import_data, 'data', array() );
1864
+ $import_data = new WP_Error( $code, $message, $data );
1865
+ }
1866
+
1867
+ return $import_data;
1868
+ }
1869
  }
src/Tribe/Aggregator/Service.php CHANGED
@@ -169,11 +169,32 @@ class Tribe__Events__Aggregator__Service {
169
  if ( isset( $response->errors['http_request_failed'] ) ) {
170
  $response->errors['http_request_failed'][0] = __( 'Connection timed out while transferring the feed. If you are dealing with large feeds you may need to customize the tribe_aggregator_connection_timeout filter.', 'the-events-calendar' );
171
  }
 
172
  return $response;
173
  }
174
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
175
  if ( isset( $response->data ) && isset( $response->data->status ) && '404' === $response->data->status ) {
176
- return new WP_Error( 'core:aggregator:daily-limit-reached', esc_html__( 'There may be an issue with the Event Aggregator server. Please try your import again later.', 'the-events-calendar' ) );
 
 
 
177
  }
178
 
179
  // if the response is not an image, let's json decode the body
169
  if ( isset( $response->errors['http_request_failed'] ) ) {
170
  $response->errors['http_request_failed'][0] = __( 'Connection timed out while transferring the feed. If you are dealing with large feeds you may need to customize the tribe_aggregator_connection_timeout filter.', 'the-events-calendar' );
171
  }
172
+
173
  return $response;
174
  }
175
 
176
+ if ( 403 == wp_remote_retrieve_response_code( $response ) ) {
177
+ return new WP_Error(
178
+ 'core:aggregator:request-denied',
179
+ esc_html__( 'Event Aggregator server has blocked your request. Please try your import again later or contact support to know why.',
180
+ 'the-events-calendar' )
181
+ );
182
+ }
183
+
184
+ // we know it is not a 404 or 403 at this point
185
+ if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
186
+ return new WP_Error(
187
+ 'core:aggregator:bad-response',
188
+ esc_html__( 'There may be an issue with the Event Aggregator server. Please try your import again later.',
189
+ 'the-events-calendar' )
190
+ );
191
+ }
192
+
193
  if ( isset( $response->data ) && isset( $response->data->status ) && '404' === $response->data->status ) {
194
+ return new WP_Error(
195
+ 'core:aggregator:daily-limit-reached',
196
+ esc_html__( 'There may be an issue with the Event Aggregator server. Please try your import again later.', 'the-events-calendar' )
197
+ );
198
  }
199
 
200
  // if the response is not an image, let's json decode the body
src/Tribe/Main.php CHANGED
@@ -32,7 +32,7 @@ if ( ! class_exists( 'Tribe__Events__Main' ) ) {
32
  const VENUE_POST_TYPE = 'tribe_venue';
33
  const ORGANIZER_POST_TYPE = 'tribe_organizer';
34
 
35
- const VERSION = '4.5.8';
36
  const MIN_ADDON_VERSION = '4.4';
37
  const MIN_COMMON_VERSION = '4.5.6';
38
 
32
  const VENUE_POST_TYPE = 'tribe_venue';
33
  const ORGANIZER_POST_TYPE = 'tribe_organizer';
34
 
35
+ const VERSION = '4.5.8.1';
36
  const MIN_ADDON_VERSION = '4.4';
37
  const MIN_COMMON_VERSION = '4.5.6';
38
 
the-events-calendar.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  Plugin Name: The Events Calendar
4
  Description: The Events Calendar is a carefully crafted, extensible plugin that lets you easily share your events. Beautiful. Solid. Awesome.
5
- Version: 4.5.8
6
  Author: Modern Tribe, Inc.
7
  Author URI: http://m.tri.be/1x
8
  Text Domain: the-events-calendar
2
  /*
3
  Plugin Name: The Events Calendar
4
  Description: The Events Calendar is a carefully crafted, extensible plugin that lets you easily share your events. Beautiful. Solid. Awesome.
5
+ Version: 4.5.8.1
6
  Author: Modern Tribe, Inc.
7
  Author URI: http://m.tri.be/1x
8
  Text Domain: the-events-calendar