Changeset 7069 for sites/trunk/wp15.wordpress.net/public_html/content/plugins/wp15-meetup-events/wp15-meetup-events.php

Timestamp:

04/09/2018 09:28:29 PM (6 years ago)

Author:

iandunn

Message:

WP15: Use an unlocalized format when converting between timezones.

Props pedromendonca.
Fixes #3560.

File:

• sites/trunk/wp15.wordpress.net/public_html/content/plugins/wp15-meetup-events/wp15-meetup-events.php (modified) (3 diffs)

sites/trunk/wp15.wordpress.net/public_html/content/plugins/wp15-meetup-events/wp15-meetup-events.php

@@ -110 +110 @@
         $event['longitude']   = ! empty( $event['venue']['lon'] ) ? $event['venue']['lon'] : $event['group']['group_lon'];
         $event['group']       = $event['group']['name'];
-        $event['description'] = isset( $event['description'] ) ? $event['description'] : '';
+        $event['description'] = isset( $event['description'] ) ? trim( $event['description'] ) : '';
         $event['time']        = $event['time'] / 1000;  // Convert to seconds.
         $event['location']    = trim( implode( ' ', $location ) );
@@ -306 +306 @@
  */
 function get_local_formatted_date( $utc_timestamp, $timezone ) {
+    // translators: Do not include `T`, `P`, or `O`, because that will show the site's timezone/difference, not the event's. The event dates will already be converted to their local timezone.
     $date_format = _x( 'F jS, Y g:ia', 'WP15 event date format', 'wp15' );
 
@@ -312 +313 @@
         $utc_datetime->setTimezone( new DateTimeZone( $timezone ) );
 
-        $local_timestamp = strtotime( $utc_datetime->format( $date_format ) );
+        // Convert to a timestamp in the local timezone, in order to pass through `date_i18n()` for month name translation.
+        $local_timestamp = strtotime( $utc_datetime->format( 'Y-m-d H:i' ) );
         $formatted_date  = date_i18n( $date_format, $local_timestamp );
     } catch ( Exception $exception ) {