From d8357b76c53a66339145b48b3749da7175e7bd6f Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Sun, 5 Jun 2016 12:22:30 +0000
Subject: [PATCH] Upgrader: Don't use `Language_Pack_Upgrader_Skin::before()`
 and `Language_Pack_Upgrader_Skin::after()` when translations are up to date.

Avoids a PHP notice since `Language_Pack_Upgrader_Skin::before()` tries to access a non-existent update.
Also, change the `up_to_date` string to use the plural form because translations are only updated in bulk mode.

Fixes #36615.
Built from https://develop.svn.wordpress.org/trunk@37635


git-svn-id: http://core.svn.wordpress.org/trunk@37603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-language-pack-upgrader.php | 4 +---
 wp-includes/version.php                            | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/class-language-pack-upgrader.php b/wp-admin/includes/class-language-pack-upgrader.php
index c554a34684..4c212c31d6 100644
--- a/wp-admin/includes/class-language-pack-upgrader.php
+++ b/wp-admin/includes/class-language-pack-upgrader.php
@@ -114,7 +114,7 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 	 */
 	public function upgrade_strings() {
 		$this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while we update them as well.' );
-		$this->strings['up_to_date'] = __( 'The translation is up to date.' ); // We need to silently skip this case
+		$this->strings['up_to_date'] = __( 'The translations are up to date.' );
 		$this->strings['no_package'] = __( 'Update package not available.' );
 		$this->strings['downloading_package'] = __( 'Downloading translation from <span class="code">%s</span>&#8230;' );
 		$this->strings['unpack_package'] = __( 'Unpacking the update&#8230;' );
@@ -181,10 +181,8 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 
 		if ( empty( $language_updates ) ) {
 			$this->skin->header();
-			$this->skin->before();
 			$this->skin->set_result( true );
 			$this->skin->feedback( 'up_to_date' );
-			$this->skin->after();
 			$this->skin->bulk_footer();
 			$this->skin->footer();
 			return true;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 52fa6d1ff7..c116a8c2a6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37634';
+$wp_version = '4.6-alpha-37635';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.