From: ethem <ethem>
Date: Fri, 9 Jun 2006 11:00:18 +0000 (+0000)
Subject: Show 'name on card' string instead of moodle.php's user string. Merged from MOODLE_16... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=673d6024580dfa461d77bfc5639bd958a9de56dc;p=moodle.git

Show 'name on card' string instead of moodle.php's user string. Merged from MOODLE_16_STABLE.
---

diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php
index 58d5a2e230..72b8288945 100644
--- a/enrol/authorize/index.php
+++ b/enrol/authorize/index.php
@@ -17,8 +17,8 @@
     }
 
 /// Load strings. All strings should be defined here. locallib.php uses these strings.
-    $strs = get_strings(array('user','status','action','time','course','confirm','yes','no','all','none','error'));
-    $authstrs = get_strings(array('orderid','void','capture','refund','delete',
+    $strs = get_strings(array('status','action','time','course','confirm','yes','no','all','none','error'));
+    $authstrs = get_strings(array('orderid','nameoncard','void','capture','refund','delete',
                 'authcaptured','authorizedpendingcapture','capturedpendingsettle','capturedsettled',
                 'settled','refunded','cancelled','expired','tested','new',
                 'transid','settlementdate','notsettled','amount','unenrolstudent'), 'enrol_authorize');
diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 729f5323f6..6b34ec9c2f 100644
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -65,7 +65,7 @@ function authorize_print_orders()
     $table->set_attribute('class', 'generaltable generalbox');
 
     $table->define_columns(array('id', 'timecreated', 'userid', 'status', ''));
-    $table->define_headers(array($authstrs->orderid, $strs->time, $strs->user, $strs->status, $strs->action));
+    $table->define_headers(array($authstrs->orderid, $strs->time, $authstrs->nameoncard, $strs->status, $strs->action));
     $table->define_baseurl($baseurl."&amp;status=$status");
 
     $table->sortable(true, 'id', SORT_DESC);
@@ -200,7 +200,7 @@ function authorize_print_order_details($orderno)
     if (empty($cmdcapture) and empty($cmdrefund) and empty($cmdvoid) and empty($cmddelete)) {
         $table->data[] = array("<b>$strs->course:</b>", $order->shortname);
         $table->data[] = array("<b>$strs->status:</b>", $authstrs->{$status->status});
-        $table->data[] = array("<b>$strs->user:</b>", $order->ccname);
+        $table->data[] = array("<b>$authstrs->nameoncard:</b>", $order->ccname);
         $table->data[] = array("<b>$strs->time:</b>", userdate($order->timecreated));
         $table->data[] = array("<b>$authstrs->settlementdate:</b>", $settled ?
                                userdate($order->settletime) : $authstrs->notsettled);