Changeset 5478

Timestamp:

05/04/2017 05:11:49 PM (9 years ago)

Author:

iandunn

Message:

Events: Ignore en_US locales to avoid false-positives

Props dd32

Location:

sites/trunk/api.wordpress.org/public_html/events/1.0

Files:

• index.php (modified) (2 diffs)
• tests/test-index.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

@@ -398 +398 @@
     }
 
-    $country_code = null;
-    if ( ! $location && ( isset( $args['locale'] ) && preg_match( '/^[a-z]+[-_]([a-z]+)$/i', $args['locale'], $match ) ) ) {
-        $country_code = $match[1];
-    }
+    $country_code = get_country_code_from_locale( $args['locale'] ?? '' );
 
     // Coordinates provided
@@ -492 +489 @@
     wp_cache_set( $cache_key, $location, $cache_group, $cache_life );
     return $location;
+}
+
+/**
+ * Extract the country code from the given locale
+ *
+ * @param string $locale
+ *
+ * @return string|null
+ */
+function get_country_code_from_locale( $locale ) {
+    /*
+     * `en_US` is ignored, because it's the default locale in Core, and many users never set it. That
+     * leads to a lot of false-positives; e.g., Hampton-Sydney, Virginia, USA instead of Sydney, Australia.
+     */
+    if ( empty( $locale ) || 'en_US' === $locale ) {
+        return null;
+    }
+
+    preg_match( '/^[a-z]+[-_]([a-z]+)$/i', $locale, $match );
+
+    $country_code = $match[1] ?? null;
+
+    return $country_code;
 }
 

sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php

@@ -256 +256 @@
         ),
 
+        // Many users never change the default `en_US` locale in Core
+        'city-oceania-with-en_US' => array(
+            'input' => array(
+                'location_name' => 'Sydney',
+                'locale'        => 'en_US',
+                'timezone'      => 'Australia/Sydney',
+            ),
+            'expected' => array(
+                'description' => 'sydney',
+                'latitude'    => '-33.868',
+                'longitude'   => '151.207',
+                'country'     => 'AU',
+            ),
+        ),
+
         'city-south-america' => array(
             'input' => array(