Changeset 25536

Timestamp:

09/21/2013 04:07:34 AM (11 years ago)

Author:

nacin

Message:

Accept and store translations data from the plugin and theme update check endpoints.

Send site locale. Rename wp_get_installed_language_data() to wp_get_installed_translations().

see #18200.

Location:

trunk/src/wp-includes

Files:

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

trunk/src/wp-includes/l10n.php

@@ -628 +628 @@
 
 /**
- * Get installed language data.
+ * Get installed translations.
  *
  * Looks in the wp-content/languages directory for translations of
@@ -638 +638 @@
  * @return array Array of language data.
  */
-function wp_get_installed_language_data( $type ) {
+function wp_get_installed_translations( $type ) {
     if ( $type !== 'themes' && $type !== 'plugins' )
         return array();

trunk/src/wp-includes/update.php

@@ -147 +147 @@
 
     $plugins = get_plugins();
-    $languages = wp_get_installed_language_data( 'plugins' );
+    $translations = wp_get_installed_translations( 'plugins' );
 
     $active  = get_option( 'active_plugins', array() );
@@ -203 +203 @@
     $options = array(
         'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
-        'body' => array( 'plugins' => json_encode( $to_send ), 'languages' => json_encode( $languages ) ),
+        'body' => array(
+            'plugins'      => json_encode( $to_send ),
+            'translations' => json_encode( $translations ),
+            'locale'       => json_encode( array( get_locale() ) ), // @todo filter.
+        ),
         'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
     );
@@ -216 +220 @@
         return false;
 
-    $response = json_decode( wp_remote_retrieve_body( $raw_response ) );
-
-    if ( is_object( $response ) )
-        $new_option->response = (array) $response->plugins;
-    else
+    $response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
+    foreach ( $response['plugins'] as &$plugin ) {
+        $plugin = (object) $plugin;
+    }
+    unset( $plugin );
+
+    if ( is_array( $response ) ) {
+        $new_option->response = $response['plugins'];
+        $new_option->translations = $response['translations'];
+    } else {
         $new_option->response = array();
+    }
 
     set_site_transient( 'update_plugins', $new_option );
@@ -246 +256 @@
 
     $installed_themes = wp_get_themes();
-    $languages = wp_get_installed_language_data( 'themes' );
+    $translations = wp_get_installed_translations( 'themes' );
 
     $last_update = get_site_transient( 'update_themes' );
@@ -315 +325 @@
     $options = array(
         'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
-        'body'          => array( 'themes' => json_encode( $request ), 'languages' => json_encode( $languages ) ),
+        'body' => array(
+            'themes'       => json_encode( $request ),
+            'translations' => json_encode( $translations ),
+            'locale'       => json_encode( array( get_locale() ) ), // @todo filter.
+        ),
         'user-agent'    => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
     );
@@ -334 +348 @@
     $response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
 
-    if ( is_array( $response ) )
-        $new_update->response = $response['themes'];
+    if ( is_array( $response ) ) {
+        $new_update->response     = $response['themes'];
+        $new_update->translations = $response['translations'];
+    }
 
     set_site_transient( 'update_themes', $new_update );