Changeset 25810

Timestamp:

10/16/2013 02:33:21 PM (11 years ago)

Author:

nacin

Message:

Include translations in the update bubbles (as +1 if there are any). see #18200.

Location:

trunk/src

Files:

• wp-admin/includes/update.php (modified) (1 diff)
• wp-includes/update.php (modified) (6 diffs)

trunk/src/wp-admin/includes/update.php

@@ -356 +356 @@
 }
 add_action( 'admin_notices', 'maintenance_nag' );
-
-/**
- * Retrieves a list of all language updates available.
- *
- * @since 3.7.0
- */
-function wp_get_translation_updates() {
-    $updates = array();
-    $transients = array( 'update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme' );
-    foreach ( $transients as $transient => $type ) {
-
-        $transient = get_site_transient( $transient );
-        if ( empty( $transient->translations ) )
-            continue;
-
-        foreach ( $transient->translations as $translation ) {
-            $updates[] = (object) $translation;
-        }
-    }
-
-    return $updates;
-}

trunk/src/wp-includes/update.php

@@ -421 +421 @@
 }
 
+/**
+ * Retrieves a list of all language updates available.
+ *
+ * @since 3.7.0
+ */
+function wp_get_translation_updates() {
+    $updates = array();
+    $transients = array( 'update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme' );
+    foreach ( $transients as $transient => $type ) {
+
+        $transient = get_site_transient( $transient );
+        if ( empty( $transient->translations ) )
+            continue;
+
+        foreach ( $transient->translations as $translation ) {
+            $updates[] = (object) $translation;
+        }
+    }
+
+    return $updates;
+}
+
 /*
  * Collect counts and UI strings for available updates
@@ -429 +451 @@
  */
 function wp_get_update_data() {
-    $counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0 );
-
-    if ( current_user_can( 'update_plugins' ) ) {
+    $counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0, 'translations' => 0 );
+
+    if ( $plugins = current_user_can( 'update_plugins' ) ) {
         $update_plugins = get_site_transient( 'update_plugins' );
         if ( ! empty( $update_plugins->response ) )
@@ -437 +459 @@
     }
 
-    if ( current_user_can( 'update_themes' ) ) {
+    if ( $themes = current_user_can( 'update_themes' ) ) {
         $update_themes = get_site_transient( 'update_themes' );
         if ( ! empty( $update_themes->response ) )
@@ -443 +465 @@
     }
 
-    if ( function_exists( 'get_core_updates' ) && current_user_can( 'update_core' ) ) {
+    if ( ( $core = current_user_can( 'update_core' ) ) && function_exists( 'get_core_updates' ) ) {
         $update_wordpress = get_core_updates( array('dismissed' => false) );
         if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') )
@@ -449 +471 @@
     }
 
-    $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'];
+    if ( ( $core || $plugins || $themes ) && wp_get_translation_updates() )
+        $counts['translations'] = 1;
+
+    $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'] + $counts['translations'];
     $titles = array();
     if ( $counts['wordpress'] )
@@ -457 +482 @@
     if ( $counts['themes'] )
         $titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] );
+    if ( $counts['translations'] )
+        $titles['translations'] = __( 'Translation Updates' );
 
     $update_title = $titles ? esc_attr( implode( ', ', $titles ) ) : '';