From 65da064055da1fe453cba9521908e3f1d2606d1d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 12 Apr 2019 20:49:51 +0000 Subject: [PATCH] Bootstrap/Load: Finalize recovery mode email language. Props TimothyBlynJacobs, miss_jwo, desrosj. Fixes #46898. Built from https://develop.svn.wordpress.org/trunk@45181 git-svn-id: http://core.svn.wordpress.org/trunk@44990 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../class-wp-recovery-mode-email-service.php | 13 +++++++------ wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/wp-includes/class-wp-recovery-mode-email-service.php b/wp-includes/class-wp-recovery-mode-email-service.php index 040585db27..82bca75f17 100644 --- a/wp-includes/class-wp-recovery-mode-email-service.php +++ b/wp-includes/class-wp-recovery-mode-email-service.php @@ -125,26 +125,27 @@ final class WP_Recovery_Mode_Email_Service { $message = __( 'Howdy, -Your site recently crashed on ###LOCATION### and may not be working as expected. +Your site recently crashed and may not be working as expected. ###CAUSE### -Click the link below to initiate recovery mode and fix the problem. +Please click the link below to initiate recovery mode and fix the problem. This link expires in ###EXPIRES###. ###LINK### ###DETAILS### + +--The WordPress Team +https://wordpress.org/ ' ); $message = str_replace( array( '###LINK###', - '###LOCATION###', '###EXPIRES###', '###CAUSE###', '###DETAILS###', ), array( $url, - 'TBD', human_time_diff( time() + $rate_limit ), $cause ? "\n{$cause}\n" : "\n", $details, @@ -235,13 +236,13 @@ This link expires in ###EXPIRES###. } /* translators: %s: plugin name */ - $cause = sprintf( __( 'This was caused by the %s plugin.' ), $name ); + $cause = sprintf( __( 'This was caused by the following plugin: %s.' ), $name ); } else { $theme = wp_get_theme( $extension['slug'] ); $name = $theme->exists() ? $theme->display( 'Name' ) : $extension['slug']; /* translators: %s: theme name */ - $cause = sprintf( __( 'This was caused by the %s theme.' ), $name ); + $cause = sprintf( __( 'This was caused by the following theme: %s.' ), $name ); } return $cause; diff --git a/wp-includes/version.php b/wp-includes/version.php index 6e0f281b27..7046c3e751 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2-beta2-45180'; +$wp_version = '5.2-beta2-45181'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.