Unnecesary strings removed. Merged from MOODLE_16_MERGED

diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php
index 10ab9a709d87cf99d62afbbddd924a2331e273bd..58d5a2e230b2329cabe8bc96ef6ef19b74d01eb5 100644 (file)
--- 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", "", "<a href=\"index.php\">$authstrs->paymentmanagement</a>");
+    print_header_simple("$strpaymentmanagement", "", "<a href=\"index.php\">$strpaymentmanagement</a>");
 
 
 /// If orderid is empty, user wants to see all orders

diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 0f26ccd249c168e40c04053d377e99f776d25cb3..729f5323f6a5bb343a45f9bb57e1e4585a108289 100644 (file)
--- 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("<b>$strs->confirm:</b>",
-            "$authstrs->captureyes<br /><a href='index.php?order=$orderno&amp;sesskey=$USER->sesskey&amp;".ORDER_CAPTURE."=y&amp;confirm=1'>$strs->yes</a>
+            "$strcaptureyes<br /><a href='index.php?order=$orderno&amp;sesskey=$USER->sesskey&amp;".ORDER_CAPTURE."=y&amp;confirm=1'>$strs->yes</a>
             &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
         }
         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("<b>$authstrs->unenrolstudent</b>", $cbunenrol);
-                $table->data[] = array("<b>$authstrs->howmuch</b>",
+                $table->data[] = array("<b>$strhowmuch</b>",
                     "<input type='hidden' name='confirm' value='1'>
                      <input type='text' size='5' name='amount' value='$amount'>
                      $strcanbecredit<br /><input type='submit' name='".ORDER_REFUND."' value='$authstrs->refund'>");