Merge pull request #288 from condor2/patch-3

upload/admin/controller/extension/payment/paypal.php

@@ -2109,14 +2109,14 @@ public function customer_delete_customer_before($route, &$data) {
 
 	public function order_info_before($route, &$data) {
 		if ($this->config->get('payment_paypal_status') && !empty($this->request->get['order_id'])) {
-			$this->load->language('extension/payment/paypal');
+			$this->load->language('extension/payment/paypal','extension_payment_paypal');
 
 			$content = $this->getPaymentDetails((int)$this->request->get['order_id']);
 
 			if ($content) {												
 				$data['tabs'][] = array(
 					'code'    => 'paypal',
-					'title'   => $this->language->get('heading_title_main'),
+					'title'   => $this->language->get('extension_payment_paypal')->get('heading_title_main'),
 					'content' => $content
 				);
 			}	
@@ -3306,4 +3306,4 @@ private function token($length = 32) {
 
 		return $token;
 	}
-}
+}