Skip to content

Commit

Permalink
language changes to fit the new language var in the url
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielkerr
danielkerr committed Feb 21, 2018
1 parent 1768455 commit fd1bd4b
Show file tree
Hide file tree
Showing 53 changed files with 149 additions and 245 deletions.
2 changes: 0 additions & 2 deletions upload/catalog/controller/account/address.php
View file
Expand Up @@ -417,8 +417,6 @@ protected function getForm() {

$data['back'] = $this->url->link('account/address', 'language=' . $this->config->get('config_language'));

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/account/affiliate.php
View file
Expand Up @@ -242,8 +242,6 @@ public function getForm() {

$data['back'] = $this->url->link('account/account', 'language=' . $this->config->get('config_language'));

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/account/edit.php
View file
Expand Up @@ -142,8 +142,6 @@ public function index() {

$data['back'] = $this->url->link('account/account', 'language=' . $this->config->get('config_language'));

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/account/register.php
View file
Expand Up @@ -211,8 +211,6 @@ public function index() {
$data['agree'] = false;
}

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/account/tracking.php
View file
Expand Up @@ -39,8 +39,6 @@ public function index() {

$data['continue'] = $this->url->link('account/account', 'language=' . $this->config->get('config_language'));

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/affiliate/register.php
View file
Expand Up @@ -303,8 +303,6 @@ public function index() {
$data['agree'] = false;
}

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/checkout/checkout.php
View file
Expand Up @@ -85,8 +85,6 @@ public function index() {

$data['shipping_required'] = $this->cart->hasShipping();

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/checkout/guest.php
View file
Expand Up @@ -137,8 +137,6 @@ public function index() {
$data['captcha'] = '';
}

$data['language'] = $this->config->get('config_language');

$this->response->setOutput($this->load->view('checkout/guest', $data));
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/checkout/guest_shipping.php
View file
Expand Up @@ -78,8 +78,6 @@ public function index() {
$data['address_custom_field'] = array();
}

$data['language'] = $this->config->get('config_language');

$this->response->setOutput($this->load->view('checkout/guest_shipping', $data));
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/checkout/register.php
View file
Expand Up @@ -71,8 +71,6 @@ public function index() {

$data['shipping_required'] = $this->cart->hasShipping();

$data['language'] = $this->config->get('config_language');

$this->response->setOutput($this->load->view('checkout/register', $data));
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/credit_card/sagepay_server.php
View file
Expand Up @@ -70,8 +70,6 @@ public function index() {
$data['add'] = $this->url->link('extension/credit_card/sagepay_server/add', 'language=' . $this->config->get('config_language'));
$data['back'] = $this->url->link('account/account', 'language=' . $this->config->get('config_language'));

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/module/pp_braintree_button.php
View file
Expand Up @@ -34,8 +34,6 @@ public function index() {
$data['auth_total'] = $this->cart->getTotal() * 1.5;
$data['currency_code'] = $this->session->data['currency'];

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/module/pp_braintree_button', $data);
}
}
Expand Down
6 changes: 3 additions & 3 deletions upload/catalog/controller/extension/payment/amazon_login_pay.php
View file
Expand Up @@ -37,8 +37,6 @@ public function address() {

$this->document->addScript($amazon_payment_js);

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down Expand Up @@ -137,12 +135,15 @@ public function confirm() {
}

$data['heading_confirm'] = $this->language->get('heading_confirm');

$data['column_name'] = $this->language->get('column_name');
$data['column_model'] = $this->language->get('column_model');
$data['column_quantity'] = $this->language->get('column_quantity');
$data['column_price'] = $this->language->get('column_price');
$data['column_total'] = $this->language->get('column_total');

$data['text_confirm'] = $this->language->get('text_confirm');
$data['text_back'] = $this->language->get('text_back');

$products = $this->cart->getProducts();

Expand Down Expand Up @@ -492,7 +493,6 @@ public function confirm() {
}

$data['back'] = $this->url->link('extension/payment/amazon_login_pay/paymentMethod', 'language=' . $this->config->get('config_language'));
$data['text_back'] = $this->language->get('text_back');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/authorizenet_aim.php
View file
Expand Up @@ -23,8 +23,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/authorizenet_aim', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/bluepay_redirect.php
View file
Expand Up @@ -38,8 +38,6 @@ public function index() {
$data['existing_cards'] = $cards;
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/bluepay_redirect', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/cardconnect.php
View file
Expand Up @@ -25,8 +25,6 @@ public function index() {

$data['action'] = $this->url->link('extension/payment/cardconnect/send', 'language=' . $this->config->get('config_language'));

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/cardconnect', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/cardinity.php
View file
Expand Up @@ -23,8 +23,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/cardinity', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/cheque.php
View file
Expand Up @@ -6,8 +6,6 @@ public function index() {
$data['payable'] = $this->config->get('payment_cheque_payable');
$data['address'] = nl2br($this->config->get('config_address'));

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/cheque', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/cod.php
View file
@@ -1,8 +1,6 @@
<?php
class ControllerExtensionPaymentCod extends Controller {
public function index() {
$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/cod', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/divido.php
View file
Expand Up @@ -75,8 +75,6 @@ public function index() {
'generic_credit_req_error' => 'Credit request could not be initiated',
);

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/divido', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/firstdata_remote.php
View file
Expand Up @@ -34,8 +34,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/firstdata_remote', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/free_checkout.php
View file
Expand Up @@ -3,8 +3,6 @@ class ControllerExtensionPaymentFreeCheckout extends Controller {
public function index() {
$data['continue'] = $this->url->link('checkout/success', 'language=' . $this->config->get('config_language'));

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/free_checkout', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/globalpay_remote.php
View file
Expand Up @@ -45,8 +45,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/globalpay_remote', $data);
}

Expand Down
4 changes: 0 additions & 4 deletions upload/catalog/controller/extension/payment/klarna_checkout.php
View file
Expand Up @@ -8,8 +8,6 @@ public function index() {

$this->document->setTitle($this->language->get('heading_title'));

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down Expand Up @@ -411,8 +409,6 @@ public function sidebar() {
);
}

$data['language'] = $this->config->get('config_language');

$this->response->setOutput($this->load->view('extension/payment/klarna_checkout_sidebar', $data));
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/klarna_invoice.php
View file
Expand Up @@ -129,8 +129,6 @@ public function index() {
$data['klarna_fee'] = '';
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/klarna_invoice', $data);
}
}
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/perpetual_payments.php
View file
Expand Up @@ -32,8 +32,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/perpetual_payments', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/pp_braintree.php
View file
Expand Up @@ -137,8 +137,6 @@ public function index() {
$data['guest'] = true;
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/pp_braintree', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/pp_express.php
View file
Expand Up @@ -17,8 +17,6 @@ public function index() {

unset($this->session->data['paypal']);

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/pp_express', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/pp_payflow.php
View file
Expand Up @@ -73,8 +73,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/pp_payflow', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/pp_pro.php
View file
Expand Up @@ -64,8 +64,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/pp_pro', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/realex_remote.php
View file
Expand Up @@ -58,8 +58,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/realex_remote', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/sagepay_direct.php
View file
Expand Up @@ -100,8 +100,6 @@ public function index() {
$data['existing_cards'] = $this->model_extension_payment_sagepay_direct->getCards($this->customer->getId());
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/sagepay_direct', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/sagepay_server.php
View file
Expand Up @@ -35,8 +35,6 @@ public function index() {
$data['cards'] = $this->model_extension_payment_sagepay_server->getCards($this->customer->getId());
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/sagepay_server', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/sagepay_us.php
View file
Expand Up @@ -33,8 +33,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/sagepay_us', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/securetrading_ws.php
View file
Expand Up @@ -54,8 +54,6 @@ public function index() {
$data['cards'][$card_type] = $cards[$card_type];
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/securetrading_ws', $data);
}
}
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/web_payment_software.php
View file
Expand Up @@ -23,8 +23,6 @@ public function index() {
);
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/web_payment_software', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/wechat_pay.php
View file
Expand Up @@ -73,8 +73,6 @@ public function qrcode() {

$data['action_success'] = $this->url->link('checkout/success', 'language=' . $this->config->get('config_language'));

$data['language'] = $this->config->get('config_language');

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/payment/worldpay.php
View file
Expand Up @@ -27,8 +27,6 @@ public function index() {
$data['recurring_products'] = true;
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/payment/worldpay', $data);
}

Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/recurring/pp_express.php
View file
Expand Up @@ -23,8 +23,6 @@ public function index() {
$data['order_recurring_id'] = '';
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/recurring/pp_express', $data);
}
}
Expand Down
2 changes: 0 additions & 2 deletions upload/catalog/controller/extension/total/coupon.php
View file
Expand Up @@ -10,8 +10,6 @@ public function index() {
$data['coupon'] = '';
}

$data['language'] = $this->config->get('config_language');

return $this->load->view('extension/total/coupon', $data);
}
}
Expand Down

0 comments on commit fd1bd4b

Please sign in to comment.