From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Wed, 3 Aug 2005 06:07:41 +0000 (+0000)
Subject: Add messages too
X-Git-Tag: 1.6.0~2068
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=d10a2c46d28d36fd552b40d3ddeaf0cb0249c574;p=lhc%2Fweb%2Fwiklou.git

Add messages too
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 1125b94065..64a79b52f1 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -747,16 +747,16 @@ wfdebug("CONFLICT: edittime=".$this->edittime." article timestamp=".$this->mArti
 		$recreate = '';
 		if ($confirmdelete) {
 			if ( 'save' != $formtype ) {
-				$wgOut->addWikiText( wfMsg('bw_deletedwhileediting'));
+				$wgOut->addWikiText( wfMsg('deletedwhileediting'));
 			} else {
 				// Hide the toolbar and edit area, use can click preview to get it back
 				// Add an confirmation checkbox and explanation.
 				$toolbar = '';
 				$hidden = 'type="hidden" style="display:none;"';
-				$recreate = $wgOut->parse( wfMsg( 'bw_confirmrecreate',  $query->user_name , $query->log_comment ));
+				$recreate = $wgOut->parse( wfMsg( 'confirmrecreate',  $query->user_name , $query->log_comment ));
 				$recreate .=
 					"<br /><input tabindex='1' type='checkbox' value='1' name='wpRecreate' id='wpRecreate' />".
-					"<label for='wpRecreate' title='".wfMsg('bw_tooltip-recreate')."'>". wfMsg('bw_recreate')."</label>";
+					"<label for='wpRecreate' title='".wfMsg('tooltip-recreate')."'>". wfMsg('recreate')."</label>";
 			}
 		}
 
@@ -832,7 +832,7 @@ END
 
 	function getLastDelete() {
 		$dbr =& wfGetDB( DB_SLAVE );
-
+		$fname = 'EditPage::getLastDelete';
 		$res = $dbr->select(
 			array( 'logging', 'user' ),
 			array( 'log_type',
@@ -849,7 +849,7 @@ END
 			       'log_type="delete"',
 			       'log_action="delete"',
 			       'user_id=log_user' ),
-			'EditPage::getLastDelete',
+			$fname,
 			array( 'LIMIT' => 1, 'ORDER BY' => 'log_timestamp DESC' ) );
 
 		if($dbr->numRows($res) == 1) {
diff --git a/languages/Language.php b/languages/Language.php
index c0f68412b3..a4f05489c9 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2124,6 +2124,18 @@ $1
 'trackbackremove' => ' ([$1 Delete])',
 'trackbacklink' => 'Trackback',
 'trackbackdeleteok' => 'The trackback was successfully deleted.',
+
+
+# delete conflict
+
+'deletedwhileediting' => 'Warning: This page has been deleted after you started editing!',
+'confirmrecreate' => 'User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this article after you started editing with reason:
+: \'\'$2\'\'
+Please confirm that really want to recreate this article.',
+'recreate' => 'Recreate',
+'tooltip-recreate' => '',
+
+
 );
 
 /* a fake language converter */