From: ethem Date: Wed, 7 Jun 2006 18:47:09 +0000 (+0000) Subject: Unnecesary strings removed. Merged from MOODLE_16_MERGED X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a17f20183e789e2cd6068f2cdc68091e67ba42b2;p=moodle.git Unnecesary strings removed. Merged from MOODLE_16_MERGED --- diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php index 10ab9a709d..58d5a2e230 100644 --- a/enrol/authorize/index.php +++ b/enrol/authorize/index.php @@ -17,18 +17,18 @@ } /// Load strings. All strings should be defined here. locallib.php uses these strings. - $strs = get_strings(array('user','status','action','delete','time','course','confirm','yes','no','all','none','error')); - $authstrs = get_strings(array('paymentmanagement','orderid','void','capture','refund','delete', + $strs = get_strings(array('user','status','action','time','course','confirm','yes','no','all','none','error')); + $authstrs = get_strings(array('orderid','void','capture','refund','delete', 'authcaptured','authorizedpendingcapture','capturedpendingsettle','capturedsettled', 'settled','refunded','cancelled','expired','tested','new', - 'transid','settlementdate','notsettled','amount', - 'howmuch','captureyes','unenrolstudent'), 'enrol_authorize'); + 'transid','settlementdate','notsettled','amount','unenrolstudent'), 'enrol_authorize'); /// Print header + $strpaymentmanagement = get_string('paymentmanagement', 'enrol_authorize'); if (!$course = get_record('course', 'id', $courseid)) { error('Could not find that course'); } - print_header_simple("$authstrs->paymentmanagement", "", "$authstrs->paymentmanagement"); + print_header_simple("$strpaymentmanagement", "", "$strpaymentmanagement"); /// If orderid is empty, user wants to see all orders diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index 0f26ccd249..729f5323f6 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -215,8 +215,9 @@ function authorize_print_order_details($orderno) } if (empty($confirm)) { + $strcaptureyes = get_string('captureyes', 'enrol_authorize'); $table->data[] = array("$strs->confirm:", - "$authstrs->captureyes
$strs->yes + "$strcaptureyes
$strs->yes     $strs->no"); } else { @@ -286,9 +287,10 @@ function authorize_print_order_details($orderno) $a = new stdClass; $a->upto = $upto; $strcanbecredit = get_string('canbecredit', 'enrol_authorize', $a); + $strhowmuch = get_string('howmuch', 'enrol_authorize'); $cbunenrol = print_checkbox('unenrol', '1', !empty($unenrol), '', '', '', true); $table->data[] = array("$authstrs->unenrolstudent", $cbunenrol); - $table->data[] = array("$authstrs->howmuch", + $table->data[] = array("$strhowmuch", " $strcanbecredit
");