Refactor the error messages and make them translatable.

westi · westi · commit a1f53d258b7e · 2010-05-03T10:13:40.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@14366 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/theme-compat/comments-popup.php b/wp-includes/theme-compat/comments-popup.php
@@ -7,7 +7,7 @@
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  * 
  */
-_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a comments-popup.php template in your theme.');
+_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
diff --git a/wp-includes/theme-compat/comments.php b/wp-includes/theme-compat/comments.php
@@ -7,7 +7,7 @@
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  * 
  */
-_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a comments.php template in your theme.');
+_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 
 // Do not delete these lines
 	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
diff --git a/wp-includes/theme-compat/footer.php b/wp-includes/theme-compat/footer.php
@@ -7,7 +7,7 @@
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  * 
  */
-_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a footer.php template in your theme.');
+_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 ?>
 
 <hr />
diff --git a/wp-includes/theme-compat/header.php b/wp-includes/theme-compat/header.php
@@ -7,7 +7,7 @@
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  * 
  */
-_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a header.php template in your theme.');
+_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
diff --git a/wp-includes/theme-compat/sidebar.php b/wp-includes/theme-compat/sidebar.php
@@ -7,7 +7,7 @@
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  * 
  */
-_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a sidebar.php template in your theme.');
+_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 ?>
 	<div id="sidebar" role="complementary">
 		<ul>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* This file is here for Backwards compatibility with old themes and will be removed in a future version`
`8`	`8`	`*`
`9`	`9`	`*/`
`10`		`-_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a comments-popup.php template in your theme.');`
	`10`	`+_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );`
`11`	`11`	`?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">`
`12`	`12`	`<html xmlns="http://www.w3.org/1999/xhtml">`
`13`	`13`	`<head>`