Language fixes and cleanups for admin/site.*

diff --git a/admin/site.html b/admin/site.html
index c0540d350b049c59e2952ca208d42b4fd3e19fba..d27a5d3933ddc3910ef88cdbb51431e0d9ce513e 100644 (file)
--- a/admin/site.html
+++ b/admin/site.html
@@ -1,45 +1,49 @@
 <FORM METHOD="post" action="site.php" NAME="form">
 <TABLE cellpadding=9 cellspacing=0 >
 <tr valign=top>
-       <td><P>Full site name:</td>
+       <td align=right><P><? print_string("fullsitename") ?>:</td>
        <td><input type="text" name="fullname" size=50 value="<? p($form->fullname) ?>">
        <? formerr($err["fullname"]) ?>
        </td>
 </tr>
 <tr valign=top>
-       <td><P>Short name for site (eg single word):</td>
+       <td align=right><P><? print_string("shortsitename") ?>:</td>
        <td><input type="text" name="shortname" size=50 value="<? p($form->shortname) ?>">
        <? formerr($err["shortname"]) ?>
        </td>
 </tr>
 <tr valign=top>
-    <td><P>Front page description:</td>
+    <td align=right><P><? print_string("frontpagedescription") ?>:</P><BR>
+        <? helpbutton("text", get_string("helptext")) ?>
+    </td>
     <td><TEXTAREA NAME=summary COLS=50 ROWS=10 WRAP=virtual><? p($form->summary) ?></TEXTAREA>
     <? formerr($err["summary"]) ?>
     </td>
 </tr>
 <tr valign=top>
-        <td><P>Front page format:</td>
+        <td align=right><P><? print_string("frontpageformat") ?>:</td>
         <td><? 
-           $options = array("0" => "Show list of courses",
-                            "1" => "1 news item",
-                            "2" => "2 news items",
-                            "3" => "3 news items",
-                            "4" => "4 news items",
-                            "5" => "5 news items",
-                            "6" => "6 news items",
-                            "7" => "7 news items",
-                            "8" => "8 news items",
-                            "9" => "9 news items",
-                            "10" => "10 news items");
-           choose_from_menu ($options, "newsitems", "$form->newsitems");
+           $newsitem  = get_string("newsitem");
+           $newsitems = get_string("newsitems");
+           $options = array("0"  =>  get_string("showlistofcourses"),
+                            "1"  =>  "1 $newsitem",
+                            "2"  =>  "2 $newsitems",
+                            "3"  =>  "3 $newsitems",
+                            "4"  =>  "4 $newsitems",
+                            "5"  =>  "5 $newsitems",
+                            "6"  =>  "6 $newsitems",
+                            "7"  =>  "7 $newsitems",
+                            "8"  =>  "8 $newsitems",
+                            "9"  =>  "9 $newsitems",
+                            "10" => "10 $newsitems");
+           choose_from_menu ($options, "newsitems", "$form->newsitems", "");
            formerr($err["newsitems"]);
         ?>
         </td>
 </tr>
 <tr>
     <td></td>
-       <td><input type="submit" value="Update the site"></td>
+       <td><input type="submit" value="<? print_string("savechanges") ?>"></td>
 </tr>
 </TABLE>
 <INPUT type="hidden" name="id" value="<?=$form->id ?>">

diff --git a/admin/site.php b/admin/site.php
index 9b0d0661ebb86cb74b98513cc88c9245fabf1a16..9773a3f889624e8763564c244662cece3e422827 100644 (file)
--- a/admin/site.php
+++ b/admin/site.php
@@ -40,11 +40,11 @@
                 }
             }
                    die;
+
         } else {
             foreach ($err as $key => $value) {
                 $focus = "form.$key";
             }
-            
         }
        }
 
@@ -77,13 +77,13 @@
 function validate_form(&$form, &$err) {
 
     if (empty($form->fullname))
-        $err["fullname"] = "Missing site name";
+        $err["fullname"] = get_string("missingsitename");
 
     if (empty($form->shortname))
-        $err["shortname"] = "Missing short site name";
+        $err["shortname"] = get_string("missingshortsitename");
 
     if (empty($form->summary))
-        $err["summary"] = "Missing site description";
+        $err["summary"] = get_string("missingsitedescription");
 
     return;
 }

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 6cb144d72359b2545a666bb1adee1166b23218f7..58608f234ca793c4e8696fa93fbe40dd7df2653f 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -113,9 +113,12 @@ $string[format] = "Format";
 $string[formatsocial] = "Social format";
 $string[formattopics] = "Topics format";
 $string[formatweeks] = "Weekly format";
+$string[frontpagedescription] = "Front page description";
+$string[frontpageformat] = "Front page format";
 $string[fulllistofcourses] = "Full list of courses";
 $string[fullprofile] = "Full profile";
 $string[fullname] = "Full name";
+$string[fullsitename] = "Full site name";
 $string[grade] = "Grade";
 $string[guestsno] = "No, do not allow guests in";
 $string[guestsyes] = "Yes, allow 'guest' student in";
@@ -180,6 +183,9 @@ $string[missinglastname] = "Missing last name";
 $string[missingshortname] = "Missing short name";
 $string[missingnewpassword] = "Missing new password";
 $string[missingpassword] = "Missing password";
+$string[missingshortsitename] = "Missing short site name";
+$string[missingsitedescription] = "Missing site description";
+$string[missingsitename] = "Missing site name";
 $string[missingstudent] = "Must choose something";
 $string[missingsummary] = "Missing summary";
 $string[missingteacher] = "Must choose something";
@@ -265,8 +271,10 @@ $string[senddetails] = "Send my details via email";
 $string[serverlocaltime] = "Server's local time";
 $string[settings] = "Settings";
 $string[shortname] = "Short name";
+$string[shortsitename] = "Short name for site (eg single word)";
 $string[showalltopics] = "Show all topics";
 $string[showallweeks] = "Show all weeks";
+$string[showlistofcourses] = "Show list of courses";
 $string[showonlytopic] = "Show only topic \$a";
 $string[showonlyweek] = "Show only week \$a";
 $string[showtheselogs] = "Show these logs";