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

This reverts commit c6fda61c9cb5e3b4a5c6610b0f2e0d972798e980.

--- a/include/locale/en_US.php
+++ b/include/locale/en_US.php
@@ -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
@@ -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/header.tpl
+++ b/templates/header.tpl
@@ -5,8 +5,6 @@
  *
  *  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">

--- 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