Changeset 25652

Timestamp:

09/30/2013 07:46:15 PM (12 years ago)

Author:

nacin

Message:

Send back core translation information to the API. Update wp_get_installed_translations() to work with core translations. see #18200.

Location:

trunk/src/wp-includes

Files:

• l10n.php (modified) (2 diffs)
• update.php (modified) (3 diffs)

trunk/src/wp-includes/l10n.php

@@ -746 +746 @@
  * @since 3.7.0
  *
- * @param string $type What to search for. Accepts 'plugins', 'themes'.
+ * @param string $type What to search for. Accepts 'plugins', 'themes', 'core'.
  * @return array Array of language data.
  */
 function wp_get_installed_translations( $type ) {
-    if ( $type !== 'themes' && $type !== 'plugins' )
+    if ( $type !== 'themes' && $type !== 'plugins' && $type !== 'core' )
         return array();
 
-    if ( ! is_dir( WP_LANG_DIR ) || ! is_dir( WP_LANG_DIR . "/$type" ) )
+    $dir = 'core' === $type ? '' : "/$type";
+
+    if ( ! is_dir( WP_LANG_DIR ) )
         return array();
 
-    $files = scandir( WP_LANG_DIR . "/$type" );
+    if ( $dir && ! is_dir( WP_LANG_DIR . $dir ) )
+        return array();
+
+    $files = scandir( WP_LANG_DIR . $dir );
     if ( ! $files )
         return array();
@@ -767 +772 @@
         if ( substr( $file, -3 ) !== '.po' )
             continue;
-        if ( ! preg_match( '/(.*)-([A-Za-z_]{2,6}).po/', $file, $match ) )
+        if ( ! preg_match( '/(?:(.+)-)?([A-Za-z_]{2,6}).po/', $file, $match ) )
             continue;
 
         list( , $textdomain, $language ) = $match;
-        $language_data[ $textdomain ][ $language ] = wp_get_pomo_file_data( WP_LANG_DIR . "/$type/$file" );
+        if ( '' === $textdomain )
+            $textdomain = 'default';
+        $language_data[ $textdomain ][ $language ] = wp_get_pomo_file_data( WP_LANG_DIR . "$dir/$file" );
     }
     return $language_data;

trunk/src/wp-includes/update.php

@@ -29 +29 @@
 
     $current = get_site_transient( 'update_core' );
+    $translations = wp_get_installed_translations( 'core' );
+
     if ( ! is_object($current) ) {
         $current = new stdClass;
@@ -86 +88 @@
             'wp_install' => $wp_install,
             'wp_blog' => home_url( '/' )
-        )
+        ),
+        'body' => array(
+            'translations' => json_encode( $translations ),
+        ),
     );
 
-    $response = wp_remote_get($url, $options);
+    $response = wp_remote_post( $url, $options );
 
     if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
@@ -120 +125 @@
     $updates->last_checked = time();
     $updates->version_checked = $wp_version;
+
+    if ( isset( $body['translations'] ) )
+        $updates->translations = $body['translations'];
+
     set_site_transient( 'update_core',  $updates);
 }