Merge pull request opencart#166 from ocshop/master

догоняем оригинал
savage4pro · Oct 13, 2015 · 94b5f4a · 94b5f4a
2 parents 82762e8 + 6a6a6f0
commit 94b5f4a
Show file tree

Hide file tree

Showing 381 changed files with 1,026 additions and 863 deletions.
diff --git a/upload/admin/controller/analytics/google_analytics.php b/upload/admin/controller/analytics/google_analytics.php
@@ -3,7 +3,7 @@ class ControllerAnalyticsGoogleAnalytics extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->load->language('analytics/google_analytics');
+		$this->language->load('analytics/google_analytics');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/captcha/basic_captcha.php b/upload/admin/controller/captcha/basic_captcha.php
@@ -3,7 +3,7 @@ class ControllerCaptchaBasicCaptcha extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->load->language('captcha/basic_captcha');
+		$this->language->load('captcha/basic_captcha');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/captcha/google_captcha.php b/upload/admin/controller/captcha/google_captcha.php
@@ -3,7 +3,7 @@ class ControllerCaptchaGoogleCaptcha extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->load->language('captcha/google_captcha');
+		$this->language->load('captcha/google_captcha');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/catalog/recurring.php b/upload/admin/controller/catalog/recurring.php
@@ -52,7 +52,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->load->language('catalog/recurring');
+		$this->language->load('catalog/recurring');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -84,7 +84,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->load->language('catalog/recurring');
+		$this->language->load('catalog/recurring');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -118,7 +118,7 @@ public function delete() {
 	}
 
 	public function copy() {
-		$this->load->language('catalog/recurring');
+		$this->language->load('catalog/recurring');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/catalog/review.php b/upload/admin/controller/catalog/review.php
@@ -10,7 +10,7 @@ class ControllerCatalogReview extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->load->language('catalog/review');
+		$this->language->load('catalog/review');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -20,7 +20,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->load->language('catalog/review');
+		$this->language->load('catalog/review');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -68,7 +68,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->load->language('catalog/review');
+		$this->language->load('catalog/review');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -116,7 +116,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->load->language('catalog/review');
+		$this->language->load('catalog/review');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/common/dashboard.php b/upload/admin/controller/common/dashboard.php
@@ -8,7 +8,7 @@
 
 class ControllerCommonDashboard extends Controller {
 	public function index() {
-		$this->load->language('common/dashboard');
+		$this->language->load('common/dashboard');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/common/filemanager.php b/upload/admin/controller/common/filemanager.php
@@ -8,7 +8,7 @@
 
 class ControllerCommonFileManager extends Controller {
 	public function index() {
-		$this->load->language('common/filemanager');
+		$this->language->load('common/filemanager');
 
 		if (isset($this->request->get['filter_name'])) {
 			$filter_name = rtrim(str_replace(array('../', '..\\', '..', '*'), '', $this->request->get['filter_name']), '/');
@@ -206,7 +206,7 @@ public function index() {
 	}
 
 	public function upload() {
-		$this->load->language('common/filemanager');
+		$this->language->load('common/filemanager');
 
 		$json = array();
 
@@ -289,7 +289,7 @@ public function upload() {
 	}
 
 	public function folder() {
-		$this->load->language('common/filemanager');
+		$this->language->load('common/filemanager');
 
 		$json = array();
 
@@ -337,7 +337,7 @@ public function folder() {
 	}
 
 	public function delete() {
-		$this->load->language('common/filemanager');
+		$this->language->load('common/filemanager');
 
 		$json = array();
 

diff --git a/upload/admin/controller/common/footer.php b/upload/admin/controller/common/footer.php
@@ -8,7 +8,7 @@
 
 class ControllerCommonFooter extends Controller {
 	public function index() {
-		$this->load->language('common/footer');
+		$this->language->load('common/footer');
 
 		$data['text_footer'] = $this->language->get('text_footer');
 

diff --git a/upload/admin/controller/common/forgotten.php b/upload/admin/controller/common/forgotten.php
@@ -18,14 +18,14 @@ public function index() {
 			$this->response->redirect($this->url->link('common/login', '', 'SSL'));
 		}
 
-		$this->load->language('common/forgotten');
+		$this->language->load('common/forgotten');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
 		$this->load->model('user/user');
 
 		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
-			$this->load->language('mail/forgotten');
+			$this->language->load('mail/forgotten');
 
 			$code = sha1(uniqid(mt_rand(), true));
 

diff --git a/upload/admin/controller/common/header.php b/upload/admin/controller/common/header.php
@@ -24,7 +24,7 @@ public function index() {
 		$data['lang'] = $this->language->get('code');
 		$data['direction'] = $this->language->get('direction');
 
-		$this->load->language('common/header');
+		$this->language->load('common/header');
 
 		$data['heading_title'] = $this->language->get('heading_title');
 

diff --git a/upload/admin/controller/common/login.php b/upload/admin/controller/common/login.php
@@ -10,7 +10,7 @@ class ControllerCommonLogin extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->load->language('common/login');
+		$this->language->load('common/login');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/common/menu.php b/upload/admin/controller/common/menu.php
@@ -8,7 +8,7 @@
 
 class ControllerCommonMenu extends Controller {
 	public function index() {
-		$this->load->language('common/menu');
+		$this->language->load('common/menu');
 
 		$data['text_analytics'] = $this->language->get('text_analytics');
 		$data['text_affiliate'] = $this->language->get('text_affiliate');

diff --git a/upload/admin/controller/common/profile.php b/upload/admin/controller/common/profile.php
@@ -8,7 +8,7 @@
 
 class ControllerCommonProfile extends Controller {
 	public function index() {
-		$this->load->language('common/menu');
+		$this->language->load('common/menu');
 
 		$this->load->model('user/user');
 

diff --git a/upload/admin/controller/common/reset.php b/upload/admin/controller/common/reset.php
@@ -29,7 +29,7 @@ public function index() {
 		$user_info = $this->model_user_user->getUserByCode($code);
 
 		if ($user_info) {
-			$this->load->language('common/reset');
+			$this->language->load('common/reset');
 
 			$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/common/stats.php b/upload/admin/controller/common/stats.php
@@ -8,7 +8,7 @@
 
 class ControllerCommonStats extends Controller {
 	public function index() {
-		$this->load->language('common/stats');
+		$this->language->load('common/stats');
 
 		$data['text_complete_status'] = $this->language->get('text_complete_status');
 		$data['text_processing_status'] = $this->language->get('text_processing_status');

diff --git a/upload/admin/controller/customer/custom_field.php b/upload/admin/controller/customer/custom_field.php
@@ -10,7 +10,7 @@ class ControllerCustomerCustomField extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->load->language('customer/custom_field');
+		$this->language->load('customer/custom_field');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -20,7 +20,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->load->language('customer/custom_field');
+		$this->language->load('customer/custom_field');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -52,7 +52,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->load->language('customer/custom_field');
+		$this->language->load('customer/custom_field');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -84,7 +84,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->load->language('customer/custom_field');
+		$this->language->load('customer/custom_field');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/customer/customer.php b/upload/admin/controller/customer/customer.php
@@ -10,7 +10,7 @@ class ControllerCustomerCustomer extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -20,7 +20,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -80,7 +80,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -140,7 +140,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -202,7 +202,7 @@ public function delete() {
 	}
 
 	public function approve() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -270,7 +270,7 @@ public function approve() {
 	}
 
 	public function unlock() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -1174,7 +1174,7 @@ public function login() {
 				$this->response->redirect(HTTP_CATALOG . 'index.php?route=account/login&token=' . $token);
 			}
 		} else {
-			$this->load->language('error/not_found');
+			$this->language->load('error/not_found');
 
 			$this->document->setTitle($this->language->get('heading_title'));
 
@@ -1203,7 +1203,7 @@ public function login() {
 	}
 
 	public function history() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->load->model('customer/customer');
 
@@ -1245,7 +1245,7 @@ public function history() {
 	}
 
 	public function addHistory() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$json = array();
 
@@ -1264,7 +1264,7 @@ public function addHistory() {
 	}
 
 	public function transaction() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->load->model('customer/customer');
 
@@ -1311,7 +1311,7 @@ public function transaction() {
 	}
 
 	public function addTransaction() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$json = array();
 
@@ -1330,7 +1330,7 @@ public function addTransaction() {
 	}
 
 	public function reward() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->load->model('customer/customer');
 
@@ -1377,7 +1377,7 @@ public function reward() {
 	}
 
 	public function addReward() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$json = array();
 
@@ -1396,7 +1396,7 @@ public function addReward() {
 	}
 
 	public function ip() {
-		$this->load->language('customer/customer');
+		$this->language->load('customer/customer');
 
 		$this->load->model('customer/customer');