WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I18N: Merge two similar "An unexpected error occurred" strings. 

Props ramiy.
Fixes #47035.
Built from https://develop.svn.wordpress.org/trunk@45395


git-svn-id: http://core.svn.wordpress.org/trunk@45206 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-05-24 01:14:52 +00:00
parent a36f5d2295
commit 44512b0753
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/customize/class-wp-customize-themes-section.php
View File

@ -81,7 +81,17 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
<?php $this->filter_bar_content_template(); ?> <?php $this->filter_bar_content_template(); ?>
</div> </div>
<?php $this->filter_drawer_content_template(); ?> <?php $this->filter_drawer_content_template(); ?>
<div class="error unexpected-error" style="display: none; "><p><?php _e( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ); ?></p></div> <div class="error unexpected-error" style="display: none; ">
<p>
<?php
printf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
__( 'https://wordpress.org/support/' )
);
?>
</p>
</div>
<ul class="themes"> <ul class="themes">
</ul> </ul>
<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p> <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45394'; $wp_version = '5.3-alpha-45395';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.