Revert "Didn't mean to include this"
Revert "Didn't mean to include this"

This reverts commit 3ba0ae41b8177e6a03049d6868c0dabc1bb2c5fe.

--- a/include/display.git_project_list.php
+++ b/include/display.git_project_list.php
@@ -58,8 +58,7 @@
 				$tpl->assign("categorizedprojects",$projects);
 			}
 		} else {
-			$tpl->assign("message",lookupstring("noprojectsfound"));
-			//$tpl->assign("message",lookupstring("No projects found"));
+			$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,14 +19,12 @@
 	global $tpl,$gitphp_conf;
 
 	if (!$gitphp_conf['search']) {
-		git_message(lookupstring('searchhasbeendisabled'), TRUE, TRUE);
-		//git_message(lookupstring('Search has been disabled'), TRUE, TRUE);
+		git_message(lookupstring('Search has been disabled'), TRUE, TRUE);
 		return;
 	}
 
 	if (!isset($search) || (strlen($search) < 2)) {
-		git_message(lookupstring('searchtooshort'), TRUE, TRUE);
-		//git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
+		git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
 		return;
 	}
 	if (!isset($hash)) {
@@ -38,8 +36,7 @@
 
 	$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('nomatches'), $search), FALSE, TRUE);
-		//git_message(sprintf(lookupstring('No matches for \'%1$s\'.'), $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,14 +19,12 @@
 	global $tpl,$gitphp_conf;
 
 	if (!($gitphp_conf['search'] && $gitphp_conf['filesearch'])) {
-		git_message(lookupstring('filesearchhasbeendisabled'), TRUE, TRUE);
-		//git_message(lookupstring('File search has been disabled'), TRUE, TRUE);
+		git_message(lookupstring('File search has been disabled'), TRUE, TRUE);
 		return;
 	}
 
 	if (!isset($search) || (strlen($search) < 2)) {
-		git_message(lookupstring('searchtooshort'), TRUE, TRUE);
-		//git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
+		git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
 		return;
 	}
 	if (!isset($hash)) {
@@ -39,8 +37,7 @@
 	$filesearch = git_filesearch($projectroot . $project, $hash, $search, false, ($page * 100), 101);
 
 	if (count($filesearch) < 1) {
-		git_message(sprintf(lookupstring('nomatches'), $search), FALSE, TRUE);
-		//git_message(sprintf(lookupstring('No matches for \'%1$s\'.'), $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,12 +46,10 @@
 						$projects[$i] = $p;
 				}
 			}
-		} else {
-			return lookupstring("projectrootisnotadirectory");
-			//return lookupstring("Projectroot is not a directory");
-		}
+		} else
+			return lookupstring("Projectroot is not a directory");
 	} else
-		return lookupstring("noprojectrootset");
+		return lookupstring("No projectroot set");
 	return $projects;
 }
 

 Binary files /dev/null and b/include/locale/._zz_DEBUG.php differ
--- 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
 	 */
-	'noprojectsfound' => 'No projects found',
+	'No projects found' => 'No projects found',
 
 	/*
 	 * Error message that tells the user that the projectroot
 	 * they have set up is not a directory
 	 */
-	'projectrootisnotadirectory' => 'Projectroot is not a directory',
+	'Projectroot is not a directory' => 'Projectroot is not a directory',
 
 	/*
 	 * Error message that tells the user that they have not set
 	 * a projectroot
 	 */
-	'noprojectrootset' => 'No projectroot set',
+	'No projectroot set' => 'No projectroot set',
 
 	/*
 	 * Tells the user that all searching has been disabled
 	 */
-	'searchhasbeendisabled' => 'Search has been disabled',
+	'Search has been disabled' => 'Search has been disabled',
 
 	/*
 	 * Tells the user that searching with files has been disabled
 	 */
-	'filesearchhasbeendisabled' => 'File search has been disabled',
+	'File search has been disabled' => 'File search has been disabled',
 
 	/*
 	 * Tells the user that their search string must be a minimum of 2 characters
 	 */
-	'searchtooshort' => 'You must enter search text of at least 2 characters',
+	'You must enter search text of at least 2 characters' => '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
 	 */
-	'nomatches' => 'No matches for \'%1$s\'.',
+	'No matches for \'%1$s\'.' => 'No matches for \'%1$s\'.',
 
 	/*
 	 * Used to indicate multiple projects - links back to the project
@@ -360,45 +360,6 @@
 	 * where %1$d is the numebr of files changed
 	 */
 	'fileschanged' => '%1$d files changed',
-
-	/*
-	 * Used on a plaintext diff to indicate who it's from
-	 */
-	'From' => 'From',
-
-	/*
-	 * Used on a plaintext diff to indicate the date
-	 */
-	'Date' => 'Date',
-
-	/*
-	 * Used on a plaintext diff to indicate the subject
-	 */
-	'Subject' => 'Subject',
-
-	/*
-	 * Used in the rss feed description to indicate that this
-	 * is a certain project's log, where %1$s is the project path
-	 */
-	'projectlog' => '%1$s log',
-
-	/*
-	 * Used in the rss feed to indicate the language
-	 */
-	'rsslang' => 'en',
-
-	/*
-	 * Used as the title of the opml export to indicate that this
-	 * is an export of a certain gitphp instance, where
-	 * %1$s is the title of the gitphp install
-	 */
-	'opmlexport' => '%1$s OPML Export',
-
-	/*
-	 * Used as the text for the opml container to indicate that
-	 * it contains git rss feeds
-	 */
-	'gitrssfeeds' => 'git RSS feeds',
 );
 
 ?>

--- 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
 	 */
-	'noprojectsfound' => '{Nő prōjěcts fŏůnd•••••}',
+	'No projects found' => 'No projects found',
 
 	/*
 	 * Error message that tells the user that the projectroot
 	 * they have set up is not a directory
 	 */
-	'projectrootisnotadirectory' => '{Prŏjĕctrőőt ĩs nōt ā dĩrėctōry•••••••••}',
+	'Projectroot is not a directory' => 'Projectroot is not a directory',
 
 	/*
 	 * Error message that tells the user that they have not set
 	 * a projectroot
 	 */
-	'noprojectrootset' => '{Nŏ prőjēctrōŏt sėt•••••}',
+	'No projectroot set' => 'No projectroot set',
 
 	/*
 	 * Tells the user that all searching has been disabled
 	 */
-	'searchhasbeendisabled' => '{Séãrch hås bêën dîsáblëd•••••••}',
+	'Search has been disabled' => 'Search has been disabled',
 
 	/*
 	 * Tells the user that searching with files has been disabled
 	 */
-	'filesearchhasbeendisabled' => '{Fïle sëärch hås béèn dïsåbléd••••••••}',
+	'File search has been disabled' => 'File search has been disabled',
 
 	/*
 	 * Tells the user that their search string must be a minimum of 2 characters
 	 */
-	'searchtooshort' => '{Yōu můst ėntěr sēărch tĕxt ōf āt lėåst 2 chãräctérs•••••••••••••••}',
+	'You must enter search text of at least 2 characters' => '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
 	 */
-	'nomatches' => '{‹%1$s› mătĉh nōt fŏůnd•••••}',
+	'No matches for \'%1$s\'.' => 'No matches for \'%1$s\'.',
 
 	/*
 	 * Used to indicate multiple projects - links back to the project
@@ -235,19 +235,19 @@
 	'HEAD' => '{HĚĂD•}',
 	
 	/*
-         * Used to indicate the description of the project, on the project summary page
-         */
-        'description' => '{dêscrïptìõn•••}',
-
-        /*
-         * Used to indicate the owner of the project, on the project summary page
-         */
-        'owner' => '{öwnêr•}',
-
-       /*
-        * Used to indicate the age (last change) of the project, on the project summary page
-        */
-        'lastchange' => '{låst chãngë•••}',
+     * Used to indicate the description of the project, on the project summary page
+     */
+    'description' => '{dêscrïptìõn•••}',
+
+    /*
+     * Used to indicate the owner of the project, on the project summary page
+     */
+    'owner' => '{öwnêr•}',
+
+    /*
+     * Used to indicate the age (last change) of the project, on the project summary page
+     */
+    'lastchange' => '{låst chãngë•••}',
 
 	/*
 	 * Used to indicate the object that is the parent of this one (eg the commit that
@@ -355,50 +355,11 @@
 	 */
 	'agerightnow' => '{rĩght nøw•••}',
 	
-        /*
-         * Used to indicate a certain number of files were changed in a commit
-         * where %1$d is the numebr of files changed
-         */
-        'fileschanged' => '{chângëd ‹%1$d› fĭlēs••••}',
-
-	/*
-	 * Used on a plaintext diff to indicate who it's from
-	 */
-	'From' => '{Fröm•}',
-
-	/*
-	 * Used on a plaintext diff to indicate the date
-	 */
-	'Date' => '{Dātë•}',
-
-	/*
-	 * Used on a plaintext diff to indicate the subject
-	 */
-	'Subject' => '{Sübjêct••}',
-
-	/*
-	 * Used in the rss feed description to indicate that this
-	 * is a certain project's log, where %1$s is the project path
-	 */
-	'projectlog' => '{lög ‹%1$s›•}',
-
-	/*
-	 * Used in the rss feed to indicate the language
-	 */
-	'rsslang' => 'zz',
-
-	/*
-	 * Used as the title of the opml export to indicate that this
-	 * is an export of a certain gitphp instance, where
-	 * %1$s is the title of the gitphp install
-	 */
-	'opmlexport' => '{ÖPML ‹%1$s› Êxpört•••}',
-
-	/*
-	 * Used as the text for the opml container to indicate that
-	 * it contains git rss feeds
-	 */
-	'gitrssfeeds' => '{gît RSS féèds••••}',
+     /*
+      * Used to indicate a certain number of files were changed in a commit
+      * where %1$d is the numebr of files changed
+      */
+     'fileschanged' => '{chângëd ‹%1$d› fĭlēs••••}',
 );
 
 ?>

--- a/templates/diff_plaintext.tpl
+++ b/templates/diff_plaintext.tpl
@@ -5,9 +5,9 @@
  *
  *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
  *}
-{$localize.From}: {$from}
-{$localize.Date}: {$date}
-{$localize.Subject}: {$subject}
+From: {$from}
+Date: {$date}
+Subject: {$subject}
 {if $tagname}
 X-Git-Tag: {$tagname}
 {/if}

--- a/templates/opml.tpl
+++ b/templates/opml.tpl
@@ -8,10 +8,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <opml version="1.0">
   <head>
-    <title>{$localize.opmlexport|sprintf:$title}</title>
+    <title>{$title} OPML Export</title>
   </head>
   <body>
-    <outline text="{$localize.gitrssfeeds}">
+    <outline text="git RSS feeds">
 
       {foreach from=$opmllist item=proj}
       <outline type="rss" text="{$proj}" title="{$proj}" xmlUrl="{$self}?p={$proj}&amp;a=rss" htmlUrl="{$self}?p={$proj}&amp;a=summary" />

--- a/templates/rss.tpl
+++ b/templates/rss.tpl
@@ -10,8 +10,8 @@
   <channel>
     <title>{$project}</title>
     <link>{$self}?p={$project}&amp;a=summary</link>
-    <description>{$localize.projectlog|sprintf:$project}</description>
-    <language>{$localize.rsslang}</language>
+    <description>{$project} log</description>
+    <language>en</language>
 
     {section name=rssitem loop=$commitlines}
       <item>

comments