Changeset 4859

Timestamp:

02/03/2017 04:12:11 PM (8 years ago)

Author:

iandunn

Message:

Official WordPress Events: Show long state/country names for clarity

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php

@@ -428 +428 @@
                         $geocoded_location = $this->reverse_geocode( $meetup->group->group_lat, $meetup->group->group_lon );
                         $location_parts    = $this->parse_reverse_geocode_address( $geocoded_location->address_components );
-                        $location          = implode( ', ', $location_parts );
+                        $location          = sprintf(
+                            '%s%s%s',
+                            $location_parts['city'],
+                            empty( $location_parts['state'] )        ?  '' : ', ' . $location_parts['state'],
+                            empty( $location_parts['country_name'] ) ?  '' : ', ' . $location_parts['country_name']
+                        );
                     }
 
@@ -443 +448 @@
                         'end_timestamp'   => ( empty ( $meetup->duration ) ? $start_timestamp : $start_timestamp + ( $meetup->duration / 1000 ) ), // convert to seconds
                         'location'        => $location,
-                        'country_code'    => strtoupper( $meetup->venue->country ?? $location_parts['country'] ?? '' ),
+                        'country_code'    => strtoupper( $meetup->venue->country ?? $location_parts['country_code'] ?? '' ),
                         'latitude'        => $meetup->venue->lat ?? $meetup->group->group_lat,
                         'longitude'       => $meetup->venue->lon ?? $meetup->group->group_lon,
@@ -527 +532 @@
                 $address['state'] = $component->short_name;
             } elseif ( 'country' == $component->types[0] ) {
-                $address['country'] = strtoupper( $component->short_name );
+                $address['country_code'] = strtoupper( $component->short_name );
+                $address['country_name'] = $component->long_name;
             }
         }
@@ -544 +550 @@
         $location = array();
 
-        foreach ( array( 'city', 'state', 'country' ) as $part ) {
+        foreach ( array( 'city', 'state', 'localized_country_name' ) as $part ) {
             if ( ! empty( $venue->$part ) ) {
-                if ( in_array( $part, array( 'state', 'country' ) ) ) {
+                if ( in_array( $part, array( 'state' ) ) ) {
                     $location[] = strtoupper( $venue->$part );
                 } else {