[php-blog-cvs] serendipity index.php,1.24,1.25 serendipity_lang_de.inc.php,1.22,1.23 serendipity_lang_en.inc.php,1.31,1.32 serendipity_admin_installer.inc.php,1.28,1.29

[<gar...@us...>]

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

Modified Files:
	index.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php 
	serendipity_admin_installer.inc.php 
Log Message:
o Added new substring for unsubscription to german translation.

o Redirect to $serendipity['indexFile'] instead of 'index.php'.

o Added DATABASE_ALREADY_EXISTS. Please, Tom, use constants for any language
output you insert!



Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- index.php	16 Aug 2003 20:03:13 -0000	1.24
+++ index.php	17 Aug 2003 16:12:55 -0000	1.25
@@ -117,7 +117,7 @@
 } else if (preg_match('@/unsubscribe/(.*)/([0-9]+)@', $uri, $res)) {
     serendipity_cancelSubscription($res[1], $res[2]);
     /* Fixme: send the user to the unsubscribed entry */
-    header("Location: {$serendipity['serendipityHTTPPath']}index.php");
+    header("Location: {$serendipity['serendipityHTTPPath']}{$serendipity['indexFile']}");
     exit;
 } else if (preg_match('@/admin$@', $uri)) {
     header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php");

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_lang_de.inc.php	16 Aug 2003 11:05:48 -0000	1.22
+++ serendipity_lang_de.inc.php	17 Aug 2003 16:12:55 -0000	1.23
@@ -247,8 +247,9 @@
 define('TOGGLE_OPTION', 'Option ein-/ausblenden');
 define('SUBSCRIBE_TO_THIS_ENTRY', 'Bei Aktualisierung dieser Kommentare benachrichtigen');
 define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Benachrichtigung zu neuem Kommentar des Eintrags "%s"');
-define('SUBSCRIPTION_MAIL', "Hallo %s,\n\nEin neues Kommentar wurde dem Eintrag hinzugefügt, den Sie auf \"%s\" namens \"%s\" finden.\nDer Name des Autoren ist: %s\n\nSie können den Eintrag hier finden: %s\n");
+define('SUBSCRIPTION_MAIL', "Hallo %s,\n\nEin neues Kommentar wurde dem Eintrag hinzugefügt, den Sie auf \"%s\" namens \"%s\" finden.\nDer Name des Autoren ist: %s\n\nSie können den Eintrag hier finden: %s\n\nSie können diese Benachrichtung mit folgender URL kündigen: %s\n");
 define('SIGNATURE', "\n-- \n%s wird betrieben mit Serendipity.\nDas allerbeste blog, Sie können es auch nutzen.\nWie das geht, sehen Sie auf <http://s9y.org>.");
+define('DATABASE_ALREADY_INSTALLED', 'ÜBERSPRUNGEN: Datenbank besteht bereits');
 
 define('serendipity_LANG_LOADED', true);
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_lang_en.inc.php	16 Aug 2003 20:03:13 -0000	1.31
+++ serendipity_lang_en.inc.php	17 Aug 2003 16:12:55 -0000	1.32
@@ -245,11 +245,11 @@
 define('REALLY_SCALE_IMAGE', 'Really scale the image? No way back!');
 define('TOGGLE_ALL', 'Toggle expand all');
 define('TOGGLE_OPTION', 'Toggle option');
-
 define('SUBSCRIBE_TO_THIS_ENTRY', 'Subscribe to this entry');
 define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'New comment to subscribed entry "%s"');
 define('SUBSCRIPTION_MAIL', "Hello %s,\n\nA new comment was made to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n");
 define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nThe best blog around, you can use it too.\nCheck out <http://s9y.org> to find out how.");
+define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database already installed');
 
 define('serendipity_LANG_LOADED', true);
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_admin_installer.inc.php	16 Aug 2003 21:33:56 -0000	1.28
+++ serendipity_admin_installer.inc.php	17 Aug 2003 16:12:55 -0000	1.29
@@ -410,7 +410,7 @@
             if ( $res !== false ) {
                 echo ' ' . DONE . '<br />';
             } else {
-                echo '<span style="color: #FF0000">- SKIPPED: Database already installed</span><br />';
+                echo '<span style="color: #FF0000">- ' . DATABASE_ALREADY_INSTALLED . '</span><br />';
             }
 
             /* Next are the files, .htaccess */