Rename LEAP2A to Leap2A

The Leap2A specification has rebranded and thus we should reflect that
change in the next Mahara release.

I also updated a few URLs.

Signed-off-by: Francois Marier <francois@catalyst.net.nz>

htdocs/admin/users/add.php

@@ -295,10 +295,10 @@ function adduser_submit(Pieform $form, $values) {
 
         try {
             $importer->process();
-            log_info("Imported user account $user->id from leap2a file, see " . $importer->get('logfile') . ' for a full log');
+            log_info("Imported user account $user->id from Leap2A file, see " . $importer->get('logfile') . ' for a full log');
         }
         catch (ImportException $e) {
-            log_info("LEAP2A import failed: " . $e->getMessage());
+            log_info("Leap2A import failed: " . $e->getMessage());
             die_info(get_string('leap2aimportfailed', 'admin'));
         }
 

htdocs/admin/users/bulkimport.php

@@ -202,7 +202,7 @@ function bulkimport_validate(Pieform $form, $values) {
 function bulkimport_submit(Pieform $form, $values) {
     global $SESSION, $LEAP2AFILES;
 
-    log_info('Attempting to import ' . count($LEAP2AFILES) . ' users from LEAP2A files');
+    log_info('Attempting to import ' . count($LEAP2AFILES) . ' users from Leap2A files');
 
     $SESSION->set('bulkimport_leap2afiles', $LEAP2AFILES);
     $SESSION->set('bulkimport_authinstance', (int)$values['authinstance']);
@@ -281,7 +281,7 @@ function import_next_user() {
     catch (EmailException $e) {
         // Suppress any emails (e.g. new institution membership) sent out
         // during user creation, becuase the user doesn't have an email
-        // address until we've imported them from the LEAP2A file.
+        // address until we've imported them from the Leap2A file.
         log_debug("Failed sending email during user import");
     }
 
@@ -304,10 +304,10 @@ function import_next_user() {
 
     try {
         $importer->process();
-        log_info("Imported user account $user->id from leap2a file, see $logfile for a full log");
+        log_info("Imported user account $user->id from Leap2A file, see $logfile for a full log");
     }
     catch (ImportException $e) {
-        log_info("LEAP2A import failed: " . $e->getMessage());
+        log_info("Leap2A import failed: " . $e->getMessage());
         $FAILEDUSERS[$username] = get_string("leap2aimportfailed");
         db_rollback();
         continue;

htdocs/artefact/blog/import/leap/lib.php

@@ -28,9 +28,9 @@
 defined('INTERNAL') || die();
 
 /**
- * Implements LEAP2A import of blog related entries into Mahara
+ * Implements Leap2A import of blog related entries into Mahara
  *
- * For more information about LEAP blog importing, see:
+ * For more information about Leap blog importing, see:
  * http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Import/Blog_Artefact_Plugin
  *
  * TODO:
@@ -192,7 +192,7 @@ class LeapImportBlog extends LeapImportArtefactPlugin {
                         $artefactids = $importer->get_artefactids_imported_by_entryid((string)$blogpostlink['href']);
                         if (isset($artefactids[0])) {
                             $blogpost->attach($artefactids[0]);
-                        } else { // it may be just an attached file, with no leap2a element in its own right ....
+                        } else { // it may be just an attached file, with no Leap2A element in its own right ....
                             if ($id = self::attach_linked_file($blogpostentry, $blogpostlink, $importer)) {
                                 $blogpost->attach($id);
                                 $newartefactmapping[(string)$blogpostlink['href']][] = $id;
@@ -236,8 +236,8 @@ class LeapImportBlog extends LeapImportArtefactPlugin {
     }
 
     /**
-     * Attaches a file to a blogpost entry that was just linked directly, rather than having a leap2a entry
-     * See http://wiki.cetis.ac.uk/LEAP2A_relationships#Attachments
+     * Attaches a file to a blogpost entry that was just linked directly, rather than having a Leap2a entry
+     * See http://wiki.leapspecs.org/2A/files
      *
      * @param SimpleXMLElement $blogpostentry
      * @param SimpleXMLElement $blogpostlink

htdocs/artefact/file/import/leap/lib.php

@@ -28,9 +28,9 @@
 defined('INTERNAL') || die();
 
 /**
- * Implements LEAP2A import of file/folder related entries into Mahara
+ * Implements Leap2A import of file/folder related entries into Mahara
  *
- * For more information about LEAP file importing, see:
+ * For more information about Leap file importing, see:
  * http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Import/File_Artefact_Plugin
  *
  * TODO:

htdocs/artefact/internal/blocktype/contactinfo/lib.php

@@ -184,7 +184,7 @@ class PluginBlocktypeContactinfo extends PluginBlocktype {
      * Overrides the default implementation so we can export enough information
      * to reconstitute profile information again.
      *
-     * LEAP2A export doesn't export profile related artefacts as entries, so we
+     * Leap2A export doesn't export profile related artefacts as entries, so we
      * need to take that into account when exporting config for it.
      */
     public static function export_blockinstance_config_leap(BlockInstance $bi) {

htdocs/artefact/internal/blocktype/profileinfo/lib.php

@@ -259,7 +259,7 @@ class PluginBlocktypeProfileinfo extends PluginBlocktype {
      * Overrides the default implementation so we can export enough information
      * to reconstitute profile information again.
      *
-     * LEAP2A export doesn't export profile related artefacts as entries, so we
+     * Leap2A export doesn't export profile related artefacts as entries, so we
      * need to take that into account when exporting config for it.
      */
     public static function export_blockinstance_config_leap(BlockInstance $bi) {

htdocs/artefact/internal/import/leap/lib.php

@@ -28,9 +28,9 @@
 defined('INTERNAL') || die();
 
 /**
- * Implements LEAP2A import of profile related entries into Mahara
+ * Implements Leap2A import of profile related entries into Mahara
  *
- * For more information about LEAP profile importing, see:
+ * For more information about Leap profile importing, see:
  * http://wiki.mahara.org/Developer_Area/Import%2f%2fExport/LEAP_Import/Internal_Artefact_Plugin
  *
  * TODO:
@@ -60,7 +60,7 @@ class LeapImportInternal extends LeapImportArtefactPlugin {
      * Lookup table for some of the persondata fields.
      *
      * Info based on the table here:
-     * http://wiki.cetis.ac.uk/2009-03/LEAP2A_personal_data#Persondata_fields
+     * http://wiki.cetis.ac.uk/2009-03/Leap2A_personal_data#Persondata_fields
      *
      * The fields here that are not listed there are either not supported, or 
      * imported a different way by this plugin. For example, name related 
@@ -99,7 +99,7 @@ class LeapImportInternal extends LeapImportArtefactPlugin {
 
     /**
      * This list taken from 
-     * http://wiki.cetis.ac.uk/2009-03/LEAP2A_personal_data#Service_abbreviations
+     * http://wiki.cetis.ac.uk/2009-03/Leap2A_personal_data#Service_abbreviations
      *
      * We are only including a list of the ones we can import, so some from the 
      * list will be missing
@@ -248,14 +248,14 @@ class LeapImportInternal extends LeapImportArtefactPlugin {
                 }
                 else {
                     // 'Field' is required
-                    // http://wiki.cetis.ac.uk/2009-03/LEAP2A_personal_data#field
+                    // http://wiki.cetis.ac.uk/2009-03/Leap2A_personal_data#field
                     $importer->trace('WARNING: persondata element did not have leap:field attribute');
                     continue;
                 }
             }
 
             // The information about someone's name is much more comprehensive 
-            // in LEAP than what Mahara has, so we have to piece it together
+            // in Leap than what Mahara has, so we have to piece it together
             self::import_namedata($importer, $persondata);
 
             // People can have address info associated with them
@@ -287,7 +287,7 @@ class LeapImportInternal extends LeapImportArtefactPlugin {
             $author = $author[0];
 
             if (!isset($author->name)) {
-                throw new ImportException($importer, 'TODO: get_string: <author> must include <name> - http://wiki.cetis.ac.uk/2009-03/LEAP2A_relationships#Author');
+                throw new ImportException($importer, 'TODO: get_string: <author> must include <name> - http://wiki.cetis.ac.uk/2009-03/Leap2A_relationships#Author');
             }
 
             $name = (string)$author->name;
@@ -325,7 +325,7 @@ class LeapImportInternal extends LeapImportArtefactPlugin {
             // allows you to keep one of each of these values, so we throw away 
             // any more if they're seen, on the assumption that they are 
             // ordered from most to least important: 
-            // http://wiki.cetis.ac.uk/2009-03/LEAP2A_personal_data#Ordering
+            // http://wiki.cetis.ac.uk/2009-03/Leap2A_personal_data#Ordering
             static $seen = array();
             if (isset($seen[$field])) {
                 return;
@@ -348,7 +348,7 @@ class LeapImportInternal extends LeapImportArtefactPlugin {
     private static function import_persondata_id(PluginImportLeap $importer, SimpleXMLElement $item, array $leapattributes) {
         if ($leapattributes['field'] == 'id' && !isset($leapattributes['service'])) {
             // 'id' must have a service set
-            // http://wiki.cetis.ac.uk/2009-03/LEAP2A_personal_data#service
+            // http://wiki.cetis.ac.uk/2009-03/Leap2A_personal_data#service
             throw new ImportException($importer, "TODO: get_string: persondata field was 'id' but had no service set");
         }
 
@@ -535,7 +535,7 @@ class LeapImportInternal extends LeapImportArtefactPlugin {
             }
             else {
                 // 'Field' is required
-                // http://wiki.cetis.ac.uk/2009-03/LEAP2A_personal_data#field
+                // http://wiki.cetis.ac.uk/2009-03/Leap2A_personal_data#field
                 $importer->trace('WARNING: persondata element did not have leap:field attribute');
                 continue;
             }

htdocs/artefact/internal/lib.php

@@ -140,7 +140,7 @@ class PluginArtefactInternal extends PluginArtefact {
      * profileinfo and contactinfo blocktypes. See the blocktypes'
      * export_blockinstance_config_leap method for more information.
      *
-     * LEAP2A export doesn't export profile related artefacts as entries, so we
+     * Leap2A export doesn't export profile related artefacts as entries, so we
      * need to take that into account when exporting config for it.
      *
      * @param BlockInstance $bi The blockinstance to export the config for.
@@ -179,7 +179,7 @@ class PluginArtefactInternal extends PluginArtefact {
                 $result['fields'] = json_encode(array($result['fields']));
             }
 
-            // Email addresses are not entries in leap2a (they're elements on
+            // Email addresses are not entries in Leap2A (they're elements on
             // the persondata element), so we export the actual address here
             // instead of an artefact ID.
             if (!empty($configdata['email']) && isset($cache[$owner][$configdata['email']])) {

htdocs/artefact/resume/import/leap/lib.php

@@ -28,9 +28,9 @@
 defined('INTERNAL') || die();
 
 /**
- * Implements LEAP2A import of resume related entries into Mahara
+ * Implements Leap2A import of resume related entries into Mahara
  *
- * For more information about LEAP resume importing, see:
+ * For more information about Leap resume importing, see:
  * http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Import/Resume_Artefact_Plugin
  */
 class LeapImportResume extends LeapImportArtefactPlugin {
@@ -403,7 +403,7 @@ class LeapImportResume extends LeapImportArtefactPlugin {
 
                 if (!isset($leapattributes['field'])) {
                     // 'Field' is required
-                    // http://wiki.cetis.ac.uk/2009-03/LEAP2A_personal_data#field
+                    // http://wiki.cetis.ac.uk/2009-03/Leap2A_personal_data#field
                     $importer->trace('WARNING: persondata element did not have leap:field attribute');
                     continue;
                 }
@@ -466,7 +466,7 @@ class LeapImportResume extends LeapImportArtefactPlugin {
     }
 
     /**
-     * Converts a LEAP2A date point to a plain text version for resume date 
+     * Converts a Leap2A date point to a plain text version for resume date 
      * purposes.
      *
      * @param array $date The date - expected to come from {PluginImportLeap::....()}

htdocs/blocktype/lib.php

@@ -305,7 +305,7 @@ abstract class PluginBlocktype extends Plugin {
     }
 
     /**
-     * Exports configuration data the format required for LEAP2A export.
+     * Exports configuration data the format required for Leap2A export.
      *
      * This format is XML, and as the exporter can't generate complicated XML
      * structures, we have to json_encode all the values.

htdocs/export/leap/lang/en.utf8/export.leap.php

@@ -27,8 +27,8 @@
 
 defined('INTERNAL') || die();
 
-$string['title'] = 'LEAP2A';
-// TODO: link LEAP2A standard format to a primer document on our wiki about LEAP2A
-$string['description'] = 'Gives you an export in the <a href="">LEAP2A standard format</a>. You can later use this to import your data into <a href="http://wiki.mahara.org/Developer_Area/Import%%2f%%2fExport/Interoperability">other LEAP2A compliant systems</a>, although the export is hard for humans to read.';
+$string['title'] = 'Leap2A';
+// TODO: link Leap2A standard format to a primer document on our wiki about Leap2A
+$string['description'] = 'Gives you an export in the <a href="">Leap2A standard format</a>. You can later use this to import your data into <a href="http://wiki.mahara.org/Developer_Area/Import%%2f%%2fExport/Interoperability">other Leap2A compliant systems</a>, although the export is hard for humans to read.';
 
 ?>

htdocs/export/leap/lib.php

@@ -28,7 +28,7 @@
 defined('INTERNAL') || die();
 
 /**
-* LEAP export plugin.  See http://wiki.cetis.ac.uk/LEAP2A_specification and
+* LEAP export plugin.  See http://wiki.cetis.ac.uk/2009-03/Leap2A_specification and
 * http://wiki.mahara.org/Developer_Area/Import%2f%2fExport/LEAP_Export
 */
 class PluginExportLeap extends PluginExport {
@@ -584,7 +584,7 @@ class LeapExportElement {
 
     /**
     * The LEAP element type
-    * See http://wiki.cetis.ac.uk/2009-03/LEAP2A_types
+    * See http://wiki.cetis.ac.uk/2009-03/Leap2A_types
     *
     * @return string
     */
@@ -712,7 +712,7 @@ class LeapExportElement {
 
     /**
      * Converts a tag to a 'normalised' tag, as per 
-     * http://wiki.cetis.ac.uk/2009-03/LEAP2A_categories#Plain_tags
+     * http://wiki.cetis.ac.uk/2009-03/Leap2A_categories#Plain_tags
      *
      * The method of normalisation isn't specified at
      * the time of this being written.

htdocs/export/leap/theme/raw/header.tpl

@@ -8,7 +8,7 @@
     xmlns:mahara="http://wiki.mahara.org/Developer_Area/Import%2F%2FExport/LEAP_Extensions#"
 >
     <id>{$WWWROOT}export/{$userid}/{$export_time}</id>
-    <title>Mahara LEAP2A Export for {$name}, {$export_time|format_date:"strftimedatetimeshort"}</title>
+    <title>Mahara Leap2A Export for {$name}, {$export_time|format_date:"strftimedatetimeshort"}</title>
     <updated>{$export_time_rfc3339}</updated>
     <generator uri="http://mahara.org/" version="{$leap_export_version|escape}">Mahara</generator>
 {include file="export:leap:author.tpl"}

htdocs/import/leap/lib.php

@@ -28,7 +28,7 @@
 defined('INTERNAL') || die();
 
 /**
- * Implements import of LEAP2A files
+ * Implements import of Leap2A files
  *
  * For more documentation, please see:
  * http://wiki.mahara.org/index.php?title=Developer_Area/Import%2F%2FExport/LEAP_Import
@@ -609,7 +609,7 @@ class PluginImportLeap extends PluginImport {
      * structure. If they're present, we use them to create a View using that 
      * structure.
      *
-     * This differs a bit from the LEAP2A specification, but we do so 
+     * This differs a bit from the Leap2A specification, but we do so 
      * deliberately to get 100% compatibility with Mahara to Mahara exports. 
      * Other systems can also construct content in the right format to trigger 
      * Mahara to import things as a full view.
@@ -779,7 +779,7 @@ class PluginImportLeap extends PluginImport {
     }
 
     /**
-     * Given an artefact record, looks through it for any leap2a style
+     * Given an artefact record, looks through it for any Leap2A style
      * references to other artefacts, and rewrite those to point at the created
      * ones.
      *
@@ -847,7 +847,7 @@ class PluginImportLeap extends PluginImport {
 
         $artefacts = $this->get_artefactids_imported_by_entryid($matches[4]);
         if (is_null($artefacts) || count($artefacts) != 1) {
-            // This can happen if a leap2a xml file is uploaded that refers to
+            // This can happen if a Leap2A xml file is uploaded that refers to
             // files that (naturally) weren't uploaded with it.
             log_debug("Warning: fixref was expecting one artefact to have been imported by entry {$matches[4]} but seems to have gotten " . count($artefacts));
             return $matches[0];
@@ -893,7 +893,7 @@ class PluginImportLeap extends PluginImport {
     /**
      * Returns xpath for an attribute matching a given curie
      *
-     * See http://wiki.cetis.ac.uk/2009-03/LEAP2A_elements#Use_of_CURIEs
+     * See http://wiki.cetis.ac.uk/2009-03/Leap2A_elements#Use_of_CURIEs
      *
      * @param string $attribute The attribute to match
      * @param string $namespace The namespace for the attribute value
@@ -961,7 +961,7 @@ class PluginImportLeap extends PluginImport {
      *
      * @param SimpleXMLElement $entry    The entry to check
      * $param PluginImportLeap $importer The importer
-     * @param string $category           The category to look in. See http://wiki.cetis.ac.uk/2009-03/LEAP2A_categories
+     * @param string $category           The category to look in. See http://wiki.cetis.ac.uk/2009-03/Leap2A_categories
      * @param string $term               The term to look for (see the docs for the appropriate category)
      * @return boolean Whether the entry has the term in the category
      */
@@ -1039,7 +1039,7 @@ class PluginImportLeap extends PluginImport {
      * Returned in a structure like so:
      * array(
      *     'start' => array(
-     *         'value' => 'w3c compliant date/time format, as allowed by LEAP2A',
+     *         'value' => 'w3c compliant date/time format, as allowed by Leap2A',
      *         'label' => 'label attribute, which is a plaintext version of the date',
      *     ),
      *     'end' => array(
@@ -1050,7 +1050,7 @@ class PluginImportLeap extends PluginImport {
      *     )
      * )
      *
-     * The only keys in the return value are those allowed by the LEAP2A spec, 
+     * The only keys in the return value are those allowed by the Leap2A spec, 
      * and only if they exist on the entry.
      *
      * The values may have the 'value', 'label' or both keys, depending on what 
@@ -1059,7 +1059,7 @@ class PluginImportLeap extends PluginImport {
      * Try and use the 'value' first, if you have a choice. Quite a few places 
      * in Mahara currently just store dates as plaintext though.
      *
-     * Spec reference: http://wiki.cetis.ac.uk/2009-03/LEAP2A_literals#date
+     * Spec reference: http://wiki.cetis.ac.uk/2009-03/Leap2A_literals#date
      */
     public static function get_leap_dates(SimpleXMLElement $entry) {
         $dates = array();

htdocs/import/lib.php

@@ -173,7 +173,7 @@ abstract class PluginImport extends Plugin {
     /**
      * validate the import data that we have after the file has been fetched.
      * This is static, because the data may need to be validated earlier than setting up everything else
-     * For example, in the case of the administrator adding a user manually from a leap2a file,
+     * For example, in the case of the administrator adding a user manually from a Leap2A file,
      * we want to validate the leap data before creating the user record.
      *
      * @param array $importdata usually what ImportTransporter::files_info returns

htdocs/lang/en.utf8/admin.php

@@ -330,9 +330,9 @@ $string['uploadcsvsomeuserscouldnotbeemailed'] = 'Some users could not be e-mail
 $string['uploadcsvusersaddedsuccessfully'] = 'The users in the file have been added successfully';
 $string['uploadcsvfailedusersexceedmaxallowed'] = 'No users have been added because there are too many users in your file.  The number of users in the institution would have exceeded the maximum number allowed.';
 
-// Bulk leap2a import
-$string['bulkleap2aimport'] = 'Import users from LEAP2A files';
-$string['bulkleap2aimportdescription'] = '<p>You can import users in bulk from a collection of LEAP2A files on your server.  You must specify a zip file on the server filesystem which contains all the LEAP2A zip files, and a single CSV file called usernames.csv, mapping usernames to filenames.</p>
+// Bulk Leap2A import
+$string['bulkleap2aimport'] = 'Import users from Leap2A files';
+$string['bulkleap2aimportdescription'] = '<p>You can import users in bulk from a collection of Leap2A files on your server.  You must specify a zip file on the server filesystem which contains all the Leap2A zip files, and a single CSV file called usernames.csv, mapping usernames to filenames.</p>
 <p>usernames.csv will look something like this:</p>
 <pre>
 &nbsp;&nbsp;bob,mahara-export-leap-user8-1265165366.zip<br>
@@ -345,15 +345,15 @@ $string['importfile'] = 'Bulk export file';
 $string['importfilemissinglisting'] = 'The bulk export file is missing a file named usernames.csv. Did you use the Mahara bulk exporter to export these users?';
 $string['importfilenotafile'] = 'Error during form submission: file was not recognised';
 $string['importfilenotreadable'] = 'Error during form submission: file was not readable';
-$string['bulkleap2aimportfiledescription'] = 'The zip file on your server containing all exported users (in LEAP2A format) along with a CSV listing of usernames';
+$string['bulkleap2aimportfiledescription'] = 'The zip file on your server containing all exported users (in Leap2A format) along with a CSV listing of usernames';
 $string['importednuserssuccessfully'] = 'Imported %d of %d users successfully';
 $string['Import'] = 'Import';
 $string['bulkimportdirdoesntexist'] = 'The directory %s does not exist';
 $string['unabletoreadbulkimportdir'] = 'The directory %s is unreadable';
 $string['unabletoreadcsvfile'] = 'Unable to read csv file %s';
-$string['importfilenotreadable'] = 'Unable to read LEAP2A file %s';
+$string['importfilenotreadable'] = 'Unable to read Leap2A file %s';
 $string['importfileisnotazipfile'] = 'Import file %s was not detected as a zip file';
-$string['unzipfailed'] = 'Failed to unzip the LEAP2A file %s. See the error log for more information.';
+$string['unzipfailed'] = 'Failed to unzip the Leap2A file %s. See the error log for more information.';
 $string['importfailedfornusers'] = 'Import failed for %d of %d users';
 $string['invalidlistingfile'] = 'Invalid username listing. Did you use the Mahara bulk exporter to export these users?';
 
@@ -431,17 +431,17 @@ $string['basicinformationforthisuser'] = 'Basic information for this user.';
 $string['clickthebuttontocreatetheuser'] = 'Click the button to create the user.';
 $string['createnewuserfromscratch'] = 'Create new user from scratch';
 $string['createuser'] = 'Create User';
-$string['failedtoobtainuploadedleapfile'] = 'Failed to obtain the uploaded LEAP2A file';
-$string['failedtounzipleap2afile'] = 'Failed to unzip the LEAP2A file. Check the error log for more information';
+$string['failedtoobtainuploadedleapfile'] = 'Failed to obtain the uploaded Leap2A file';
+$string['failedtounzipleap2afile'] = 'Failed to unzip the Leap2A file. Check the error log for more information';
 $string['fileisnotaziporxmlfile'] = 'This file has not been detected to be a zipfile or XML file';
 $string['howdoyouwanttocreatethisuser'] = 'How do you want to create this user?';
-$string['leap2aimportfailed'] = '<p><strong>Sorry - Importing the LEAP2A file failed.</strong></p><p>This could be because you did not select a valid LEAP2A file to upload. Alternatively, there may be a bug in Mahara causing your file to fail, even though it is valid.</p><p>Please <a href="add.php">go back and try again</a>, and if the problem persists, you may want to post to the <a href="http://mahara.org/forums/">Mahara Forums</a> to ask for help. Be prepared to be asked for a copy of your file!</p>';
+$string['leap2aimportfailed'] = '<p><strong>Sorry - Importing the Leap2A file failed.</strong></p><p>This could be because you did not select a valid Leap2A file to upload. Alternatively, there may be a bug in Mahara causing your file to fail, even though it is valid.</p><p>Please <a href="add.php">go back and try again</a>, and if the problem persists, you may want to post to the <a href="http://mahara.org/forums/">Mahara Forums</a> to ask for help. Be prepared to be asked for a copy of your file!</p>';
 $string['newuseremailnotsent'] = 'Failed to send welcome email to new user.';
 $string['newusercreated'] = 'New user account created successfully';
 $string['noleap2axmlfiledetected'] = 'No leap2a.xml file detected - please check your export file again';
 $string['Or...'] = 'Or...';
 $string['userwillreceiveemailandhastochangepassword'] = 'They will receive an e-mail informing them of their new account details. On first log in, they will be forced to change their password.';
-$string['uploadleap2afile'] = 'Upload LEAP2A File';
+$string['uploadleap2afile'] = 'Upload Leap2A File';
 
 $string['usercreationmethod'] = '1 - User Creation Method';
 $string['basicdetails'] = '2 - Basic Details';
@@ -563,11 +563,11 @@ $string['unsuspendinstitutiondescription'] = 'Here you may unsuspend an institut
 $string['unsuspendinstitutiondescription_top'] = '<em>Beware:</em> Unsuspending an institution without resetting or turning off its expiry date may result in a daily re-suspension.';
 $string['unsuspendinstitutiondescription_top_instadmin'] = 'Users of suspended institutions are unable to log in. Contact site administrator to unsuspend the institution.';
 
-// Bulk LEAP2A User export
+// Bulk Leap2A User export
 $string['bulkexport'] = 'Export users';
 $string['bulkexportempty'] = 'Nothing suitable to export. Please double-check the list of usernames.';
 $string['bulkexportinstitution'] = 'The institution from which all users should be exported';
-$string['bulkexporttitle'] = 'Export users to LEAP2A files';
+$string['bulkexporttitle'] = 'Export users to Leap2A files';
 $string['bulkexportdescription'] = 'Choose an institution to export <b>OR</b> specify a list of usernames:';
 $string['bulkexportusernames'] = 'Usernames to export';
 $string['bulkexportusernamesdescription'] = 'A list of the users (one username per line) to be exported along with their data';

htdocs/lang/en.utf8/help/forms/adduser.leap2afile.html

-<h3>LEAP2A Files</h3>
-<p>This option gives you the ability to import a <a href="http://wiki.cetis.ac.uk/LEAP2A_specification#About_this_specification" target="_blank">LEAP2A export file</a>, which contains data about a person's portfolio.</p>
-<p>You can read more on the Mahara wiki about <a href="http://wiki.mahara.org/Developer_Area/Import//Export" target="_blank">Mahara's support for LEAP2A</a>.</p>
+<h3>Leap2A Files</h3>
+<p>This option gives you the ability to import a <a href="http://wiki.cetis.ac.uk/2009-03/Leap2A_specification#About_this_specification" target="_blank">Leap2A export file</a>, which contains data about a person's portfolio.</p>
+<p>You can read more on the Mahara wiki about <a href="http://wiki.mahara.org/Developer_Area/Import//Export" target="_blank">Mahara's support for Leap2A</a>.</p>

htdocs/lib/config-defaults.php

@@ -216,7 +216,7 @@ $cfg->showonlineuserssideblock = true;
 // EXAMPLE:  Your cron job hits cron.php every 15 minutes.  Then $cfg->maxrunage must be 900 or greater.
 $cfg->maxrunage = 300;
 
-// if importing leap2a over an xmlrpc mnet connection, set this to something higher than 0 to log import information
+// if importing Leap2A over an xmlrpc mnet connection, set this to something higher than 0 to log import information
 // see the constants in import/leap/lib.php
 $cfg->leapovermnetloglevel = 0;
 ?>