Changeset 32471

Timestamp:

05/09/2015 06:26:37 PM (9 years ago)

Author:

ocean90

Message:

Merge similar error strings.

props pavelevap.
fixes #32327.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-press-this.php (modified) (1 diff)
• wp-includes/atomlib.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-press-this.php

@@ -281 +281 @@
 
         } else if ( is_wp_error( $source_tmp_file ) ) {
-            $source_content = new WP_Error( 'upload-error',  sprintf( __( 'Error: %s' ), sprintf( __( 'Could not download the source URL (native error: %s).' ), $source_tmp_file->get_error_message() ) ) );
+            $source_content = new WP_Error( 'upload-error',  sprintf( __( 'ERROR: %s' ), sprintf( __( 'Could not download the source URL (native error: %s).' ), $source_tmp_file->get_error_message() ) ) );
         } else if ( ! file_exists( $source_tmp_file ) ) {
-            $source_content = new WP_Error( 'no-local-file',  sprintf( __( 'Error: %s' ), __( 'Could not save or locate the temporary download file for the source URL.' ) ) );
+            $source_content = new WP_Error( 'no-local-file',  sprintf( __( 'ERROR: %s' ), __( 'Could not save or locate the temporary download file for the source URL.' ) ) );
         }
 

trunk/src/wp-includes/atomlib.php

@@ -131 +131 @@
 
             if(!xml_parse($parser, $data, feof($fp))) {
-                trigger_error(sprintf(__('XML error: %s at line %d')."\n",
+                /* translators: 1: error message, 2: line number */
+                trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
                     xml_error_string(xml_get_error_code($parser)),
                     xml_get_current_line_number($parser)));