i18n and better label text, don't assume all users speak robots.txt

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 28afcfe..7b6c9eb 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -338,9 +338,9 @@ class ProtectionForm {
                $ret = "<tr><td align=\"right\">";
                $ret .= '<label>' . wfMsgExt( 'protect-robotspolicy', array( 'parseinline' ) ) . '</label>';
                $ret .= "</td><td align=\"left\" width=\"60\">";
-               $ret .= Xml::checkLabel( 'noindex', 'mwProtect-robots-noindex', 'mwProtect-robots-noindex', $noindexset, $robotsallowed );
+               $ret .= Xml::checkLabel( wfMsgHtml( 'protect-robots-noindex' ), 'mwProtect-robots-noindex', 'mwProtect-robots-noindex', $noindexset, $robotsallowed );
                $ret .= $wgContLang->getDirMark();
-               $ret .= Xml::checkLabel( 'nofollow', 'mwProtect-robots-nofollow', 'mwProtect-robots-nofollow', $nofollowset, $robotsallowed );
+               $ret .= Xml::checkLabel( wfMsgHtml( 'protect-robots-nofollow' ), 'mwProtect-robots-nofollow', 'mwProtect-robots-nofollow', $nofollowset, $robotsallowed );
                $ret .= "</td></tr>";
                return $ret;
        }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 984554a..628515e 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1840,6 +1840,8 @@ Here are the current settings for the page <strong>$1</strong>:',
 'protect-expiring'            => 'expires $1 (UTC)',
 'protect-cascade'             => 'Protect pages included in this page (cascading protection)',
 'protect-robotspolicy'        => 'Robot policy:',
+'protect-robots-noindex' => 'Do not index',
+'protect-robots-nofollow' => 'Do not follow links',
 'restriction-type'            => 'Permission:',
 'restriction-level'           => 'Restriction level:',
 'minimum-size'                => 'Min size',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 8c9c74f..4395e00 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1183,6 +1183,8 @@ $wgMessageStructure = array(
                'protect-expiring',
                'protect-cascade',
                'protect-robotspolicy',
+               'protect-robots-noindex',
+               'protect-robots-nofollow',
                'restriction-type',
                'restriction-level',
                'minimum-size',