Skip to content

Commit

Permalink
Release/2.2.4 - WIP (#233)
Browse files Browse the repository at this point in the history
* Legacy: swap the parameter order in an implode() usage. (#234)
* Upgrade: do not use sanitization functions on start/end values. (#235)
  • Loading branch information
JJJ authored Aug 31, 2021
1 parent d2e4fc0 commit 18e39c5
Show file tree
Hide file tree
Showing 7 changed files with 218 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sugar-calendar",
"version": "2.2.3",
"version": "2.2.4",
"description": "A calendar with a sweet disposition.",
"private": true,
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Tags: simple calendar, event calendar, event management, event list
Requires PHP: 5.6.20
Requires at least: 5.5
Tested up to: 5.8
Stable tag: 2.2.3
Stable tag: 2.2.4

You can easily manage events with this lightweight calendar. No complicated configuration. Simple to use. Sweeeet!

Expand Down
2 changes: 1 addition & 1 deletion sugar-calendar-lite.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Domain Path: /sugar-calendar/includes/languages/
* Requires PHP: 5.6.20
* Requires at least: 5.5
* Version: 2.2.3
* Version: 2.2.4
*/

// Exit if accessed directly
Expand Down
9 changes: 2 additions & 7 deletions sugar-calendar/includes/admin/upgrades.php
Original file line number Diff line number Diff line change
Expand Up @@ -375,13 +375,8 @@ function do_20_migration() {
$all_day = false;

// Format the start & end
$start = gmdate( 'Y-m-d H:i:s', $start );
$end = gmdate( 'Y-m-d H:i:s', $end );

// Sanitize start & end to prevent data entry errors
$start_date_time = \Sugar_Calendar\Admin\Editor\Meta\sanitize_start( $start, $end, $all_day );
$end_date_time = \Sugar_Calendar\Admin\Editor\Meta\sanitize_end( $end, $start, $all_day );
$all_day = \Sugar_Calendar\Admin\Editor\Meta\sanitize_all_day( $all_day, $start, $end );
$start_date_time = gmdate( 'Y-m-d H:i:s', $start );
$end_date_time = gmdate( 'Y-m-d H:i:s', $end );

// Recurring
$recur_type = get_post_meta( $post->ID, 'sc_event_recurring', true );
Expand Down
218 changes: 211 additions & 7 deletions sugar-calendar/includes/languages/sugar-calendar.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# This file is distributed under the GNU General Public License v2 or later.
msgid ""
msgstr ""
"Project-Id-Version: Sugar Calendar (Lite) 2.2.3\n"
"Project-Id-Version: Sugar Calendar (Lite) 2.2.4\n"
"Report-Msgid-Bugs-To: https://sugarcalendar.com\n"
"POT-Creation-Date: 2021-08-23 17:42:19+00:00\n"
"POT-Creation-Date: 2021-08-31 18:35:47+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand All @@ -29,6 +29,7 @@ msgid "Verifying"
msgstr ""

#: sugar-calendar/includes/admin/assets.php:154
#: sugar-calendar/includes/standard/license.php:752
msgid "Verify"
msgstr ""

Expand All @@ -37,6 +38,7 @@ msgid "Verifying..."
msgstr ""

#: sugar-calendar/includes/admin/assets.php:156
#: sugar-calendar/includes/standard/license.php:580
msgid "Please enter a valid license key."
msgstr ""

Expand Down Expand Up @@ -1242,27 +1244,27 @@ msgstr ""
msgid "Upgrade Now!"
msgstr ""

#: sugar-calendar/includes/admin/upgrades.php:41
#: sugar-calendar/includes/admin/upgrades.php:40
msgid "Sugar Calendar Upgrades"
msgstr ""

#: sugar-calendar/includes/admin/upgrades.php:45
#: sugar-calendar/includes/admin/upgrades.php:44
msgid ""
"The upgrade process has begun. Please be patient. You will be redirected "
"when it is finished."
msgstr ""

#: sugar-calendar/includes/admin/upgrades.php:48
#: sugar-calendar/includes/admin/upgrades.php:47
msgid "Step %d of %d..."
msgstr ""

#: sugar-calendar/includes/admin/upgrades.php:130
#: sugar-calendar/includes/admin/upgrades.php:129
msgid ""
"Sugar Calendar needs to upgrade the events database. Click <a "
"href=\"%s\">here</a> to start."
msgstr ""

#: sugar-calendar/includes/admin/upgrades.php:137
#: sugar-calendar/includes/admin/upgrades.php:136
msgid ""
"Sugar Calendar needs to perform an upgrade. Click <a href=\"%s\">here</a> "
"to start."
Expand Down Expand Up @@ -1554,6 +1556,198 @@ msgstr ""
msgid "Event scheduled."
msgstr ""

#: sugar-calendar/includes/standard/beta-updates.php:40
msgid "Updates"
msgstr ""

#: sugar-calendar/includes/standard/beta-updates.php:74
msgid "Software Updates"
msgstr ""

#: sugar-calendar/includes/standard/beta-updates.php:79
msgid "Get Beta Versions"
msgstr ""

#: sugar-calendar/includes/standard/beta-updates.php:82
msgid "Receive update notifications about beta versions instead."
msgstr ""

#: sugar-calendar/includes/standard/duplicate.php:29
msgid "Invalid item ID."
msgstr ""

#: sugar-calendar/includes/standard/duplicate.php:34
#: sugar-calendar/includes/standard/duplicate.php:57
msgid "Sorry, this item cannot be copied."
msgstr ""

#: sugar-calendar/includes/standard/duplicate.php:48
msgid "The item you are trying to copy no longer exists."
msgstr ""

#: sugar-calendar/includes/standard/duplicate.php:62
msgid "Sorry, you are not allowed to copy this item."
msgstr ""

#: sugar-calendar/includes/standard/duplicate.php:70
msgid "This post does not have event data."
msgstr ""

#: sugar-calendar/includes/standard/duplicate.php:87
#: sugar-calendar/includes/standard/duplicate.php:99
msgid "Error copying the item."
msgstr ""

#: sugar-calendar/includes/standard/license.php:271
msgid "License"
msgstr ""

#: sugar-calendar/includes/standard/license.php:546
msgid "This is a lifetime license. That is amazing!"
msgstr ""

#: sugar-calendar/includes/standard/license.php:552
msgid " until: <time datetime=\"%s\">%s (at %s)</time>"
msgstr ""

#: sugar-calendar/includes/standard/license.php:581
msgid "Empty"
msgstr ""

#: sugar-calendar/includes/standard/license.php:588
msgid "This license key is valid%s."
msgstr ""

#: sugar-calendar/includes/standard/license.php:589
msgid "Valid"
msgstr ""

#: sugar-calendar/includes/standard/license.php:596
msgid "This license key is expired"
msgstr ""

#: sugar-calendar/includes/standard/license.php:597
msgid "Expired"
msgstr ""

#: sugar-calendar/includes/standard/license.php:604
#: sugar-calendar/includes/standard/license.php:612
msgid "This license key is disabled."
msgstr ""

#: sugar-calendar/includes/standard/license.php:605
msgid "Disabled"
msgstr ""

#: sugar-calendar/includes/standard/license.php:613
msgid "Revoked"
msgstr ""

#: sugar-calendar/includes/standard/license.php:620
msgid "This license key is not valid."
msgstr ""

#: sugar-calendar/includes/standard/license.php:621
#: sugar-calendar/includes/standard/license.php:669
msgid "Invalid"
msgstr ""

#: sugar-calendar/includes/standard/license.php:628
#: sugar-calendar/includes/standard/license.php:636
#: sugar-calendar/includes/standard/license.php:652
msgid "This license key is saved but has not been verified."
msgstr ""

#: sugar-calendar/includes/standard/license.php:629
#: sugar-calendar/includes/standard/license.php:637
#: sugar-calendar/includes/standard/license.php:653
msgid "Site Inactive"
msgstr ""

#: sugar-calendar/includes/standard/license.php:644
msgid "This license key could not be deactivated."
msgstr ""

#: sugar-calendar/includes/standard/license.php:645
msgid "Failed"
msgstr ""

#: sugar-calendar/includes/standard/license.php:660
#: sugar-calendar/includes/standard/license.php:668
msgid "This license key appears to be for another product."
msgstr ""

#: sugar-calendar/includes/standard/license.php:661
msgid "Mismatch"
msgstr ""

#: sugar-calendar/includes/standard/license.php:676
msgid "This license key has reached its activation limit."
msgstr ""

#: sugar-calendar/includes/standard/license.php:677
msgid "Out of Activations"
msgstr ""

#: sugar-calendar/includes/standard/license.php:738
msgid "License Key"
msgstr ""

#: sugar-calendar/includes/standard/license.php:739
msgid "Enter a valid license key to enable automatic updates"
msgstr ""

#: sugar-calendar/includes/standard/license.php:742
msgid ""
"Look for your license key in your <a "
"href=\"https://sugarcalendar.com/account/\">SugarCalendar.com account</a>. "
"Don't have one? <a href=\"https://sugarcalendar.com/pricing/\">Purchase one "
"today!</a>"
msgstr ""

#: sugar-calendar/includes/standard/license.php:753
msgid "Deactivate"
msgstr ""

#: sugar-calendar/includes/standard/license.php:758
msgid "Refresh Status"
msgstr ""

#: sugar-calendar/includes/standard/recurring.php:93
msgid "Recurrence"
msgstr ""

#: sugar-calendar/includes/standard/recurring.php:129
msgid "Repeat"
msgstr ""

#: sugar-calendar/includes/standard/recurring.php:134
#: sugar-calendar/includes/standard/recurring.php:156
msgid "Never"
msgstr ""

#: sugar-calendar/includes/standard/recurring.php:152
msgid "End Repeat"
msgstr ""

#: sugar-calendar/includes/standard/updater.php:238
msgid "There is a new version of %1$s available. %2$sView version %3$s details%4$s."
msgstr ""

#: sugar-calendar/includes/standard/updater.php:246
msgid ""
"There is a new version of %1$s available. %2$sView version %3$s details%4$s "
"or %5$supdate now%6$s."
msgstr ""

#: sugar-calendar/includes/standard/updater.php:489
msgid "You do not have permission to install plugin updates"
msgstr ""

#: sugar-calendar/includes/standard/updater.php:489
msgid "Error"
msgstr ""

#: sugar-calendar/includes/themes/legacy/calendar.php:179
msgid "Go"
msgstr ""
Expand Down Expand Up @@ -1787,6 +1981,11 @@ msgctxt "verb"
msgid "View"
msgstr ""

#: sugar-calendar/includes/standard/duplicate.php:136
msgctxt "verb"
msgid "Duplicate"
msgstr ""

#: sugar-calendar/includes/admin/list-tables/class-wp-list-table-base.php:2419
#: sugar-calendar/includes/admin/list-tables/class-wp-list-table-base.php:2439
msgctxt "Time Time Zone"
Expand Down Expand Up @@ -1897,6 +2096,11 @@ msgctxt "event"
msgid "Add New"
msgstr ""

#: sugar-calendar/includes/standard/duplicate.php:77
msgctxt "noun"
msgid "Copy"
msgstr ""

#: sugar-calendar/includes/themes/legacy/calendar.php:255
msgctxt "Previous month"
msgid "Previous"
Expand Down
2 changes: 1 addition & 1 deletion sugar-calendar/includes/themes/legacy/events-list.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ function sc_get_events_list( $display = 'upcoming', $category = null, $number =

if ( $event_categories ) {
$categories = wp_list_pluck( $event_categories, 'name' );
echo '<span class="sc_event_categories">' . implode( $categories, ', ' ) . '</span>';
echo '<span class="sc_event_categories">' . implode( ', ', $categories ) . '</span>';
}
}

Expand Down
2 changes: 1 addition & 1 deletion sugar-calendar/sugar-calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ final class Plugin {
* @since 2.0.0
* @var string
*/
private $version = '2.2.3';
private $version = '2.2.4';

/**
* Prefix.
Expand Down

0 comments on commit 18e39c5

Please sign in to comment.