[php-blog-cvs] serendipity serendipity_functions.inc.php,1.71,1.72 serendipity_lang_de.inc.php,1.8,1.9 serendipity_lang_en.inc.php,1.12,1.13

[<jhe...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv7331

Modified Files:
	serendipity_functions.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php 
Log Message:
Removed static text and made some rss regexps case-insensitive.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serendipity_functions.inc.php	22 Jun 2003 12:33:18 -0000	1.71
+++ serendipity_functions.inc.php	22 Jun 2003 14:03:17 -0000	1.72
@@ -109,7 +109,7 @@
 ?>
 <TABLE CLASS='serendipity_calendar' CELLSPACING=0>
 <TR>
-<TD ALIGN='left' class='serendipity_calendarHeader'><A HREF='<?= $serendipity['serendipityHTTPPath'] ?>index.php?serendipity[calendarZoom]=<?= $previousYear.sprintf("%02d",$previousMonth)?>'><IMG ALT="Back" SRC='<?= $serendipity["serendipityHTTPPath"] ?>pixel/back.png' BORDER='0'></A></TD>
+<TD ALIGN='left' class='serendipity_calendarHeader'><A HREF='<?= $serendipity['serendipityHTTPPath'] ?>index.php?serendipity[calendarZoom]=<?= $previousYear.sprintf("%02d",$previousMonth)?>'><IMG ALT="<?=BACK?>" SRC='<?= $serendipity["serendipityHTTPPath"] ?>pixel/back.png' BORDER='0'></A></TD>
 <TD COLSPAN='5' ALIGN='center' VALIGN='bottom' CLASS='serendipity_calendarHeader'><B><nobr>
 <?php
 		if ($serendipity["rewrite"]==true) {
@@ -123,7 +123,7 @@
 </nobr></B></TD>
 <TD ALIGN='right' class='serendipity_calendarHeader'>
     <A HREF='<?= $serendipity['serendipityHTTPPath'] ?>index.php?serendipity[calendarZoom]=<?= $nextYear.sprintf("%02d",$nextMonth) ?>'>
-        <IMG ALT="Forward" SRC='<?= $serendipity["serendipityHTTPPath"] ?>pixel/forward.png' BORDER='0'>
+        <IMG ALT="<?=FORWARD?>" SRC='<?= $serendipity["serendipityHTTPPath"] ?>pixel/forward.png' BORDER='0'>
     </A>
 </TD>
 </TR>
@@ -134,12 +134,12 @@
         // Print the calendar
         $currDay = 1;
         for ($x=0; $x<6; $x++) {
-            
+
 	    // Break out if we are out of days
 	    if ($currDay>$nrOfDays) {
 	    	break;
 	    }
-	    
+
 	    // Prepare row
             print ("<TR CLASS='serendipity_calendar'>");
             for ($y=0; $y<7; $y++) {
@@ -439,8 +439,8 @@
 	if ( !empty($comment['email']) ) {
 		$comment['email'] = str_replace('@', '[at]', $comment['email']);
 	}
-	
-        $name = empty($comment['author']) ? 'Anonymous' : $comment['author'];
+
+        $name = empty($comment['author']) ? ANONYMOUS : $comment['author'];
 	$body = htmlentities($comment['body']);
 ?>
     <tr>
@@ -448,15 +448,15 @@
     		<a name="c<?=$comment['id']?>"></a>
     		<?=nl2br(serendipity_markup_text(serendipity_emoticate($body)))?><br />
 	<div class="serendipity_comment_source">
-    		<a href="<?=$PHP_SELF?>#c<?=$comment['id']?>" title="Link to comment #<?= $x ?>">#<?= $x ?></a> - 
+    		<a href="<?=$PHP_SELF?>#c<?=$comment['id']?>" title="<?=LINK_TO_COMMENT?><?= $x ?>">#<?= $x ?></a> -
 		<?php
 			echo $type ." ";
 		?>
 		<?php
 			/* Link to the user's email */
 			if ( !empty($comment['email']) ) {
-				echo  "<a href=\"mailto:$comment[email]\"  title=\"Send a mail to $name ($comment[email])\">$name</a>";
-			} else { 
+				echo  "<a href=\"mailto:$comment[email]\"  title=\"".SEND_MAIL_TO." $name ($comment[email])\">$name</a>";
+			} else {
 				echo $name;
 			}
 		?>
@@ -471,13 +471,13 @@
 			echo " ". ON ." ". date("M d, h:i", $comment['timestamp']);
 		?>
 <?php
-	 if ( $_SESSION["serendipityAuthedUser"] === true ) { 
+	 if ( $_SESSION["serendipityAuthedUser"] === true ) {
 ?>
     (<a href="<?=$serendipity["baseURL"]?>comment.php?serendipity[delete]=<?=$comment['id']?>&serendipity[entry]=<?=$comment['entry_id']?>&serendipity[type]=comments"><?= DELETE ?></a>)
-<?php 
-	 } 
+<?php
+	 }
 ?>
-    
+
     	</div>
     </td>
     </tr>
@@ -572,11 +572,11 @@
 
     $entryURI = $serendipity['baseURL']
               . "archives/"
-	      . $id 
+	      . $id
 	      . "_".serendipity_makeFilename($title).".html";
-						       
+
     if ($type == 'TRACKBACK') {
-	$subject =  "[$serendipity[blogTitle]] New trackback made to $title";
+	$subject =  "[$serendipity[blogTitle]] ".NEW_TRACKBACK_TO." $title";
 	$text = sprintf(A_NEW_TRACKBACK_BLAHBLAH, $title) ."
 Link to entry: ". $entryURI  ."
 
@@ -588,9 +588,9 @@
 
 
     } else {
-	$subject = "[$serendipity[blogTitle]] New comment posted to $title";
+	$subject = "[$serendipity[blogTitle]] ".NEW_COMMENT_TO." $title";
 	$text = sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity[blogTitle],$title) ."
-Link to entry: ". $entryURI  ."
+Link: ". $entryURI  ."
 
 User IP Address: $_SERVER[REMOTE_ADDR]
 User ". NAME  .": $fromName
@@ -789,7 +789,7 @@
     if($_SERVER['X-PINGBACK']) {
         $pingback = $_SERVER['X-PINGBACK'];
     }
-    else if(preg_match('@<link rel="pingback" href="([^"]+)" ?/?>@', $body, $matches)) {
+    else if(preg_match('@<link rel="pingback" href="([^"]+)" ?/?>@i', $body, $matches)) {
         $pingback = $matches[1];
     }
     else {
@@ -848,11 +848,11 @@
 function
 serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text)
 {
-    if(!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $res, $matches)) {
+    if(!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@i', $res, $matches)) {
         return;
     }
 
-	if (preg_match('@dc:identifier\s*=\s*"(http:[^"]+)"@', $res, $test)) {
+	if (preg_match('@dc:identifier\s*=\s*"(http:[^"]+)"@i', $res, $test)) {
 		if ($loc != $test[1]) {
 			return;
 		}
@@ -1182,7 +1182,7 @@
 		default:
 			return false;
 	}
-	
+
 	/* If our loader does not exist, we are doomed */
 	if ( !function_exists($loadfn) ) {
 		return false;

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_de.inc.php	22 May 2003 23:01:00 -0000	1.8
+++ serendipity_lang_de.inc.php	22 Jun 2003 14:03:17 -0000	1.9
@@ -19,7 +19,7 @@
 define("SERENDIPITY_ADMIN_SUITE", "Serendipity Verwaltungsoberfl&auml;che");
 define("HAVE_TO_BE_LOGGED_ON", "Sie m&uuml;ssen angemeldet sein, um diese Seite zu sehen:");
 define("APPEARANCE", "Aussehen");
-define("MANAGE_CSS", "CSS verwalten");
+define("MANAGE_STYLES", "Styles verwalten");
 define("CONFIGURE_PLUGINS", "Plugins verwalten");
 define("ADMIN", "Admin:");
 define("CONFIGURATION", "Konfiguration");
@@ -32,6 +32,13 @@
 define("EDIT_THIS_CAT", "\"%s - %s\" bearbeiten");
 define("SAVE", "Speichern");
 define("NAME", "Name");
+define("SEND_MAIL_TO", "Mail schicken an");
+define("NEW_TRACKBACK_TO", "Neues Trackback f&uuml;r");
+define("NEW_COMMENT_TO", "Neuer Kommentar f&uuml;r");
+define("RECENT", "Das neueste...");
+define("OLDER", "&Auml;lteres...");
+define("ANONYMOUS", "Anonym");
+define("LINK_TO_COMMENT", "Link zu Kommentar #");
 define("DESCRIPTION", "Beschreibung");
 define("CLICK_CAT_TO_EDIT", "Zum Bearbeiten auf eine Kategorie klicken");
 define("CREATE_NEW_CAT", "Neue Kategorie");
@@ -41,6 +48,7 @@
 define("I_WANT_NO_LINK", "Das Bild soll kein Link sein");
 define("I_WANT_IT_TO_LINK", "Das Bild soll hierhin linken:");
 define("BACK", "Zur&uuml;ck");
+define("FORWARD", "Vorw&auml;rts");
 define("DONE", "Fertig");
 define("CLICK_IMAGE_TO_INSERT", "Auf ein Bild klicken um es einzuf&uuml;gen:");
 define("WELCOME_BACK", "Willkommen zur&uuml;ck,");

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_lang_en.inc.php	26 May 2003 00:18:56 -0000	1.12
+++ serendipity_lang_en.inc.php	22 Jun 2003 14:03:17 -0000	1.13
@@ -16,11 +16,11 @@
 
 $serendipity["weekDayAbb"] = array("M", "Tu", "W", "Th", "F", "Sa", "Su");
 
-
-define("SERENDIPITY_ADMIN_SUITE", "Serendipity Administration Suite");
-define("HAVE_TO_BE_LOGGED_ON", "You have to be logged on to view this page:");
-define("APPEARANCE", "Appearance");
-define("MANAGE_CSS", "Manage css");
+
+define("SERENDIPITY_ADMIN_SUITE", "Serendipity Administration Suite");
+define("HAVE_TO_BE_LOGGED_ON", "You have to be logged on to view this page:");
+define("APPEARANCE", "Appearance");
+define("MANAGE_STYLES", "Manage styles");
 define("CONFIGURE_PLUGINS", "Configure Plugins");
 define("ADMIN", "Admin:");
 define("CONFIGURATION", "Configuration");
@@ -42,6 +42,14 @@
 define("I_WANT_NO_LINK", " I don't want the image to be a hyperlink");
 define("I_WANT_IT_TO_LINK", "I want it to link to this url:");
 define("BACK", "Back");
+define("FORWARD", "Forward");
+define("ANONYMOUS", "Anonymous");
+define("LINK_TO_COMMENT", "Link to comment #");
+define("SEND_MAIL_TO", "Send a mail to ");
+define("NEW_TRACKBACK_TO", "New trackback made to");
+define("NEW_COMMENT_TO", "New comment posted to");
+define("RECENT", "Recent...");
+define("OLDER", "Older...");
 define("DONE", "Done");
 define("CLICK_IMAGE_TO_INSERT", "Click the image you want to insert:");
 define("WELCOME_BACK", "Welcome back,");