* Restriction types now use restriction-* messages instead of ui messages

* Don't try to link to current page on protection tab

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 410b16a..e99b6ea 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -238,6 +238,7 @@ i18n / Languages:
 * (bug 5015) Update magic words translation in LanguageBe.php
 * (bug 4859) Update for Portuguese messages (pt)
 * (bug 4788) One string for MessagesPl
+* Restriction types now use restriction-* messages instead of ui messages
 
 Parser:
 * (bug 2522) {{CURRENTDAY2}} now shows the current day number with two digits
@@ -634,6 +635,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Avoid corrupting <gallery> inside <!-- comment -->
 * Remove legacy PHPTal code, hasn't been maintained in ages.
 * Tweak Userlogin include order for APC issue
+* Don't try to link to current page on protection tab
 
 
 === Caveats ===

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f44971c..c2f5cb5 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -856,6 +856,7 @@ $wgGroupPermissions['bureaucrat']['userrights'] = true;
 /**
  * Set of available actions that can be restricted via Special:Protect
  * You probably shouldn't change this.
+ * Translated trough restriction-* messages.
  */
 $wgRestrictionTypes = array( 'edit', 'move' );
 

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 5cddb69..65cbfa8 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -132,7 +132,8 @@ class ProtectionForm {
                $out .= "<tbody>";
                $out .= "<tr>\n";
                foreach( $this->mRestrictions as $action => $required ) {
-                       $out .= "<th>" . wfMsgHtml( $action ) . "</th>\n";
+                       /* Not all languages have V_x <-> N_x relation */
+                       $out .= "<th>" . wfMsgHtml( 'restriction-' . $action ) . "</th>\n";
                }
                $out .= "</tr>\n";
                $out .= "<tr>\n";

diff --git a/languages/Messages.php b/languages/Messages.php
index fc72632..78bd394 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -1130,14 +1130,18 @@ See [[Project:Protected page]] for more information.",
 'confirmunprotect' => 'Confirm unprotection',
 'unprotectcomment' => 'Reason for unprotecting',
 'protect-unchain' => 'Unlock move permissions',
-'protect-text' => 'You may view and change the protection level here for the page [[$1]].
+'protect-text' => 'You may view and change the protection level here for the page <strong>$1</strong>.
 Please be sure you are following the [[Project:Protected page|project guidelines]].',
 'protect-viewtext' => 'Your account does not have permission to change
-page protection levels. Here are the current settings for the page [[$1]]:',
+page protection levels. Here are the current settings for the page <strong>$1</strong>:',
 'protect-default' => '(default)',
 'protect-level-autoconfirmed' => 'Block unregistered users',
 'protect-level-sysop' => 'Sysops only',
 
+# restrictions (nouns)
+'restriction-edit' => 'Edit',
+'restriction-move' => 'Move',
+
 
 # Undelete
 'undelete' => 'View deleted pages',
@@ -1934,6 +1938,7 @@ Please confirm that really want to recreate this article.',
 
 'youhavenewmessagesmulti' => "You have new messages on $1",
 'newtalkseperator' => ',_',
+
 );
 
 

diff --git a/languages/MessagesFi.php b/languages/MessagesFi.php
index a83867f..0ed0823 100644 (file)
--- a/languages/MessagesFi.php
+++ b/languages/MessagesFi.php
@@ -921,17 +921,21 @@ Palaute ja lisäapu osoitteessa:
 'confirmprotecttext'  => 'Haluatko varmasti suojata tämän sivun?',
 'confirmprotect'      => 'Vahvista suojaus',
 'protectmoveonly'     => 'Suojaa vain siirroilta',
-'protectcomment'      => 'Suojauksen syy',
+'protectcomment'      => 'Suojauksen syy:',
 'unprotectsub'        => 'Suojauksen poisto sivulta $1',
 'confirmunprotecttext'=> 'Haluatko varmasti poistaa tämän sivun suojauksen?',
 'confirmunprotect'    => 'Vahvista suojauksen poisto',
 'unprotectcomment'    => 'Syy suojauksen poistoon',
 'protect-unchain'     => 'Käytä siirtosuojausta',
-'protect-text'        => 'Voit katsoa ja muuttaa sivun [[$1]] suojauksia.',
-'protect-viewtext'    => 'Et voi muuttaa sivun [[$1]] suojauksia. Alla näet nykyiset suojaukset.',
-'protect-default'     => '(oletus)',
-'protect-level-autoconfirmed' => 'Estä vain rekisteröimättömät käyttäjät',
-'protect-level-sysop' => 'vain ylläpitäjät',
+'protect-text'        => 'Voit katsoa ja muuttaa sivun ”<strong>$1</strong>” suojauksia:',
+'protect-viewtext'    => 'Et voi muuttaa sivun ”<strong>$1</strong>” suojauksia. Alla on sivun nykyiset suojaukset:',
+'protect-default'     => '(ei rajoituksia)',
+'protect-level-autoconfirmed' => 'Estä uudet ja anonyymit käyttäjät',
+'protect-level-sysop' => 'Vain ylläpitäjät',
+
+# restrictions (nouns)
+'restriction-edit'    => 'muokkaus',
+'restriction-move'    => 'siirto',
 
 
 # Undelete
@@ -1644,6 +1648,4 @@ Ole hyvä ja varmista, että haluat luoda sivun uudelleen.',
 
 
 );
-
-
 ?>