Revert "Internationalize plain commitdiff"
Revert "Internationalize plain commitdiff"

This reverts commit c6fda61c9cb5e3b4a5c6610b0f2e0d972798e980.

--- a/include/display.git_project_list.php
+++ b/include/display.git_project_list.php
@@ -58,7 +58,8 @@
 				$tpl->assign("categorizedprojects",$projects);
 			}
 		} else {
-			$tpl->assign("message",lookupstring("No projects found"));
+			$tpl->assign("message",lookupstring("noprojectsfound"));
+			//$tpl->assign("message",lookupstring("No projects found"));
 			$tpl->assign("error",TRUE);
 		}
 	} else {

--- a/include/display.git_search.php
+++ b/include/display.git_search.php
@@ -19,12 +19,14 @@
 	global $tpl,$gitphp_conf;
 
 	if (!$gitphp_conf['search']) {
-		git_message(lookupstring('Search has been disabled'), TRUE, TRUE);
+		git_message(lookupstring('searchhasbeendisabled'), TRUE, TRUE);
+		//git_message(lookupstring('Search has been disabled'), TRUE, TRUE);
 		return;
 	}
 
 	if (!isset($search) || (strlen($search) < 2)) {
-		git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
+		git_message(lookupstring('searchtooshort'), TRUE, TRUE);
+		//git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
 		return;
 	}
 	if (!isset($hash)) {
@@ -36,7 +38,8 @@
 
 	$revlist = explode("\n",trim(git_rev_list($projectroot . $project, $hash, 101, ($page * 100), FALSE, FALSE, $searchtype, $search)));
 	if (count($revlist) < 1 || (strlen($revlist[0]) < 1)) {
-		git_message(sprintf(lookupstring('No matches for \'%1$s\'.'), $search), FALSE, TRUE);
+		git_message(sprintf(lookupstring('nomatches'), $search), FALSE, TRUE);
+		//git_message(sprintf(lookupstring('No matches for \'%1$s\'.'), $search), FALSE, TRUE);
 		return;
 	}
 

--- a/include/display.git_search_files.php
+++ b/include/display.git_search_files.php
@@ -19,12 +19,14 @@
 	global $tpl,$gitphp_conf;
 
 	if (!($gitphp_conf['search'] && $gitphp_conf['filesearch'])) {
-		git_message(lookupstring('File search has been disabled'), TRUE, TRUE);
+		git_message(lookupstring('filesearchhasbeendisabled'), TRUE, TRUE);
+		//git_message(lookupstring('File search has been disabled'), TRUE, TRUE);
 		return;
 	}
 
 	if (!isset($search) || (strlen($search) < 2)) {
-		git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
+		git_message(lookupstring('searchtooshort'), TRUE, TRUE);
+		//git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
 		return;
 	}
 	if (!isset($hash)) {
@@ -37,7 +39,8 @@
 	$filesearch = git_filesearch($projectroot . $project, $hash, $search, false, ($page * 100), 101);
 
 	if (count($filesearch) < 1) {
-		git_message(sprintf(lookupstring('No matches for \'%1$s\'.'), $search), FALSE, TRUE);
+		git_message(sprintf(lookupstring('nomatches'), $search), FALSE, TRUE);
+		//git_message(sprintf(lookupstring('No matches for \'%1$s\'.'), $search), FALSE, TRUE);
 		return;
 	}
 

--- a/include/gitutil.git_read_projects.php
+++ b/include/gitutil.git_read_projects.php
@@ -46,10 +46,12 @@
 						$projects[$i] = $p;
 				}
 			}
-		} else
-			return lookupstring("Projectroot is not a directory");
+		} else {
+			return lookupstring("projectrootisnotadirectory");
+			//return lookupstring("Projectroot is not a directory");
+		}
 	} else
-		return lookupstring("No projectroot set");
+		return lookupstring("noprojectrootset");
 	return $projects;
 }
 

--- a/include/locale/en_US.php
+++ b/include/locale/en_US.php
@@ -10,40 +10,40 @@
 	 * Error message that tells the user that
 	 * there were no projects found in the projectroot
 	 */
-	'No projects found' => 'No projects found',
+	'noprojectsfound' => 'No projects found',
 
 	/*
 	 * Error message that tells the user that the projectroot
 	 * they have set up is not a directory
 	 */
-	'Projectroot is not a directory' => 'Projectroot is not a directory',
+	'projectrootisnotadirectory' => 'Projectroot is not a directory',
 
 	/*
 	 * Error message that tells the user that they have not set
 	 * a projectroot
 	 */
-	'No projectroot set' => 'No projectroot set',
+	'noprojectrootset' => 'No projectroot set',
 
 	/*
 	 * Tells the user that all searching has been disabled
 	 */
-	'Search has been disabled' => 'Search has been disabled',
+	'searchhasbeendisabled' => 'Search has been disabled',
 
 	/*
 	 * Tells the user that searching with files has been disabled
 	 */
-	'File search has been disabled' => 'File search has been disabled',
+	'filesearchhasbeendisabled' => 'File search has been disabled',
 
 	/*
 	 * Tells the user that their search string must be a minimum of 2 characters
 	 */
-	'You must enter search text of at least 2 characters' => 'You must enter search text of at least 2 characters',
+	'searchtooshort' => 'You must enter search text of at least 2 characters',
 
 	/*
 	 * Tells the user that no matches were found for their search, where
 	 * %1$s is the search string
 	 */
-	'No matches for \'%1$s\'.' => 'No matches for \'%1$s\'.',
+	'nomatches' => 'No matches for \'%1$s\'.',
 
 	/*
 	 * Used to indicate multiple projects - links back to the project

--- a/include/locale/zz_DEBUG.php
+++ b/include/locale/zz_DEBUG.php
@@ -10,40 +10,40 @@
 	 * Error message that tells the user that
 	 * there were no projects found in the projectroot
 	 */
-	'No projects found' => 'No projects found',
+	'noprojectsfound' => '{Nő prōjěcts fŏůnd•••••}',
 
 	/*
 	 * Error message that tells the user that the projectroot
 	 * they have set up is not a directory
 	 */
-	'Projectroot is not a directory' => 'Projectroot is not a directory',
+	'projectrootisnotadirectory' => '{Prŏjĕctrőőt ĩs nōt ā dĩrėctōry•••••••••}',
 
 	/*
 	 * Error message that tells the user that they have not set
 	 * a projectroot
 	 */
-	'No projectroot set' => 'No projectroot set',
+	'noprojectrootset' => '{Nŏ prőjēctrōŏt sėt•••••}',
 
 	/*
 	 * Tells the user that all searching has been disabled
 	 */
-	'Search has been disabled' => 'Search has been disabled',
+	'searchhasbeendisabled' => '{Séãrch hås bêën dîsáblëd•••••••}',
 
 	/*
 	 * Tells the user that searching with files has been disabled
 	 */
-	'File search has been disabled' => 'File search has been disabled',
+	'filesearchhasbeendisabled' => '{Fïle sëärch hås béèn dïsåbléd••••••••}',
 
 	/*
 	 * Tells the user that their search string must be a minimum of 2 characters
 	 */
-	'You must enter search text of at least 2 characters' => 'You must enter search text of at least 2 characters',
+	'searchtooshort' => '{Yōu můst ėntěr sēărch tĕxt ōf āt lėåst 2 chãräctérs•••••••••••••••}',
 
 	/*
 	 * Tells the user that no matches were found for their search, where
 	 * %1$s is the search string
 	 */
-	'No matches for \'%1$s\'.' => 'No matches for \'%1$s\'.',
+	'nomatches' => '{‹%1$s› mătĉh nōt fŏůnd•••••}',
 
 	/*
 	 * Used to indicate multiple projects - links back to the project

--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -5,14 +5,13 @@
  *
  *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
  *}
-{* $contentType = strpos($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml') === false ? 'text/html' : 'application/xhtml+xml';
-header("Content-Type: $contentType; charset=utf-8"); *}
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   <!-- gitphp web interface {$version}, (C) 2006 Christopher Han <xiphux@gmail.com> -->
   <head>
     <title>{$pagetitle}{if $project && $validproject} :: {$project}{if $action && $validaction}/{$localize.$action}{/if}{/if}</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     {if $validproject}
       <link rel="alternate" title="{$project} log" href="{$SCRIPT_NAME}?p={$project}&a=rss" type="application/rss+xml" />
     {/if}

comments