From 038e2e2e4f521c6fca7df215370cae26bee84bbd Mon Sep 17 00:00:00 2001 From: "Dominik Schilling (ocean90)" Date: Thu, 30 Jul 2015 17:08:01 +0000 Subject: [PATCH] Editor: word count: Remove indentation from the translator comment. Avoids a duplicate comment in the POT file. see #30966. git-svn-id: https://develop.svn.wordpress.org/trunk@33517 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/formatting.php | 8 +++++--- src/wp-includes/script-loader.php | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php index 6449e91500..54d4355e86 100644 --- a/src/wp-includes/formatting.php +++ b/src/wp-includes/formatting.php @@ -2851,9 +2851,11 @@ function wp_trim_words( $text, $num_words = 55, $more = null ) { $original_text = $text; $text = wp_strip_all_tags( $text ); - /* translators: If your word count is based on single characters (e.g. East Asian characters), - enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'. - Do not translate into your own language. */ + /* + * translators: If your word count is based on single characters (e.g. East Asian characters), + * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'. + * Do not translate into your own language. + */ if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) { $text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' ); preg_match_all( '/./u', $text, $words_array ); diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 67a43d7fea..e3460a22eb 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -401,9 +401,11 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1 ); did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array( - /* translators: If your word count is based on single characters (e.g. East Asian characters), - enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'. - Do not translate into your own language. */ + /* + * translators: If your word count is based on single characters (e.g. East Asian characters), + * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'. + * Do not translate into your own language. + */ 'type' => _x( 'words', 'Word count type. Do not translate!' ), 'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array() ) );