From a7026767bfe68de5946a630c24c38d339cb7d036 Mon Sep 17 00:00:00 2001
From: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Date: Thu, 22 Mar 2012 15:08:02 +0000
Subject: [PATCH] MDL-32164 Add string for file encoding

AMOS BEGIN
  CPY [encoding,tool_uploaduser],[fileencoding,mod_data]
AMOS END
---
 mod/data/import_form.php  | 2 +-
 mod/data/lang/en/data.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/data/import_form.php b/mod/data/import_form.php
index ce0bbeeec93..85b6025f6e1 100644
--- a/mod/data/import_form.php
+++ b/mod/data/import_form.php
@@ -22,7 +22,7 @@ class mod_data_import_form extends moodleform {
         $mform->addElement('text', 'fieldenclosure', get_string('fieldenclosure', 'data'));
 
         $choices = textlib::get_encodings();
-        $mform->addElement('select', 'encoding', get_string('encoding', 'admin'), $choices);
+        $mform->addElement('select', 'encoding', get_string('fileencoding', 'mod_data'), $choices);
         $mform->setDefault('encoding', 'UTF-8');
 
         $submit_string = get_string('submit');
diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php
index 8abba58042a..000b29d2275 100644
--- a/mod/data/lang/en/data.php
+++ b/mod/data/lang/en/data.php
@@ -111,6 +111,7 @@ $string['editordisable'] = 'Disable editor';
 $string['editorenable'] = 'Enable editor';
 $string['emptyadd'] = 'The Add template is empty, generating a default form...';
 $string['emptyaddform'] = 'You did not fill out any fields!';
+$string['fileencoding'] = 'Encoding';
 $string['entries'] = 'Entries';
 $string['entrieslefttoadd'] = 'You must add {$a->entriesleft} more entry/entries in order to complete this activity';
 $string['entrieslefttoaddtoview'] = 'You must add {$a->entrieslefttoview} more entry/entries before you can view other participants\' entries.';