Auth: Replace hardcoded strings: MDL-8069

diff --git a/auth/nntp/config.html b/auth/nntp/config.html
index abcd86b6451bc79e0da4c2b47ee75966263dc790..67bc050ea072ee300c5fa24b4f745861eec82e32 100644 (file)
--- a/auth/nntp/config.html
+++ b/auth/nntp/config.html
@@ -15,7 +15,7 @@ if (!isset($config->changepasswordurl)) {
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
 <tr valign="top" class="required">
-    <td align="right"> host: </td>
+    <td align="right"><?php print_string('auth_nntphost_key', 'auth') ?>: </td>
     <td>
         <input name="host" type="text" size="30" value="<?php echo $config->host ?>" />
         <?php
@@ -31,13 +31,13 @@ if (!isset($config->changepasswordurl)) {
        
         print_string("auth_nntphost", "auth");
         print_string("auth_multiplehosts", "auth");
-            
+
         ?>
     </td>
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> port: </td>
+    <td align="right"><?php print_string('auth_nntpport_key', 'auth') ?>: </td>
     <td>
         <input name="port" type="text" size="6" value="<?php echo $config->port ?>" />
         <?php
@@ -52,7 +52,7 @@ if (!isset($config->changepasswordurl)) {
 </tr>
 
 <tr valign="top">
-    <td align="right"> changepasswordurl: </td>
+    <td align="right"><?php print_string('auth_nntpchangepasswordurl_key', 'auth') ?>: </td>
     <td>
         <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
         <?php

diff --git a/auth/pop3/config.html b/auth/pop3/config.html
index 893423cbe29d395e060837942fd8f72f9348086e..784e2841aec044e2bab6364bb1f6d7618650f616 100644 (file)
--- a/auth/pop3/config.html
+++ b/auth/pop3/config.html
@@ -21,7 +21,7 @@ if (!isset($config->changepasswordurl)) {
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
 <tr valign="top" class="required">
-    <td align="right"> host: </td>
+    <td align="right"><?php print_string('auth_pop3host_key', 'auth') ?>: </td>
     <td>
         <input name="host" type="text" size="30" value="<?php echo $config->host ?>" />
         <?php
@@ -43,7 +43,7 @@ if (!isset($config->changepasswordurl)) {
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> type: </td>
+    <td align="right"><?php print_string('auth_pop3type_key', 'auth') ?>: </td>
     <td>
         <?php
 
@@ -59,7 +59,7 @@ if (!isset($config->changepasswordurl)) {
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> port: </td>
+    <td align="right"><?php print_string('auth_pop3port_key', 'auth') ?>: </td>
     <td>
         <input name="port" type="text" size="6" value="<?php echo $config->port ?>" />
         <?php
@@ -74,7 +74,7 @@ if (!isset($config->changepasswordurl)) {
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> mailbox: </td>
+    <td align="right"><?php print_string('auth_pop3mailbox_key', 'auth') ?>: </td>
     <td>
         <input name="mailbox" type="text" size="6" value="<?php echo $config->mailbox ?>" />
         <?php
@@ -89,7 +89,7 @@ if (!isset($config->changepasswordurl)) {
 </tr>
 
 <tr valign="top">
-    <td align="right"> changepasswordurl: </td>
+    <td align="right"><?php print_string('auth_pop3changepasswordurl_key', 'auth') ?>: </td>
     <td>
         <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
         <?php

diff --git a/auth/radius/config.html b/auth/radius/config.html
index 32dc7d0c9b98168ee2db937e47638b73c729bb3c..bf582b00d12b30daae97968abc564feb3a424c12 100644 (file)
--- a/auth/radius/config.html
+++ b/auth/radius/config.html
@@ -25,9 +25,9 @@ if (!isset($config->changepasswordurl)) {
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
 <tr valign="top">
-    <td align="right"> host: </td>
+    <td align="right"><?php print_string('auth_radiushost_key', 'auth') ?>: </td>
     <td>
-        <input name="host" type="text" size="30" value="<?php echo $config->host ?>">
+        <input name="host" type="text" size="30" value="<?php echo $config->host ?>" />
         <?php
 
         if (isset($err['host'])) {
@@ -40,9 +40,9 @@ if (!isset($config->changepasswordurl)) {
 </tr>
 
 <tr valign="top">
-    <td align="right"> nasport: </td>
+    <td align="right"><?php print_string('auth_radiusnasport_key', 'auth') ?>: </td>
     <td>
-        <input name="nasport" type="text" size="6" value="<?php echo $config->nasport ?>">
+        <input name="nasport" type="text" size="6" value="<?php echo $config->nasport ?>" />
         <?php
         
         if (isset($err['nasport'])) {
@@ -55,22 +55,22 @@ if (!isset($config->changepasswordurl)) {
 </tr>
 
 <tr valign="top" >
-    <td align="right"> secret: </td>
+    <td align="right"><?php print_string('auth_radiussecret_key', 'auth') ?>: </td>
     <td>
-        <input name="secret" type="text" size="6" value="<?php echo $config->secret ?>">
+        <input name="secret" type="text" size="6" value="<?php echo $config->secret ?>" />
         <?php
         
         if (isset($err['secret'])) {
             formerr($err['secret']);
         }
-        
+
         ?>
     </td>
     <td><?php print_string('auth_radiussecret', 'auth') ?></td>
 </tr>
 
 <tr valign="top">
-    <td align="right"> changepasswordurl: </td>
+    <td align="right"><?php print_string('auth_radiuschangepasswordurl_key', 'auth') ?>: </td>
     <td>
         <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
         <?php

diff --git a/auth/shibboleth/config.html b/auth/shibboleth/config.html
index b019837ae65314e61433a451e09f16ccc3b57a74..fedfc08f5d74dbd7d2670aae9673f4a152cc85c2 100755 (executable)
--- a/auth/shibboleth/config.html
+++ b/auth/shibboleth/config.html
@@ -60,7 +60,7 @@
 </tr>
 
 <tr valign="top">
-    <td align="right"> changepasswordurl: </td>
+    <td align="right"><?php print_string('auth_shib_changepasswordurl', 'auth') ?>: </td>
     <td>
         <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
         <?php

diff --git a/lang/en_utf8/auth.php b/lang/en_utf8/auth.php
index 01fd52031c936b67cd3735cd95520cc1d72f1185..cb6871d5eb4c50f5ccfbbc5068a581a593c01cce 100644 (file)
--- a/lang/en_utf8/auth.php
+++ b/lang/en_utf8/auth.php
@@ -204,6 +204,9 @@ $string['auth_nntphost'] = 'The NNTP server address. Use the IP number, not DNS
 $string['auth_nntpport'] = 'Server port (119 is the most common)';
 $string['auth_nntptitle'] = 'Use an NNTP server';
 $string['auth_nntpnotinstalled'] = 'Cannot use NNTP authentication. The PHP IMAP module is not installed.';
+$string['auth_nntpchangepasswordurl_key'] = 'Password-change URL';
+$string['auth_nntpport_key'] = 'Port';
+$string['auth_nntphost_key'] = 'Host';
 
 // None plugin
 $string['auth_nonedescription'] = 'Users can sign in and create valid accounts immediately, with no authentication against an external server and no confirmation via email.  Be careful using this option - think of the security and administration problems this could cause.';
@@ -224,6 +227,11 @@ $string['auth_pop3port'] = 'Server port (110 is the most common, 995 is common f
 $string['auth_pop3title'] = 'Use a POP3 server';
 $string['auth_pop3type'] = 'Server type. If your server uses certificate security, choose pop3cert.';
 $string['auth_pop3notinstalled'] = 'Cannot use POP3 authentication. The PHP IMAP module is not installed.';
+$string['auth_pop3changepasswordurl_key'] = 'Password-change URL';
+$string['auth_pop3mailbox_key'] = 'Mailbox';
+$string['auth_pop3port_key'] = 'Port';
+$string['auth_pop3type_key'] = 'Type';
+$string['auth_pop3host_key'] = 'Host';
 
 // RADIUS plugin
 $string['auth_radiustitle'] = 'Use a RADIUS server';
@@ -231,6 +239,10 @@ $string['auth_radiusdescription'] = 'This method uses a <a href=\"http://en.wiki
 $string['auth_radiushost'] = 'Address of the RADIUS server';
 $string['auth_radiusnasport'] = 'Port to use to connect';
 $string['auth_radiussecret'] = 'Shared secret';
+$string['auth_radiuschangepasswordurl_key'] = 'Password-change URL';
+$string['auth_radiusnasport_key'] = 'Port';
+$string['auth_radiushost_key'] = 'Host';
+$string['auth_radiussecret_key'] = 'Secret';
 
 // Shibboleth plugin
 $string['auth_shibbolethdescription'] = 'Using this method users are created and authenticated using <a href=\"http://shibboleth.internet2.edu/\" target=\"_blank\">Shibboleth</a>.<br/>Be sure to read the <a href=\"../auth/shibboleth/README.txt\" target=\"_blank\">README</a> for Shibboleth on how to set up your Moodle with Shibboleth';
@@ -245,6 +257,7 @@ $string['auth_shib_convert_data'] = 'Data modification API';
 $string['auth_shib_convert_data_description'] = 'You can use this API to further modify the data provided by Shibboleth. Read the <a href=\"../auth/shibboleth/README.txt\" target=\"_blank\">README</a> for further instructions.';
 $string['auth_shib_instructions_help'] = 'Here you should provide custom instructions for your users to explain Shibboleth.  It will be shown on the login page in the instructions section. The instructions must include a link to \"<b>$a</b>\" that users click when they want to log in.';
 $string['auth_shib_convert_data_warning'] = 'The file does not exist or is not readable by the webserver process!';
+$string['auth_shib_changepasswordurl'] = 'Password-change URL';
 
 $string['shib_not_set_up_error'] = 'Shibboleth authentication doesn\'t seem to be set up correctly because no Shibboleth environment variables are present for this page. Please consult the <a href=\"README.txt\">README</a> for further instructions on how to set up Shibboleth authentication or contact the webmaster of this Moodle installation.';
 $string['shib_no_attributes_error'] = 'You seem to be Shibboleth authenticated but Moodle didn\'t receive any user attributes. Please check that your Identity Provider releases the necessary attributes ($a) to the Service Provider Moodle is running on or inform the webmaster of this server.';