From 0b3cfe88128113e010abf5d9f9157178e3983451 Mon Sep 17 00:00:00 2001
From: vyshane <vyshane>
Date: Tue, 28 Feb 2006 02:51:31 +0000
Subject: [PATCH] Fixed Bug #4552

---
 lang/en_utf8/data.php  |  7 ++++++-
 mod/data/fields.php    |  2 +-
 mod/data/mod.html      |  2 +-
 mod/data/templates.php | 12 ++++++------
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lang/en_utf8/data.php b/lang/en_utf8/data.php
index fe459e54617..73078f6396f 100644
--- a/lang/en_utf8/data.php
+++ b/lang/en_utf8/data.php
@@ -5,7 +5,9 @@ $string['add'] = 'Add entry';
 $string['addafield'] = 'Add a Field';
 $string['addcomment'] = 'Add Comment';
 $string['addtemplate'] = 'Add Template';
+$string['allowcomments'] = 'Allow comments?';
 $string['allowratings'] = 'Allow posts to be rated?';
+$string['approve'] = 'Approve';
 $string['ascending'] = 'Ascending';
 $string['atmaxentry'] = 'You have entered the maximum number of entries allowed!';
 $string['autogenallforms'] = 'Generate all default templates';
@@ -16,17 +18,19 @@ $string['browse'] = 'Browse';
 $string['bynameondate'] = 'by $a->name - $a->date';
 $string['cancel'] = 'Cancel';
 $string['checkbox'] = 'Checkbox(es)';
+$string['comments'] = 'Comments';
 $string['commentsaved'] = 'Comment Saved';
-$string['comments'] = 'Allow comments?';
 $string['configenablerssfeeds'] = 'This switch will enable the possibility of RSS feeds for all databases. You will still need to turn feeds on manually in the settings for each database.';
 $string['confirmdeletefield'] = 'You are about to delete this field, are you sure?';
 $string['confirmdeleterecord'] = 'Are you sure you want to delete this record?';
 $string['dateentered'] = 'Date entered';
 $string['descending'] = 'Descending';
+$string['delete'] = 'Delete';
 $string['deleted'] = 'deleted';
 $string['deletefield'] = 'Delete an existing Field';
 $string['menu'] = 'Menu (Single-selection)';
 $string['menuchoose'] = 'Choose...';
+$string['edit'] = 'Edit';
 $string['emptyadd'] = 'The Add template is empty, generating a default form...';
 $string['emptyaddform'] = 'You did not fill out any fields!';
 $string['entrysaved'] = 'Your entry has been saved';
@@ -63,6 +67,7 @@ $string['maxentries'] = 'Maximum entries';
 $string['maxsize'] = 'Maximum size';
 $string['modulename'] = 'Database';
 $string['modulenameplural'] = 'Databases';
+$string['more'] = 'More';
 $string['multientry'] = 'Repeated entry';
 $string['multimenu'] = 'Menu (Multiple-selection)';
 $string['multipletags'] = 'Multiple tags found! Template not saved';
diff --git a/mod/data/fields.php b/mod/data/fields.php
index 45d54607d10..e33b6d1a251 100755
--- a/mod/data/fields.php
+++ b/mod/data/fields.php
@@ -28,7 +28,7 @@
 
     require_once('pagelib.php');
     require_login();
-
+    
     $id    = optional_param('id', 0, PARAM_INT);    // course module id
     $d     = optional_param('d', 0, PARAM_INT);    // database id
     $fid   = optional_param('fid', 0 , PARAM_INT);    //update field id
diff --git a/mod/data/mod.html b/mod/data/mod.html
index a6a6b6cc472..ecb79baaa55 100644
--- a/mod/data/mod.html
+++ b/mod/data/mod.html
@@ -222,7 +222,7 @@
     <?php
         $ynoptions = array( 0 => get_string('no'), 1 => get_string('yes'));
         choose_from_menu($ynoptions, 'comments', $form->comments, '');
-        helpbutton('comments', get_string('comments', 'data'), 'data');
+        helpbutton('comments', get_string('allowcomments', 'data'), 'data');
    ?>
    </td>
 </tr>
diff --git a/mod/data/templates.php b/mod/data/templates.php
index a0d492dfe25..08db015d426 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -136,15 +136,15 @@
     echo '<select name="fields1[]" size="10" onclick="insertAtCursor(document.tempform.template, this.options[selectedIndex].value)">';    //the insertAtCursor thing only works when editting in plain text =(
     if ($fields = get_records('data_fields','dataid',$data->id)){
         foreach ($fields as $field) {
-            echo '<option value="[['.$field->name.']]">'.$field->name.' ('.$field->type.')</option>';
+            echo '<option value="[['.$field->name.']]">'.$field->name.' ('. get_string($field->type, 'data'). ')</option>';
         }
     }
     //print special tags
-    echo '<option value="##edit##">##Edit##</option>';
-    echo '<option value="##more##">##More##</option>';
-    echo '<option value="##delete##">##Delete##</option>';
-    echo '<option value="##approve##">##Approve##</option>';
-    echo '<option value="##comments##">##Comments##</option>';
+    echo '<option value="##edit##">##' .get_string('edit', 'data'). '##</option>';
+    echo '<option value="##more##">##' .get_string('more', 'data'). '##</option>';
+    echo '<option value="##delete##">##' .get_string('delete', 'data'). '##</option>';
+    echo '<option value="##approve##">##' .get_string('approve', 'data'). '##</option>';
+    echo '<option value="##comments##">##' .get_string('comments', 'data'). '##</option>';
     echo '</select>';
 
     ///add the HTML editor(s)