From 5119e757f6a2eb2f676b4c4bba14ef1081ff14d4 Mon Sep 17 00:00:00 2001
From: alext <alextselegidis@gmail.com>
Date: Fri, 8 Sep 2017 14:06:37 +0200
Subject: [PATCH] Integrated "lang" helper in view files.

---
 src/application/config/autoload.php           |   2 +-
 src/application/views/appointments/book.php   |  66 +++---
 .../views/appointments/book_success.php       |  10 +-
 src/application/views/backend/calendar.php    |  92 ++++----
 src/application/views/backend/customers.php   |  38 ++--
 src/application/views/backend/footer.php      |   6 +-
 src/application/views/backend/header.php      |  24 +--
 src/application/views/backend/services.php    |  66 +++---
 src/application/views/backend/settings.php    | 150 ++++++-------
 src/application/views/backend/users.php       | 198 +++++++++---------
 src/application/views/general/error404.php    |  12 +-
 .../views/user/forgot_password.php            |  18 +-
 src/application/views/user/login.php          |  18 +-
 src/application/views/user/logout.php         |  10 +-
 src/application/views/user/no_privileges.php  |   8 +-
 15 files changed, 359 insertions(+), 359 deletions(-)

diff --git a/src/application/config/autoload.php b/src/application/config/autoload.php
index a97e139f..07f35f65 100644
--- a/src/application/config/autoload.php
+++ b/src/application/config/autoload.php
@@ -64,7 +64,7 @@ $autoload['libraries'] = array('database');
 |	$autoload['helper'] = array('url', 'file');
 */
 
-$autoload['helper'] = array('custom_exceptions', 'url', 'file');
+$autoload['helper'] = array('custom_exceptions', 'url', 'file', 'language');
 
 
 /*
diff --git a/src/application/views/appointments/book.php b/src/application/views/appointments/book.php
index f44a375a..261df2e8 100644
--- a/src/application/views/appointments/book.php
+++ b/src/application/views/appointments/book.php
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
-    <title><?php echo $this->lang->line('page_title') . ' ' .  $company_name; ?></title>
+    <title><?php echo lang('page_title') . ' ' .  $company_name; ?></title>
 
     <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
     <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
@@ -28,17 +28,17 @@
                     <span id="company-name"><?php echo $company_name; ?></span>
 
                     <div id="steps">
-                        <div id="step-1" class="book-step active-step" title="<?php echo $this->lang->line('step_one_title'); ?>">
+                        <div id="step-1" class="book-step active-step" title="<?php echo lang('step_one_title'); ?>">
                             <strong>1</strong>
                         </div>
 
-                        <div id="step-2" class="book-step" title="<?php echo $this->lang->line('step_two_title'); ?>">
+                        <div id="step-2" class="book-step" title="<?php echo lang('step_two_title'); ?>">
                             <strong>2</strong>
                         </div>
-                        <div id="step-3" class="book-step" title="<?php echo $this->lang->line('step_three_title'); ?>">
+                        <div id="step-3" class="book-step" title="<?php echo lang('step_three_title'); ?>">
                             <strong>3</strong>
                         </div>
-                        <div id="step-4" class="book-step" title="<?php echo $this->lang->line('step_four_title'); ?>">
+                        <div id="step-4" class="book-step" title="<?php echo lang('step_four_title'); ?>">
                             <strong>4</strong>
                         </div>
                     </div>
@@ -50,7 +50,7 @@
                             <div id="cancel-appointment-frame" class="row">
                                 <div class="col-xs-12 col-sm-10">
                                     <p>' .
-                                        $this->lang->line('cancel_appointment_hint') .
+                                        lang('cancel_appointment_hint') .
                                     '</p>
                                 </div>
                                 <div class="col-xs-12 col-sm-2">
@@ -59,7 +59,7 @@
                                         <input type="hidden" name="csrfToken" value="' . $this->security->get_csrf_hash() . '" />
                                         <textarea name="cancel_reason" style="display:none"></textarea>
                                         <button id="cancel-appointment" class="btn btn-default">' .
-                                                $this->lang->line('cancel') . '</button>
+                                                lang('cancel') . '</button>
                                     </form>
                                 </div>
                             </div>';
@@ -69,7 +69,7 @@
                 <?php
                     if (isset($exceptions)) {
                         echo '<div style="margin: 10px">';
-                        echo '<h4>' . $this->lang->line('unexpected_issues') . '</h4>';
+                        echo '<h4>' . lang('unexpected_issues') . '</h4>';
                         foreach($exceptions as $exception) {
                             echo exceptionToHtml($exception);
                         }
@@ -81,12 +81,12 @@
 
                 <div id="wizard-frame-1" class="wizard-frame">
                     <div class="frame-container">
-                        <h3 class="frame-title"><?php echo $this->lang->line('step_one_title'); ?></h3>
+                        <h3 class="frame-title"><?php echo lang('step_one_title'); ?></h3>
 
                         <div class="frame-content">
                             <div class="form-group">
                                 <label for="select-service">
-                                    <strong><?php echo $this->lang->line('select_service'); ?></strong>
+                                    <strong><?php echo lang('select_service'); ?></strong>
                                 </label>
 
                                 <select id="select-service" class="col-md-4 form-control">
@@ -148,7 +148,7 @@
 
                             <div class="form-group">
                                 <label for="select-provider">
-                                    <strong><?php echo $this->lang->line('select_provider'); ?></strong>
+                                    <strong><?php echo lang('select_provider'); ?></strong>
                                 </label>
 
                                 <select id="select-provider" class="col-md-4 form-control"></select>
@@ -161,7 +161,7 @@
                     <div class="command-buttons">
                         <button type="button" id="button-next-1" class="btn button-next btn-primary"
                                 data-step_index="1">
-                            <?php echo $this->lang->line('next'); ?>
+                            <?php echo lang('next'); ?>
                             <span class="glyphicon glyphicon-forward"></span>
                         </button>
                     </div>
@@ -172,7 +172,7 @@
                 <div id="wizard-frame-2" class="wizard-frame" style="display:none;">
                     <div class="frame-container">
 
-                        <h3 class="frame-title"><?php echo $this->lang->line('step_two_title'); ?></h3>
+                        <h3 class="frame-title"><?php echo lang('step_two_title'); ?></h3>
 
                         <div class="frame-content row">
                             <div class="col-xs-12 col-sm-6">
@@ -190,11 +190,11 @@
                         <button type="button" id="button-back-2" class="btn button-back btn-default"
                                 data-step_index="2">
                             <span class="glyphicon glyphicon-backward"></span>
-                            <?php echo $this->lang->line('back'); ?>
+                            <?php echo lang('back'); ?>
                         </button>
                         <button type="button" id="button-next-2" class="btn button-next btn-primary"
                                 data-step_index="2">
-                            <?php echo $this->lang->line('next'); ?>
+                            <?php echo lang('next'); ?>
                             <span class="glyphicon glyphicon-forward"></span>
                         </button>
                     </div>
@@ -205,59 +205,59 @@
                 <div id="wizard-frame-3" class="wizard-frame" style="display:none;">
                     <div class="frame-container">
 
-                        <h3 class="frame-title"><?php echo $this->lang->line('step_three_title'); ?></h3>
+                        <h3 class="frame-title"><?php echo lang('step_three_title'); ?></h3>
 
                         <div class="frame-content row">
                             <div class="col-xs-12 col-sm-6">
                                 <div class="form-group">
-                                    <label for="first-name" class="control-label"><?php echo $this->lang->line('first_name'); ?> *</label>
+                                    <label for="first-name" class="control-label"><?php echo lang('first_name'); ?> *</label>
                                     <input type="text" id="first-name" class="required form-control" maxlength="100" />
                                 </div>
                                 <div class="form-group">
-                                    <label for="last-name" class="control-label"><?php echo $this->lang->line('last_name'); ?> *</label>
+                                    <label for="last-name" class="control-label"><?php echo lang('last_name'); ?> *</label>
                                     <input type="text" id="last-name" class="required form-control" maxlength="250" />
                                 </div>
                                 <div class="form-group">
-                                    <label for="email" class="control-label"><?php echo $this->lang->line('email'); ?> *</label>
+                                    <label for="email" class="control-label"><?php echo lang('email'); ?> *</label>
                                     <input type="text" id="email" class="required form-control" maxlength="250" />
                                 </div>
                                 <div class="form-group">
-                                    <label for="phone-number" class="control-label"><?php echo $this->lang->line('phone_number'); ?> *</label>
+                                    <label for="phone-number" class="control-label"><?php echo lang('phone_number'); ?> *</label>
                                     <input type="text" id="phone-number" class="required form-control" maxlength="60" />
                                 </div>
                             </div>
 
                             <div class="col-xs-12 col-sm-6">
                                 <div class="form-group">
-                                    <label for="address" class="control-label"><?php echo $this->lang->line('address'); ?></label>
+                                    <label for="address" class="control-label"><?php echo lang('address'); ?></label>
                                     <input type="text" id="address" class="form-control" maxlength="250" />
                                 </div>
                                 <div class="form-group">
-                                    <label for="city" class="control-label"><?php echo $this->lang->line('city'); ?></label>
+                                    <label for="city" class="control-label"><?php echo lang('city'); ?></label>
                                     <input type="text" id="city" class="form-control" maxlength="120" />
                                 </div>
                                 <div class="form-group">
-                                    <label for="zip-code" class="control-label"><?php echo $this->lang->line('zip_code'); ?></label>
+                                    <label for="zip-code" class="control-label"><?php echo lang('zip_code'); ?></label>
                                     <input type="text" id="zip-code" class="form-control" maxlength="120" />
                                 </div>
                                 <div class="form-group">
-                                    <label for="notes" class="control-label"><?php echo $this->lang->line('notes'); ?></label>
+                                    <label for="notes" class="control-label"><?php echo lang('notes'); ?></label>
                                     <textarea id="notes" maxlength="500" class="form-control" rows="3"></textarea>
                                 </div>
                             </div>
 
-                            <em id="form-message" class="text-danger"><?php echo $this->lang->line('fields_are_required'); ?></em>
+                            <em id="form-message" class="text-danger"><?php echo lang('fields_are_required'); ?></em>
                         </div>
                     </div>
 
                     <div class="command-buttons">
                         <button type="button" id="button-back-3" class="btn button-back btn-default"
                                 data-step_index="3"><span class="glyphicon glyphicon-backward"></span>
-                            <?php echo $this->lang->line('back'); ?>
+                            <?php echo lang('back'); ?>
                         </button>
                         <button type="button" id="button-next-3" class="btn button-next btn-primary"
                                 data-step_index="3">
-                            <?php echo $this->lang->line('next'); ?>
+                            <?php echo lang('next'); ?>
                             <span class="glyphicon glyphicon-forward"></span>
                         </button>
                     </div>
@@ -267,7 +267,7 @@
 
                 <div id="wizard-frame-4" class="wizard-frame" style="display:none;">
                     <div class="frame-container">
-                        <h3 class="frame-title"><?php echo $this->lang->line('step_four_title'); ?></h3>
+                        <h3 class="frame-title"><?php echo lang('step_four_title'); ?></h3>
                         <div class="frame-content row">
                             <div id="appointment-details" class="col-xs-12 col-sm-6"></div>
                             <div id="customer-details" class="col-xs-12 col-sm-6"></div>
@@ -291,14 +291,14 @@
                         <button type="button" id="button-back-4" class="btn button-back btn-default"
                                 data-step_index="4">
                             <span class="glyphicon glyphicon-backward"></span>
-                            <?php echo $this->lang->line('back'); ?>
+                            <?php echo lang('back'); ?>
                         </button>
                         <form id="book-appointment-form" style="display:inline-block" method="post">
                             <button id="book-appointment-submit" type="button" class="btn btn-success">
                                 <span class="glyphicon glyphicon-ok"></span>
                                 <?php
-                                    echo (!$manage_mode) ? $this->lang->line('confirm')
-                                            : $this->lang->line('update');
+                                    echo (!$manage_mode) ? lang('confirm')
+                                            : lang('update');
                                 ?>
                             </button>
                             <input type="hidden" name="csrfToken" />
@@ -319,8 +319,8 @@
                     |
                     <a href="<?php echo site_url('backend'); ?>">
                         <?php echo $this->session->userdata('user_id')
-                            ? $this->lang->line('backend_section') 
-                            : $this->lang->line('login'); ?>
+                            ? lang('backend_section')
+                            : lang('login'); ?>
                     </a>
                 </div>
             </div>
diff --git a/src/application/views/appointments/book_success.php b/src/application/views/appointments/book_success.php
index f6439a5b..a317648d 100755
--- a/src/application/views/appointments/book_success.php
+++ b/src/application/views/appointments/book_success.php
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
-    <title><?php echo $this->lang->line('appointment_registered') . ' - ' . $company_name; ?></title>
+    <title><?php echo lang('appointment_registered') . ' - ' . $company_name; ?></title>
 
     <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
     <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/css/frontend.css'); ?>">
@@ -28,11 +28,11 @@
                 <div class="col-xs-12 col-sm-10">
                     <?php
                         echo '
-                            <h3>' . $this->lang->line('appointment_registered') . '</h3>
-                            <p>' . $this->lang->line('appointment_details_was_sent_to_you') . '</p>
+                            <h3>' . lang('appointment_registered') . '</h3>
+                            <p>' . lang('appointment_details_was_sent_to_you') . '</p>
                             <a href="' . site_url() . '" class="btn btn-success btn-large">
                                 <span class="glyphicon glyphicon-calendar"></span> ' .
-                                $this->lang->line('go_to_booking_page') . '
+                                lang('go_to_booking_page') . '
                             </a>
                         ';
 
@@ -40,7 +40,7 @@
                             echo '
                                 <button id="add-to-google-calendar" class="btn btn-primary">
                                     <span class="glyphicon glyphicon-plus"></span>
-                                    ' . $this->lang->line('add_to_google_calendar') . '
+                                    ' . lang('add_to_google_calendar') . '
                                 </button>';
                         }
 
diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php
index c9d8004d..b3efa6ab 100644
--- a/src/application/views/backend/calendar.php
+++ b/src/application/views/backend/calendar.php
@@ -40,10 +40,10 @@
         <div id="calendar-filter" class="form-inline col-xs-12 col-md-5">
             <div class="form-group">
                 <label for="select-filter-item">
-                    <?php echo $this->lang->line('display_calendar'); ?>
+                    <?php echo lang('display_calendar'); ?>
                 </label>
                 <select id="select-filter-item" class="form-control"
-                        title="<?php echo $this->lang->line('select_filter_item_hint'); ?>">
+                        title="<?php echo lang('select_filter_item_hint'); ?>">
                 </select>
             </div>
         </div>
@@ -52,36 +52,36 @@
             <?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER)
                     && Config::GOOGLE_SYNC_FEATURE == TRUE): ?>
                 <button id="google-sync" class="btn btn-primary"
-                        title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>">
+                        title="<?php echo lang('trigger_google_sync_hint'); ?>">
                     <span class="glyphicon glyphicon-refresh"></span>
-                    <span><?php echo $this->lang->line('synchronize'); ?></span>
+                    <span><?php echo lang('synchronize'); ?></span>
                 </button>
 
                 <button id="enable-sync" class="btn btn-default" data-toggle="button"
-                        title="<?php echo $this->lang->line('enable_appointment_sync_hint'); ?>">
+                        title="<?php echo lang('enable_appointment_sync_hint'); ?>">
                     <span class="glyphicon glyphicon-calendar"></span>
-                    <span><?php echo $this->lang->line('enable_sync'); ?></span>
+                    <span><?php echo lang('enable_sync'); ?></span>
                 </button>
             <?php endif ?>
 
             <?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?>
                 <button id="insert-appointment" class="btn btn-default"
-                        title="<?php echo $this->lang->line('new_appointment_hint'); ?>">
+                        title="<?php echo lang('new_appointment_hint'); ?>">
                     <span class="glyphicon glyphicon-plus"></span>
-                    <?php echo $this->lang->line('appointment'); ?>
+                    <?php echo lang('appointment'); ?>
                 </button>
 
                 <button id="insert-unavailable" class="btn btn-default"
-                        title="<?php echo $this->lang->line('unavailable_periods_hint'); ?>">
+                        title="<?php echo lang('unavailable_periods_hint'); ?>">
                     <span class="glyphicon glyphicon-plus"></span>
-                    <?php echo $this->lang->line('unavailable'); ?>
+                    <?php echo lang('unavailable'); ?>
                 </button>
             <?php endif ?>
 
             <button id="reload-appointments" class="btn btn-default"
-                    title="<?php echo $this->lang->line('reload_appointments_hint'); ?>">
+                    title="<?php echo lang('reload_appointments_hint'); ?>">
                 <span class="glyphicon glyphicon-repeat"></span>
-                <?php echo $this->lang->line('reload'); ?>
+                <?php echo lang('reload'); ?>
             </button>
 
             <button id="toggle-fullscreen" class="btn btn-default">
@@ -103,7 +103,7 @@
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal"
                             aria-hidden="true">&times;</button>
-                    <h3 class="modal-title"><?php echo $this->lang->line('edit_appointment_title'); ?></h3>
+                    <h3 class="modal-title"><?php echo lang('edit_appointment_title'); ?></h3>
                 </div>
 
                 <div class="modal-body">
@@ -111,12 +111,12 @@
 
                     <form class="form-horizontal">
                         <fieldset class="container">
-                            <legend><?php echo $this->lang->line('appointment_details_title'); ?></legend>
+                            <legend><?php echo lang('appointment_details_title'); ?></legend>
 
                             <input id="appointment-id" type="hidden" />
 
                             <div class="form-group">
-                                <label for="select-service" class="col-sm-3 control-label"><?php echo $this->lang->line('service'); ?> *</label>
+                                <label for="select-service" class="col-sm-3 control-label"><?php echo lang('service'); ?> *</label>
                                 <div class="col-sm-7">
                                     <select id="select-service" class="required form-control">
                                         <?php
@@ -177,28 +177,28 @@
                             </div>
 
                             <div class="form-group">
-                                <label for="select-provider" class="col-sm-3 control-label"><?php echo $this->lang->line('provider'); ?> *</label>
+                                <label for="select-provider" class="col-sm-3 control-label"><?php echo lang('provider'); ?> *</label>
                                 <div class="col-sm-7">
                                     <select id="select-provider" class="required form-control"></select>
                                 </div>
                             </div>
 
                             <div class="form-group">
-                                <label for="start-datetime" class="col-sm-3 control-label" ><?php echo $this->lang->line('start_date_time'); ?></label>
+                                <label for="start-datetime" class="col-sm-3 control-label" ><?php echo lang('start_date_time'); ?></label>
                                 <div class="col-sm-7">
                                     <input type="text" id="start-datetime" class="form-control" />
                                 </div>
                             </div>
 
                             <div class="form-group">
-                                <label for="end-datetime" class="control-label col-sm-3" ><?php echo $this->lang->line('end_date_time'); ?></label>
+                                <label for="end-datetime" class="control-label col-sm-3" ><?php echo lang('end_date_time'); ?></label>
                                 <div class="col-sm-7">
                                     <input type="text" id="end-datetime" class="form-control" />
                                 </div>
                             </div>
 
                             <div class="form-group">
-                                <label for="appointment-notes" class="control-label col-sm-3" ><?php echo $this->lang->line('notes'); ?></label>
+                                <label for="appointment-notes" class="control-label col-sm-3" ><?php echo lang('notes'); ?></label>
                                 <div class="col-sm-7">
                                     <textarea id="appointment-notes" class="form-control" rows="3"></textarea>
                                 </div>
@@ -207,17 +207,17 @@
 
                         <fieldset class="container">
                             <legend>
-                                <?php echo $this->lang->line('customer_details_title'); ?>
+                                <?php echo lang('customer_details_title'); ?>
                                 <button id="new-customer" class="btn btn-default btn-xs"
-                                        title="<?php echo $this->lang->line('clear_fields_add_existing_customer_hint'); ?>"
-                                        type="button"><?php echo $this->lang->line('new'); ?>
+                                        title="<?php echo lang('clear_fields_add_existing_customer_hint'); ?>"
+                                        type="button"><?php echo lang('new'); ?>
                                 </button>
                                 <button id="select-customer" class="btn btn-primary btn-xs"
-                                        title="<?php echo $this->lang->line('pick_existing_customer_hint'); ?>"
-                                        type="button"><?php echo $this->lang->line('select'); ?>
+                                        title="<?php echo lang('pick_existing_customer_hint'); ?>"
+                                        type="button"><?php echo lang('select'); ?>
                                 </button>
                                 <input type="text" id="filter-existing-customers"
-                                       placeholder="<?php echo $this->lang->line('type_to_filter_customers'); ?>"
+                                       placeholder="<?php echo lang('type_to_filter_customers'); ?>"
                                        style="display: none;" class="input-sm"/>
                                 <div id="existing-customers-list" style="display: none;"></div>
                             </legend>
@@ -228,7 +228,7 @@
                                 <div class="col-md-6">
                                     <div class="form-group">
                                         <label for="first-name" class="control-label col-sm-2">
-                                            <?php echo $this->lang->line('first_name'); ?> *</label>
+                                            <?php echo lang('first_name'); ?> *</label>
                                         <div class="col-sm-8">
                                             <input type="text" id="first-name" class="required form-control" />
                                         </div>
@@ -236,7 +236,7 @@
 
                                     <div class="form-group">
                                         <label for="last-name" class="control-label col-sm-2">
-                                            <?php echo $this->lang->line('last_name'); ?>*</label>
+                                            <?php echo lang('last_name'); ?>*</label>
                                         <div class="col-sm-8">
                                             <input type="text" id="last-name" class="required form-control" />
                                         </div>
@@ -244,7 +244,7 @@
 
                                     <div class="form-group">
                                         <label for="email" class="control-label col-sm-2">
-                                            <?php echo $this->lang->line('email'); ?>*</label>
+                                            <?php echo lang('email'); ?>*</label>
                                         <div class="col-sm-8">
                                             <input type="text" id="email" class="required form-control" />
                                         </div>
@@ -252,7 +252,7 @@
 
                                     <div class="form-group">
                                         <label for="phone-number" class="control-label col-sm-3">
-                                            <?php echo $this->lang->line('phone_number'); ?>*</label>
+                                            <?php echo lang('phone_number'); ?>*</label>
                                         <div class="col-sm-8">
                                             <input type="text" id="phone-number" class="required form-control" />
                                         </div>
@@ -261,7 +261,7 @@
                                 <div class="col-md-6">
                                     <div class="form-group">
                                         <label for="address" class="control-label col-sm-3">
-                                            <?php echo $this->lang->line('address'); ?></label>
+                                            <?php echo lang('address'); ?></label>
                                         <div class="col-sm-8">
                                             <input type="text" id="address" class="form-control" />
                                         </div>
@@ -269,7 +269,7 @@
 
                                     <div class="form-group">
                                         <label for="city" class="control-label col-sm-3">
-                                            <?php echo $this->lang->line('city'); ?></label>
+                                            <?php echo lang('city'); ?></label>
                                         <div class="col-sm-8">
                                             <input type="text" id="city" class="form-control" />
                                         </div>
@@ -277,7 +277,7 @@
 
                                     <div class="form-group">
                                         <label for="zip-code" class="control-label col-sm-3">
-                                            <?php echo $this->lang->line('zip_code'); ?></label>
+                                            <?php echo lang('zip_code'); ?></label>
                                         <div class="col-sm-8">
                                             <input type="text" id="zip-code" class="form-control" />
                                         </div>
@@ -285,7 +285,7 @@
 
                                     <div class="form-group">
                                         <label for="customer-notes" class="control-label col-sm-3">
-                                            <?php echo $this->lang->line('notes'); ?></label>
+                                            <?php echo lang('notes'); ?></label>
                                         <div class="col-sm-8">
                                             <textarea id="customer-notes" rows="3" class="form-control"></textarea>
                                         </div>
@@ -301,10 +301,10 @@
 
             <div class="modal-footer footer">
                 <button id="save-appointment" class="btn btn-primary">
-                    <?php echo $this->lang->line('save'); ?>
+                    <?php echo lang('save'); ?>
                 </button>
                 <button id="cancel-appointment" class="btn btn-default" data-dismiss="modal">
-                    <?php echo $this->lang->line('cancel'); ?>
+                    <?php echo lang('cancel'); ?>
                 </button>
             </div>
         </div>
@@ -320,7 +320,7 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"
                         aria-hidden="true">&times;</button>
-                <h3 class="modal-title"><?php echo $this->lang->line('new_unavailable_title'); ?></h3>
+                <h3 class="modal-title"><?php echo lang('new_unavailable_title'); ?></h3>
             </div>
 
             <div class="modal-body">
@@ -332,7 +332,7 @@
                         
                         <div class="form-group">
                             <label for="unavailable-provider" class="control-label col-sm-3">
-                                <?php echo $this->lang->line('provider'); ?>
+                                <?php echo lang('provider'); ?>
                             </label>
                             <div class="col-sm-8">
                                 <select type="text" id="unavailable-provider" class="form-control"></select>
@@ -341,7 +341,7 @@
 
                         <div class="form-group">
                             <label for="unavailable-start" class="control-label col-sm-3">
-                                <?php echo $this->lang->line('start'); ?>
+                                <?php echo lang('start'); ?>
                             </label>
                             <div class="col-sm-8">
                                 <input type="text" id="unavailable-start" class="form-control" />
@@ -350,7 +350,7 @@
 
                         <div class="form-group">
                             <label for="unavailable-end" class="control-label col-sm-3">
-                                <?php echo $this->lang->line('end'); ?>
+                                <?php echo lang('end'); ?>
                             </label>
                             <div class="col-sm-8">
                                 <input type="text" id="unavailable-end" class="form-control" />
@@ -359,7 +359,7 @@
 
                         <div class="form-group">
                             <label for="unavailable-notes" class="control-label col-sm-3">
-                                <?php echo $this->lang->line('notes'); ?>
+                                <?php echo lang('notes'); ?>
                             </label>
                             <div class="col-sm-8">
                                 <textarea id="unavailable-notes" rows="3" class="form-control"></textarea>
@@ -371,10 +371,10 @@
 
             <div class="modal-footer">
                 <button id="save-unavailable" class="btn btn-primary">
-                    <?php echo $this->lang->line('save'); ?>
+                    <?php echo lang('save'); ?>
                 </button>
                 <button id="cancel-unavailable" class="btn btn-default" data-dismiss="modal">
-                    <?php echo $this->lang->line('cancel'); ?>
+                    <?php echo lang('cancel'); ?>
                 </button>
             </div>
 
@@ -391,22 +391,22 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"
                         aria-hidden="true">&times;</button>
-                <h3 class="modal-title"><?php echo $this->lang->line('select_google_calendar'); ?></h3>
+                <h3 class="modal-title"><?php echo lang('select_google_calendar'); ?></h3>
             </div>
 
             <div class="modal-body">
                 <p>
-                    <?php echo $this->lang->line('select_google_calendar_prompt'); ?>
+                    <?php echo lang('select_google_calendar_prompt'); ?>
                 </p>
                 <select id="google-calendar"></select>
             </div>
 
             <div class="modal-footer">
                 <button id="select-calendar" class="btn btn-primary">
-                    <?php echo $this->lang->line('select'); ?>
+                    <?php echo lang('select'); ?>
                 </button>
                 <button id="close-calendar" class="btn btn-default" data-dismiss="modal">
-                    <?php echo $this->lang->line('close'); ?>
+                    <?php echo lang('close'); ?>
                 </button>
             </div>
 
diff --git a/src/application/views/backend/customers.php b/src/application/views/backend/customers.php
index 1e07d4c5..c7ef03c4 100644
--- a/src/application/views/backend/customers.php
+++ b/src/application/views/backend/customers.php
@@ -28,16 +28,16 @@
     		<form class="input-append">
     			<input class="key" type="text" />
                 <div class="btn-group">
-                    <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
+                    <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo lang('filter'); ?>">
                         <span class="glyphicon glyphicon-search"></span>
                     </button>
-                    <button class="clear btn btn-default btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
+                    <button class="clear btn btn-default btn-sm" type="button" title="<?php echo lang('clear'); ?>">
                         <span class="glyphicon glyphicon-repeat"></span>
                     </button>
                 </div>
     		</form>
 
-            <h3><?php echo $this->lang->line('customers'); ?></h3>
+            <h3><?php echo lang('customers'); ?></h3>
             <div class="results"></div>
     	</div>
 
@@ -47,21 +47,21 @@
                     <?php if ($privileges[PRIV_CUSTOMERS]['add'] == TRUE) { ?>
                     <button id="add-customer" class="btn btn-primary">
                         <span class="glyphicon glyphicon-plus"></span>
-                        <?php echo $this->lang->line('add'); ?>
+                        <?php echo lang('add'); ?>
                     </button>
                     <?php } ?>
 
                     <?php if ($privileges[PRIV_CUSTOMERS]['edit'] == TRUE) { ?>
                     <button id="edit-customer" class="btn btn-default" disabled="disabled">
                         <span class="glyphicon glyphicon-pencil"></span>
-                        <?php echo $this->lang->line('edit'); ?>
+                        <?php echo lang('edit'); ?>
                     </button>
                     <?php }?>
 
                     <?php if ($privileges[PRIV_CUSTOMERS]['delete'] == TRUE) { ?>
                     <button id="delete-customer" class="btn btn-default" disabled="disabled">
                         <span class="glyphicon glyphicon-remove"></span>
-                        <?php echo $this->lang->line('delete'); ?>
+                        <?php echo lang('delete'); ?>
                     </button>
                     <?php } ?>
                 </div>
@@ -69,11 +69,11 @@
                 <div id="save-cancel-group" class="btn-group" style="display:none;">
                     <button id="save-customer" class="btn btn-primary">
                         <span class="glyphicon glyphicon-ok"></span>
-                        <?php echo $this->lang->line('save'); ?>
+                        <?php echo lang('save'); ?>
                     </button>
                     <button id="cancel-customer" class="btn btn-default">
                         <i class="glyphicon glyphicon-ban-circle"></i>
-                        <?php echo $this->lang->line('cancel'); ?>
+                        <?php echo lang('cancel'); ?>
                     </button>
                 </div>
             </div>
@@ -82,55 +82,55 @@
 
             <div class="row">
                 <div class="col-md-6" style="margin-left: 0;">
-                    <h3><?php echo $this->lang->line('details'); ?></h3>
+                    <h3><?php echo lang('details'); ?></h3>
                     <div id="form-message" class="alert" style="display:none;"></div>
 
                     <div class="form-group">
-                        <label for="first-name"><?php echo $this->lang->line('first_name'); ?> *</label>
+                        <label for="first-name"><?php echo lang('first_name'); ?> *</label>
                         <input type="text" id="first-name" class="form-control required" />
                     </div>
 
                     <div class="form-group">
-                        <label for="last-name"><?php echo $this->lang->line('last_name'); ?> *</label>
+                        <label for="last-name"><?php echo lang('last_name'); ?> *</label>
                         <input type="text" id="last-name" class="form-control required" />
                     </div>
 
                     <div class="form-group">
-                        <label for="email"><?php echo $this->lang->line('email'); ?> *</label>
+                        <label for="email"><?php echo lang('email'); ?> *</label>
                         <input type="text" id="email" class="form-control required" />
                     </div>
 
                     <div class="form-group">
-                        <label for="phone-number"><?php echo $this->lang->line('phone_number'); ?> *</label>
+                        <label for="phone-number"><?php echo lang('phone_number'); ?> *</label>
                         <input type="text" id="phone-number" class="form-control required" />
                     </div>
 
                     <div class="form-group">
-                        <label for="address"><?php echo $this->lang->line('address'); ?></label>
+                        <label for="address"><?php echo lang('address'); ?></label>
                         <input type="text" id="address" class="form-control" />
                     </div>
 
                     <div class="form-group">
-                        <label for="city"><?php echo $this->lang->line('city'); ?></label>
+                        <label for="city"><?php echo lang('city'); ?></label>
                         <input type="text" id="city" class="form-control" />
                     </div>
 
                     <div class="form-group">
-                        <label for="zip-code"><?php echo $this->lang->line('zip_code'); ?></label>
+                        <label for="zip-code"><?php echo lang('zip_code'); ?></label>
                         <input type="text" id="zip-code" class="form-control" />
                     </div>
 
                     <div class="form-group">
-                        <label for="notes"><?php echo $this->lang->line('notes'); ?></label>
+                        <label for="notes"><?php echo lang('notes'); ?></label>
                         <textarea id="notes" rows="4" class="form-control"></textarea>
                     </div>
 
                     <center><em id="form-message" class="text-error">
-                        <?php echo $this->lang->line('fields_are_required'); ?></em></center>
+                        <?php echo lang('fields_are_required'); ?></em></center>
                 </div>
 
                 <div class="col-md-5">
-                    <h3><?php echo $this->lang->line('appointments'); ?></h3>
+                    <h3><?php echo lang('appointments'); ?></h3>
                     <div id="customer-appointments"></div>
                     <div id="appointment-details"></div>
                 </div>
diff --git a/src/application/views/backend/footer.php b/src/application/views/backend/footer.php
index e9e4a3bf..3fe7d702 100644
--- a/src/application/views/backend/footer.php
+++ b/src/application/views/backend/footer.php
@@ -10,18 +10,18 @@
                     echo ' - ' . $release_title;
                 }
             ?></a> |
-        <?php echo $this->lang->line('licensed_under'); ?> GPLv3 |
+        <?php echo lang('licensed_under'); ?> GPLv3 |
         <span id="select-language" class="label label-success">
         	<?php echo ucfirst($this->config->item('language')); ?>
         </span>
         |
         <a href="<?php echo site_url('appointments'); ?>">
-            <?php echo $this->lang->line('go_to_booking_page') ?>
+            <?php echo lang('go_to_booking_page') ?>
         </a>
     </div>
 
     <div id="footer-user-display-name" class="col-xs-12 col-sm-6">
-        <?php echo $this->lang->line('hello') . ', ' . $user_display_name; ?>!
+        <?php echo lang('hello') . ', ' . $user_display_name; ?>!
     </div>
 </div>
 
diff --git a/src/application/views/backend/header.php b/src/application/views/backend/header.php
index 62cbd727..db182148 100755
--- a/src/application/views/backend/header.php
+++ b/src/application/views/backend/header.php
@@ -56,8 +56,8 @@
                 <?php $active = ($active_menu == PRIV_APPOINTMENTS) ? 'active' : ''; ?>
                 <li class="<?php echo $active . $hidden; ?>">
                     <a href="<?php echo site_url('backend'); ?>" class="menu-item"
-                            title="<?php echo $this->lang->line('manage_appointment_record_hint'); ?>">
-                        <?php echo $this->lang->line('calendar'); ?>
+                            title="<?php echo lang('manage_appointment_record_hint'); ?>">
+                        <?php echo lang('calendar'); ?>
                     </a>
                 </li>
 
@@ -67,8 +67,8 @@
                 <?php $active = ($active_menu == PRIV_CUSTOMERS) ? 'active' : ''; ?>
                 <li class="<?php echo $active . $hidden; ?>">
                     <a href="<?php echo site_url('backend/customers'); ?>" class="menu-item"
-                            title="<?php echo $this->lang->line('manage_customers_hint'); ?>">
-                        <?php echo $this->lang->line('customers'); ?>
+                            title="<?php echo lang('manage_customers_hint'); ?>">
+                        <?php echo lang('customers'); ?>
                     </a>
                 </li>
 
@@ -78,8 +78,8 @@
                 <?php $active = ($active_menu == PRIV_SERVICES) ? 'active' : ''; ?>
                 <li class="<?php echo $active . $hidden; ?>">
                     <a href="<?php echo site_url('backend/services'); ?>" class="menu-item"
-                            title="<?php echo $this->lang->line('manage_services_hint'); ?>">
-                        <?php echo $this->lang->line('services'); ?>
+                            title="<?php echo lang('manage_services_hint'); ?>">
+                        <?php echo lang('services'); ?>
                     </a>
                 </li>
 
@@ -89,8 +89,8 @@
                 <?php $active = ($active_menu == PRIV_USERS) ? 'active' : ''; ?>
                 <li class="<?php echo $active . $hidden; ?>">
                     <a href="<?php echo site_url('backend/users'); ?>" class="menu-item"
-                            title="<?php echo $this->lang->line('manage_users_hint'); ?>">
-                        <?php echo $this->lang->line('users'); ?>
+                            title="<?php echo lang('manage_users_hint'); ?>">
+                        <?php echo lang('users'); ?>
                     </a>
                 </li>
 
@@ -101,8 +101,8 @@
                 <?php $active = ($active_menu == PRIV_SYSTEM_SETTINGS) ? 'active' : ''; ?>
                 <li class="<?php echo $active . $hidden; ?>">
                     <a href="<?php echo site_url('backend/settings'); ?>" class="menu-item"
-                            title="<?php echo $this->lang->line('settings_hint'); ?>">
-                        <?php echo $this->lang->line('settings'); ?>
+                            title="<?php echo lang('settings_hint'); ?>">
+                        <?php echo lang('settings'); ?>
                     </a>
                 </li>
 
@@ -110,8 +110,8 @@
                       // ------------------------------------------------------ ?>
                 <li>
                     <a href="<?php echo site_url('user/logout') ?>" class="menu-item"
-                            title="<?php echo $this->lang->line('log_out_hint'); ?>">
-                        <?php echo $this->lang->line('log_out'); ?>
+                            title="<?php echo lang('log_out_hint'); ?>">
+                        <?php echo lang('log_out'); ?>
                     </a>
                 </li>
             </ul>
diff --git a/src/application/views/backend/services.php b/src/application/views/backend/services.php
index 0e4e5e84..fd41ce13 100644
--- a/src/application/views/backend/services.php
+++ b/src/application/views/backend/services.php
@@ -23,8 +23,8 @@
 
 <div id="services-page" class="container-fluid backend-page">
     <ul class="nav nav-tabs">
-        <li role="presentation" class="services-tab tab active"><a><?php echo $this->lang->line('services'); ?></a></li>
-        <li role="presentation" class="categories-tab tab"><a><?php echo $this->lang->line('categories'); ?></a></li>
+        <li role="presentation" class="services-tab tab active"><a><?php echo lang('services'); ?></a></li>
+        <li role="presentation" class="categories-tab tab"><a><?php echo lang('categories'); ?></a></li>
     </ul>
 
     <!-- SERVICES TAB -->
@@ -36,16 +36,16 @@
                 <form class="input-append">
                     <input class="key" type="text" />
                     <div class="btn-group">
-                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
+                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo lang('filter'); ?>">
                             <span class="glyphglyphicon glyphicon glyphglyphicon glyphicon-search"></span>
                         </button>
-                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
+                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo lang('clear'); ?>">
                             <span class="glyphglyphicon glyphicon glyphglyphicon glyphicon-repeat"></span>
                         </button>
                     </div>
                 </form>
 
-                <h3><?php echo $this->lang->line('services'); ?></h3>
+                <h3><?php echo lang('services'); ?></h3>
                 <div class="results"></div>
             </div>
 
@@ -54,84 +54,84 @@
                     <div class="add-edit-delete-group btn-group">
                         <button id="add-service" class="btn btn-primary">
                             <span class="glyphicon glyphicon-plus"></span>
-                            <?php echo $this->lang->line('add'); ?>
+                            <?php echo lang('add'); ?>
                         </button>
                         <button id="edit-service" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-pencil"></span>
-                            <?php echo $this->lang->line('edit'); ?>
+                            <?php echo lang('edit'); ?>
                         </button>
                         <button id="delete-service" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-remove"></span>
-                            <?php echo $this->lang->line('delete'); ?>
+                            <?php echo lang('delete'); ?>
                         </button>
                     </div>
 
                     <div class="save-cancel-group btn-group" style="display:none;">
                         <button id="save-service" class="btn btn-primary">
                             <span class="glyphicon glyphicon-ok"></span>
-                            <?php echo $this->lang->line('save'); ?>
+                            <?php echo lang('save'); ?>
                         </button>
                         <button id="cancel-service" class="btn btn-default">
                             <span class="glyphicon glyphicon-ban-circle"></span>
-                            <?php echo $this->lang->line('cancel'); ?>
+                            <?php echo lang('cancel'); ?>
                         </button>
                     </div>
                 </div>
 
-                <h3><?php echo $this->lang->line('details'); ?></h3>
+                <h3><?php echo lang('details'); ?></h3>
                 <div class="form-message alert" style="display:none;"></div>
 
                 <input type="hidden" id="service-id" />
 
                 <div class="form-group">
-                    <label for="service-name"><?php echo $this->lang->line('name'); ?> *</label>
+                    <label for="service-name"><?php echo lang('name'); ?> *</label>
                     <input type="text" id="service-name" class="form-control required" />
                 </div>
 
                 <div class="form-group">
-                    <label for="service-duration"><?php echo $this->lang->line('duration_minutes'); ?> *</label>
+                    <label for="service-duration"><?php echo lang('duration_minutes'); ?> *</label>
                     <input type="text" id="service-duration" class="form-control required"  />
                 </div>
 
                 <div class="form-group">
-                    <label for="service-price"><?php echo $this->lang->line('price'); ?> *</label>
+                    <label for="service-price"><?php echo lang('price'); ?> *</label>
                     <input type="text" id="service-price" class="form-control required" />
                 </div>
 
                 <div class="form-group">
-                    <label for="service-currency"><?php echo $this->lang->line('currency'); ?></label>
+                    <label for="service-currency"><?php echo lang('currency'); ?></label>
                     <input type="text" id="service-currency" class="form-control" />
                 </div>
 
                 <div class="form-group">
-                    <label for="service-category"><?php echo $this->lang->line('category'); ?></label>
+                    <label for="service-category"><?php echo lang('category'); ?></label>
                     <select id="service-category" class="form-control"></select>
                 </div>
 
                 <div class="form-group">
-                    <label for="service-availabilities-type"><?php echo $this->lang->line('availabilities_type'); ?></label>
+                    <label for="service-availabilities-type"><?php echo lang('availabilities_type'); ?></label>
                     <select id="service-availabilities-type" class="form-control">
                         <option value="<?php echo AVAILABILITIES_TYPE_FLEXIBLE; ?>">
-                            <?php echo $this->lang->line('flexible'); ?>
+                            <?php echo lang('flexible'); ?>
                         </option>
                         <option value="<?php echo AVAILABILITIES_TYPE_FIXED; ?>">
-                            <?php echo $this->lang->line('fixed'); ?>
+                            <?php echo lang('fixed'); ?>
                         </option>
                     </select>
                 </div>
 
                 <div class="form-group">
-                    <label for="service-attendants-number"><?php echo $this->lang->line('attendants_number'); ?> *</label>
+                    <label for="service-attendants-number"><?php echo lang('attendants_number'); ?> *</label>
                     <input type="text" id="service-attendants-number" class="form-control required"  />
                 </div>
 
                 <div class="form-group">
-                    <label for="service-description"><?php echo $this->lang->line('description'); ?></label>
+                    <label for="service-description"><?php echo lang('description'); ?></label>
                     <textarea id="service-description" rows="4" class="form-control"></textarea>
                 </div>
 
                 <p id="form-message" class="text-danger">
-                    <em><?php echo $this->lang->line('fields_are_required'); ?></em>
+                    <em><?php echo lang('fields_are_required'); ?></em>
                 </p>
             </div>
         </div>
@@ -145,16 +145,16 @@
                 <form class="input-append">
                     <input class="key" type="text" />
                     <div class="btn-group">
-                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
+                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo lang('filter'); ?>">
                             <span class="glyphicon glyphicon-search"></span>
                         </button>
-                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
+                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo lang('clear'); ?>">
                             <span class="glyphicon glyphicon-repeat"></span>
                         </button>
                     </div>
                 </form>
 
-                <h3><?php echo $this->lang->line('categories'); ?></h3>
+                <h3><?php echo lang('categories'); ?></h3>
                 <div class="results"></div>
             </div>
 
@@ -163,42 +163,42 @@
                     <div class="add-edit-delete-group btn-group">
                         <button id="add-category" class="btn btn-primary">
                             <span class="glyphicon glyphicon-plus glyphicon glyphicon-white"></span>
-                            <?php echo $this->lang->line('add'); ?>
+                            <?php echo lang('add'); ?>
                         </button>
                         <button id="edit-category" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-pencil"></span>
-                            <?php echo $this->lang->line('edit'); ?>
+                            <?php echo lang('edit'); ?>
                         </button>
                         <button id="delete-category" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-remove"></span>
-                            <?php echo $this->lang->line('delete'); ?>
+                            <?php echo lang('delete'); ?>
                         </button>
                     </div>
 
                     <div class="save-cancel-group btn-group" style="display:none;">
                         <button id="save-category" class="btn btn-primary">
                             <span class="glyphicon glyphicon-ok glyphicon glyphicon-white"></span>
-                            <?php echo $this->lang->line('save'); ?>
+                            <?php echo lang('save'); ?>
                         </button>
                         <button id="cancel-category" class="btn btn-default">
                             <span class="glyphicon glyphicon-ban-circle"></span>
-                            <?php echo $this->lang->line('cancel'); ?>
+                            <?php echo lang('cancel'); ?>
                         </button>
                     </div>
                 </div>
 
-                <h3><?php echo $this->lang->line('details'); ?></h3>
+                <h3><?php echo lang('details'); ?></h3>
                 <div class="form-message alert" style="display:none;"></div>
 
                 <input type="hidden" id="category-id" />
 
                 <div class="form-group">
-                    <label for="category-name"><?php echo $this->lang->line('name'); ?> *</label>
+                    <label for="category-name"><?php echo lang('name'); ?> *</label>
                     <input type="text" id="category-name" class="form-control required" />
                 </div>
 
                 <div class="form-group">
-                    <label for="category-description"><?php echo $this->lang->line('description'); ?></label>
+                    <label for="category-description"><?php echo lang('description'); ?></label>
                     <textarea id="category-description" rows="4" class="form-control"></textarea>
                 </div>
             </div>
diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index 6398f9a7..99a1bc3c 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -30,18 +30,18 @@
 <div id="settings-page" class="container-fluid">
     <ul class="nav nav-tabs">
         <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
-            <li role="representation" class="general-tab tab"><a><?php echo $this->lang->line('general'); ?></a></li>
+            <li role="representation" class="general-tab tab"><a><?php echo lang('general'); ?></a></li>
         <?php endif ?>
 
         <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
-            <li role="representation" class="business-logic-tab tab"><a><?php echo $this->lang->line('business_logic'); ?></a></li>
+            <li role="representation" class="business-logic-tab tab"><a><?php echo lang('business_logic'); ?></a></li>
         <?php endif ?>
 
         <?php if ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE): ?>
-            <li role="representation" class="user-tab tab"><a><?php echo $this->lang->line('current_user'); ?></a></li>
+            <li role="representation" class="user-tab tab"><a><?php echo lang('current_user'); ?></a></li>
         <?php endif ?>
 
-        <li role="representation" class="about-tab tab"><a><?php echo $this->lang->line('about_ea'); ?></a></li>
+        <li role="representation" class="about-tab tab"><a><?php echo lang('about_ea'); ?></a></li>
     </ul>
 
     <!-- GENERAL TAB -->
@@ -51,12 +51,12 @@
         <form>
             <fieldset>
                 <legend>
-                    <?php echo $this->lang->line('general_settings'); ?>
+                    <?php echo lang('general_settings'); ?>
                     <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?>
                     <button type="button" class="save-settings btn btn-primary btn-xs"
-                            title="<?php echo $this->lang->line('save'); ?>">
+                            title="<?php echo lang('save'); ?>">
                         <span class="glyphicon glyphicon-floppy-disk"></span>
-                        <?php echo $this->lang->line('save'); ?>
+                        <?php echo lang('save'); ?>
                     </button>
                     <?php endif ?>
                 </legend>
@@ -64,26 +64,26 @@
                 <div class="wrapper row">
                     <div class="col-md-6">
                         <div class="form-group">
-                            <label for="company-name"><?php echo $this->lang->line('company_name'); ?> *</label>
+                            <label for="company-name"><?php echo lang('company_name'); ?> *</label>
                             <input type="text" id="company-name" data-field="company_name" class="required form-control">
                             <span class="help-block">
-                                <?php echo $this->lang->line('company_name_hint'); ?>
+                                <?php echo lang('company_name_hint'); ?>
                             </span>
                         </div>
 
                         <div class="form-group">
-                            <label for="company-email"><?php echo $this->lang->line('company_email'); ?> *</label>
+                            <label for="company-email"><?php echo lang('company_email'); ?> *</label>
                             <input type="text" id="company-email" data-field="company_email" class="required form-control">
                             <span class="help-block">
-                                <?php echo $this->lang->line('company_email_hint'); ?>
+                                <?php echo lang('company_email_hint'); ?>
                             </span>
                         </div>
 
                         <div class="form-group">
-                            <label for="company-link"><?php echo $this->lang->line('company_link'); ?> *</label>
+                            <label for="company-link"><?php echo lang('company_link'); ?> *</label>
                             <input type="text" id="company-link" data-field="company_link" class="required form-control">
                             <span class="help-block">
-                                <?php echo $this->lang->line('company_link_hint'); ?>
+                                <?php echo lang('company_link_hint'); ?>
                             </span>
                         </div>
                     </div>
@@ -94,12 +94,12 @@
                             <input type="text" id="google-analytics-code" placeholder="UA-XXXXXXXX-X"
                                 data-field="google_analytics_code" class="form-control">
                             <span class="help-block">
-                                <?php echo $this->lang->line('google_analytics_code_hint'); ?>
+                                <?php echo lang('google_analytics_code_hint'); ?>
                             </span>
                         </div>
                         <div class="form-group">
                             <label for="date-format">
-                                <?php echo $this->lang->line('date_format'); ?>
+                                <?php echo lang('date_format'); ?>
                             </label>
                             <select class="form-control" id="date-format" data-field="date_format">
                                 <option value="DMY">DMY</option>
@@ -107,18 +107,18 @@
                                 <option value="YMD">YMD</option>
                             </select>
                             <span class="help-block">
-                                <?php echo $this->lang->line('date_format_hint'); ?>
+                                <?php echo lang('date_format_hint'); ?>
                             </span>
                         </div>
                         <div class="form-group">
-                            <label><?php echo $this->lang->line('customer_notifications'); ?></label>
+                            <label><?php echo lang('customer_notifications'); ?></label>
                             <br>
                             <button type="button" id="customer-notifications" class="btn btn-default" data-toggle="button" aria-pressed="false">
                                 <span class="glyphicon glyphicon-envelope"></span>
-                                <?php echo $this->lang->line('receive_notifications'); ?>
+                                <?php echo lang('receive_notifications'); ?>
                             </button>
                             <span class="help-block">
-                                <?php echo $this->lang->line('customer_notifications_hint'); ?>
+                                <?php echo lang('customer_notifications_hint'); ?>
                             </span>
                         </div>
                         <div class="form-group">
@@ -128,10 +128,10 @@
                             <br>
                             <button type="button" id="require-captcha" class="btn btn-default" data-toggle="button" aria-pressed="false">
                                 <span class="glyphicon glyphicon-lock"></span>
-                                <?php echo $this->lang->line('require_captcha'); ?>
+                                <?php echo lang('require_captcha'); ?>
                             </button>
                             <span class="help-block">
-                                <?php echo $this->lang->line('require_captcha_hint'); ?>
+                                <?php echo lang('require_captcha_hint'); ?>
                             </span>
                         </div>
                     </div>
@@ -147,29 +147,29 @@
         <form>
             <fieldset>
                 <legend>
-                    <?php echo $this->lang->line('business_logic'); ?>
+                    <?php echo lang('business_logic'); ?>
                     <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?>
                     <button type="button" class="save-settings btn btn-primary btn-xs"
-                            title="<?php echo $this->lang->line('save'); ?>">
+                            title="<?php echo lang('save'); ?>">
                         <span class="glyphicon glyphicon-floppy-disk"></span>
-                        <?php echo $this->lang->line('save'); ?>
+                        <?php echo lang('save'); ?>
                     </button>
                     <?php endif ?>
                 </legend>
 
                 <div class="row">
                     <div class="col-md-7 working-plan-wrapper">
-                        <h4><?php echo $this->lang->line('working_plan'); ?></h4>
+                        <h4><?php echo lang('working_plan'); ?></h4>
                         <span class="help-block">
-                            <?php echo $this->lang->line('edit_working_plan_hint'); ?>
+                            <?php echo lang('edit_working_plan_hint'); ?>
                         </span>
 
                         <table class="working-plan table table-striped">
                             <thead>
                                 <tr>
-                                    <th><?php echo $this->lang->line('day'); ?></th>
-                                    <th><?php echo $this->lang->line('start'); ?></th>
-                                    <th><?php echo $this->lang->line('end'); ?></th>
+                                    <th><?php echo lang('day'); ?></th>
+                                    <th><?php echo lang('start'); ?></th>
+                                    <th><?php echo lang('end'); ?></th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -178,7 +178,7 @@
                                         <div class="checkbox">
                                             <label>
                                                 <input type="checkbox" id="monday" />
-                                                    <?php echo $this->lang->line('monday'); ?>
+                                                    <?php echo lang('monday'); ?>
                                             </label>
                                         </div>
                                     </td>
@@ -190,7 +190,7 @@
                                         <div class="checkbox">
                                             <label>
                                                 <input type="checkbox" id="tuesday" />
-                                                    <?php echo $this->lang->line('tuesday'); ?>
+                                                    <?php echo lang('tuesday'); ?>
                                             </label>
                                         </div>
                                     </td>
@@ -202,7 +202,7 @@
                                         <div class="checkbox">
                                             <label>
                                                 <input type="checkbox" id="wednesday" />
-                                                    <?php echo $this->lang->line('wednesday'); ?>
+                                                    <?php echo lang('wednesday'); ?>
                                             </label>
                                         </div>
                                     </td>
@@ -214,7 +214,7 @@
                                         <div class="checkbox">
                                             <label>
                                                 <input type="checkbox" id="thursday" />
-                                                    <?php echo $this->lang->line('thursday'); ?>
+                                                    <?php echo lang('thursday'); ?>
                                             </label>
                                         </div>
                                     </td>
@@ -226,7 +226,7 @@
                                         <div class="checkbox">
                                             <label>
                                                 <input type="checkbox" id="friday" />
-                                                    <?php echo $this->lang->line('friday'); ?>
+                                                    <?php echo lang('friday'); ?>
                                             </label>
                                         </div>
                                     </td>
@@ -238,7 +238,7 @@
                                         <div class="checkbox">
                                             <label>
                                                 <input type="checkbox" id="saturday" />
-                                                    <?php echo $this->lang->line('saturday'); ?>
+                                                    <?php echo lang('saturday'); ?>
                                             </label>
                                         </div>
                                     </td>
@@ -250,7 +250,7 @@
                                         <div class="checkbox">
                                             <label>
                                                 <input type="checkbox" id="sunday" />
-                                                    <?php echo $this->lang->line('sunday'); ?>
+                                                    <?php echo lang('sunday'); ?>
                                             </label>
                                         </div>
                                     </td>
@@ -262,26 +262,26 @@
 
                         <br>
 
-                        <h4><?php echo $this->lang->line('book_advance_timeout'); ?></h4>
+                        <h4><?php echo lang('book_advance_timeout'); ?></h4>
                         <span class="help-block">
-                            <?php echo $this->lang->line('book_advance_timeout_hint'); ?>
+                            <?php echo lang('book_advance_timeout_hint'); ?>
                         </span>
                         <div class="form-group">
-                            <label for="book-advance-timeout"><?php echo $this->lang->line('timeout_minutes'); ?></label>
+                            <label for="book-advance-timeout"><?php echo lang('timeout_minutes'); ?></label>
                             <input type="text" id="book-advance-timeout" data-field="book_advance_timeout" class="form-control" />
                         </div>
                     </div>
                     <div class="col-md-5 breaks-wrapper">
-                        <h4><?php echo $this->lang->line('breaks'); ?></h4>
+                        <h4><?php echo lang('breaks'); ?></h4>
 
                         <span class="help-block">
-                            <?php echo $this->lang->line('edit_breaks_hint'); ?>
+                            <?php echo lang('edit_breaks_hint'); ?>
                         </span>
 
                         <div>
                             <button type="button" class="add-break btn btn-primary">
                                 <span class="glyphicon glyphicon-white glyphicon glyphicon-plus"></span>
-                                <?php echo $this->lang->line('add_break');?>
+                                <?php echo lang('add_break');?>
                             </button>
                         </div>
 
@@ -290,10 +290,10 @@
                         <table class="breaks table table-striped">
                             <thead>
                                 <tr>
-                                    <th><?php echo $this->lang->line('day'); ?></th>
-                                    <th><?php echo $this->lang->line('start'); ?></th>
-                                    <th><?php echo $this->lang->line('end'); ?></th>
-                                    <th><?php echo $this->lang->line('actions'); ?></th>
+                                    <th><?php echo lang('day'); ?></th>
+                                    <th><?php echo lang('start'); ?></th>
+                                    <th><?php echo lang('end'); ?></th>
+                                    <th><?php echo lang('actions'); ?></th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -312,12 +312,12 @@
         <form class="row">
             <fieldset class="col-xs-12 col-sm-6 personal-info-wrapper">
                 <legend>
-                    <?php echo $this->lang->line('personal_information'); ?>
+                    <?php echo lang('personal_information'); ?>
                     <?php if ($privileges[PRIV_USER_SETTINGS]['edit'] == TRUE): ?>
                     <button type="button" class="save-settings btn btn-primary btn-xs"
-                            title="<?php echo $this->lang->line('save'); ?>">
+                            title="<?php echo lang('save'); ?>">
                         <span class="glyphicon glyphicon-floppy-disk"></span>
-                        <?php echo $this->lang->line('save'); ?>
+                        <?php echo lang('save'); ?>
                     </button>
                     <?php endif; ?>
                 </legend>
@@ -325,76 +325,76 @@
                 <input type="hidden" id="user-id" />
 
                 <div class="form-group">
-                    <label for="first-name"><?php echo $this->lang->line('first_name'); ?> *</label>
+                    <label for="first-name"><?php echo lang('first_name'); ?> *</label>
                     <input type="text" id="first-name" class="form-control required" />
                 </div>
 
                 <div class="form-group">
-                    <label for="last-name"><?php echo $this->lang->line('last_name'); ?> *</label>
+                    <label for="last-name"><?php echo lang('last_name'); ?> *</label>
                     <input type="text" id="last-name" class="form-control required" />
                 </div>
 
                 <div class="form-group">
-                    <label for="email"><?php echo $this->lang->line('email'); ?> *</label>
+                    <label for="email"><?php echo lang('email'); ?> *</label>
                     <input type="text" id="email" class="form-control required" />
                 </div>
 
                 <div class="form-group">
-                    <label for="phone-number"><?php echo $this->lang->line('phone_number'); ?> *</label>
+                    <label for="phone-number"><?php echo lang('phone_number'); ?> *</label>
                     <input type="text" id="phone-number" class="form-control required" />
                 </div>
 
                 <div class="form-group">
-                    <label for="mobile-number"><?php echo $this->lang->line('mobile_number'); ?></label>
+                    <label for="mobile-number"><?php echo lang('mobile_number'); ?></label>
                     <input type="text" id="mobile-number" class="form-control" />
                 </div>
 
                 <div class="form-group">
-                    <label for="address"><?php echo $this->lang->line('address'); ?></label>
+                    <label for="address"><?php echo lang('address'); ?></label>
                     <input type="text" id="address" class="form-control" />
                 </div>
 
                 <div class="form-group">
-                    <label for="city"><?php echo $this->lang->line('city'); ?></label>
+                    <label for="city"><?php echo lang('city'); ?></label>
                     <input type="text" id="city" class="form-control" />
                 </div>
 
                 <div class="form-group">
-                    <label for="state"><?php echo $this->lang->line('state'); ?></label>
+                    <label for="state"><?php echo lang('state'); ?></label>
                     <input type="text" id="state" class="form-control" />
                 </div>
 
                 <div class="form-group">
-                    <label for="zip-code"><?php echo $this->lang->line('zip_code'); ?></label>
+                    <label for="zip-code"><?php echo lang('zip_code'); ?></label>
                     <input type="text" id="zip-code" class="form-control" />
                 </div>
 
                 <div class="form-group">
-                    <label for="notes"><?php echo $this->lang->line('notes'); ?></label>
+                    <label for="notes"><?php echo lang('notes'); ?></label>
                     <textarea id="notes" class="form-control" rows="3"></textarea>
                 </div>
             </fieldset>
 
             <fieldset class="col-xs-12 col-sm-6 miscellaneous-wrapper">
-                <legend><?php echo $this->lang->line('system_login'); ?></legend>
+                <legend><?php echo lang('system_login'); ?></legend>
 
                 <div class="form-group">
-                    <label for="username"><?php echo $this->lang->line('username'); ?> *</label>
+                    <label for="username"><?php echo lang('username'); ?> *</label>
                     <input type="text" id="username" class="form-control required" />
                 </div>
 
                 <div class="form-group">
-                    <label for="password"><?php echo $this->lang->line('password'); ?></label>
+                    <label for="password"><?php echo lang('password'); ?></label>
                     <input type="password" id="password" class="form-control" />
                 </div>
 
                 <div class="form-group">
-                    <label for="retype-password"><?php echo $this->lang->line('retype_password'); ?></label>
+                    <label for="retype-password"><?php echo lang('retype_password'); ?></label>
                     <input type="password" id="retype-password" class="form-control" />
                 </div>
 
                 <div class="form-group">
-                    <label for="calendar-view"><?php echo $this->lang->line('calendar'); ?> *</label>
+                    <label for="calendar-view"><?php echo lang('calendar'); ?> *</label>
                     <select id="calendar-view" class="form-control required">
                         <option value="default">Default</option>
                         <option value="table">Table</option>
@@ -403,7 +403,7 @@
 
                 <button type="button" id="user-notifications" class="btn btn-default" data-toggle="button">
                     <span class="glyphicon glyphicon-envelope"></span>
-                    <?php echo $this->lang->line('receive_notifications'); ?>
+                    <?php echo lang('receive_notifications'); ?>
                 </button>
             </fieldset>
         </form>
@@ -414,14 +414,14 @@
     <div id="about" class="tab-content">
         <h3>Easy!Appointments</h3>
         <p>
-            <?php echo $this->lang->line('about_ea_info'); ?>
+            <?php echo lang('about_ea_info'); ?>
         </p>
 
         <br>
 
         <div class="current-version">
             <?php
-                echo $this->lang->line('current_version') . ' ';
+                echo lang('current_version') . ' ';
                 echo $this->config->item('version');
                 $release_title = $this->config->item('release_label');
                 if ($release_title != '') {
@@ -432,20 +432,20 @@
 
 		<br>
 
-        <h3><?php echo $this->lang->line('support'); ?></h3>
+        <h3><?php echo lang('support'); ?></h3>
         <p>
-            <?php echo $this->lang->line('about_ea_support'); ?>
+            <?php echo lang('about_ea_support'); ?>
             <br><br>
             <a href="http://easyappointments.org">
-                <?php echo $this->lang->line('official_website'); ?>
+                <?php echo lang('official_website'); ?>
             </a>
             |
             <a href="https://groups.google.com/forum/#!forum/easy-appointments">
-                <?php echo $this->lang->line('support_group'); ?>
+                <?php echo lang('support_group'); ?>
             </a>
             |
             <a href="https://github.com/alextselegidis/easyappointments/issues">
-                <?php echo $this->lang->line('project_issues'); ?>
+                <?php echo lang('project_issues'); ?>
             </a>
             |
             <a href="http://easyappointments.wordpress.com">
@@ -465,15 +465,15 @@
             </a>
             |
             <a href="https://plus.google.com/communities/105333709485142846840">
-                <?php echo $this->lang->line('google_plus_community'); ?>
+                <?php echo lang('google_plus_community'); ?>
             </a>
         </p>
 
 		<br>
 
-		<h3><?php echo $this->lang->line('license'); ?></h3>
+		<h3><?php echo lang('license'); ?></h3>
 		<p>
-            <?php echo $this->lang->line('about_ea_license'); ?>
+            <?php echo lang('about_ea_license'); ?>
             <a href="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</a>
         </p>
     </div>
diff --git a/src/application/views/backend/users.php b/src/application/views/backend/users.php
index 8680a2be..133d46fb 100644
--- a/src/application/views/backend/users.php
+++ b/src/application/views/backend/users.php
@@ -33,9 +33,9 @@
     <!-- PAGE NAVIGATION -->
 
     <ul class="nav nav-tabs">
-        <li role="presentation" class="admins-tab tab active"><a><?php echo $this->lang->line('admins'); ?></a></li>
-        <li role="presentation" class="providers-tab tab"><a><?php echo $this->lang->line('providers'); ?></a></li>
-        <li role="presentation" class="secretaries-tab tab"><a><?php echo $this->lang->line('secretaries'); ?></a></li>
+        <li role="presentation" class="admins-tab tab active"><a><?php echo lang('admins'); ?></a></li>
+        <li role="presentation" class="providers-tab tab"><a><?php echo lang('providers'); ?></a></li>
+        <li role="presentation" class="secretaries-tab tab"><a><?php echo lang('secretaries'); ?></a></li>
     </ul>
 
     <!-- ADMINS TAB -->
@@ -46,16 +46,16 @@
                 <form class="input-append">
                     <input class="key" type="text" />
                     <div class="btn-group">
-                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
+                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo lang('filter'); ?>">
                             <span class="glyphicon glyphicon-search"></span>
                         </button>
-                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
+                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo lang('clear'); ?>">
                             <span class="glyphicon glyphicon-repeat"></span>
                         </button>
                     </div>
                 </form>
 
-                <h3><?php echo $this->lang->line('admins'); ?></h3>
+                <h3><?php echo lang('admins'); ?></h3>
                 <div class="results"></div>
             </div>
 
@@ -64,31 +64,31 @@
                     <div class="add-edit-delete-group btn-group">
                         <button id="add-admin" class="btn btn-primary">
                             <span class="glyphicon glyphicon-plus"></span>
-                            <?php echo $this->lang->line('add'); ?>
+                            <?php echo lang('add'); ?>
                         </button>
                         <button id="edit-admin" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-pencil"></span>
-                            <?php echo $this->lang->line('edit'); ?>
+                            <?php echo lang('edit'); ?>
                         </button>
                         <button id="delete-admin" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-remove"></span>
-                            <?php echo $this->lang->line('delete'); ?>
+                            <?php echo lang('delete'); ?>
                         </button>
                     </div>
 
                     <div class="save-cancel-group btn-group" style="display:none;">
                         <button id="save-admin" class="btn btn-primary">
                             <span class="glyphicon glyphicon-ok"></span>
-                            <?php echo $this->lang->line('save'); ?>
+                            <?php echo lang('save'); ?>
                         </button>
                         <button id="cancel-admin" class="btn btn-default">
                             <span class="glyphicon glyphicon-ban-circle"></span>
-                            <?php echo $this->lang->line('cancel'); ?>
+                            <?php echo lang('cancel'); ?>
                         </button>
                     </div>
                 </div>
 
-                <h3><?php echo $this->lang->line('details'); ?></h3>
+                <h3><?php echo lang('details'); ?></h3>
 
                 <div class="form-message alert" style="display:none;"></div>
 
@@ -97,73 +97,73 @@
                 <div class="row">
                     <div class="admin-details col-md-6">
                         <div class="form-group">
-                            <label for="first-name"><?php echo $this->lang->line('first_name'); ?> *</label>
+                            <label for="first-name"><?php echo lang('first_name'); ?> *</label>
                             <input type="text" id="admin-first-name" class="form-control required" maxlength="256" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-last-name"><?php echo $this->lang->line('last_name'); ?> *</label>
+                            <label for="admin-last-name"><?php echo lang('last_name'); ?> *</label>
                             <input type="text" id="admin-last-name" class="form-control required" maxlength="512" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-email"><?php echo $this->lang->line('email'); ?> *</label>
+                            <label for="admin-email"><?php echo lang('email'); ?> *</label>
                             <input type="text" id="admin-email" class="form-control required" maxlength="512" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-phone-number"><?php echo $this->lang->line('phone_number'); ?> *</label>
+                            <label for="admin-phone-number"><?php echo lang('phone_number'); ?> *</label>
                             <input type="text" id="admin-phone-number" class="form-control required" maxlength="128" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-mobile-number"><?php echo $this->lang->line('mobile_number'); ?></label>
+                            <label for="admin-mobile-number"><?php echo lang('mobile_number'); ?></label>
                             <input type="text" id="admin-mobile-number" class="form-control" maxlength="128" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-address"><?php echo $this->lang->line('address'); ?></label>
+                            <label for="admin-address"><?php echo lang('address'); ?></label>
                             <input type="text" id="admin-address" class="form-control" maxlength="256" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-city"><?php echo $this->lang->line('city'); ?></label>
+                            <label for="admin-city"><?php echo lang('city'); ?></label>
                             <input type="text" id="admin-city" class="form-control" maxlength="256" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-state"><?php echo $this->lang->line('state'); ?></label>
+                            <label for="admin-state"><?php echo lang('state'); ?></label>
                             <input type="text" id="admin-state" class="form-control" maxlength="128" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-zip-code"><?php echo $this->lang->line('zip_code'); ?></label>
+                            <label for="admin-zip-code"><?php echo lang('zip_code'); ?></label>
                             <input type="text" id="admin-zip-code" class="form-control" maxlength="64" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-notes"><?php echo $this->lang->line('notes'); ?></label>
+                            <label for="admin-notes"><?php echo lang('notes'); ?></label>
                             <textarea id="admin-notes" class="form-control" rows="3"></textarea>
                         </div>
                     </div>
                     <div class="admin-settings col-md-6">
                         <div class="form-group">
-                            <label for="admin-username"><?php echo $this->lang->line('username'); ?> *</label>
+                            <label for="admin-username"><?php echo lang('username'); ?> *</label>
                             <input type="text" id="admin-username" class="form-control required" maxlength="256" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-password"><?php echo $this->lang->line('password'); ?> *</label>
+                            <label for="admin-password"><?php echo lang('password'); ?> *</label>
                             <input type="password" id="admin-password" class="form-control required" maxlength="512" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-password-confirm"><?php echo $this->lang->line('retype_password'); ?> *</label>
+                            <label for="admin-password-confirm"><?php echo lang('retype_password'); ?> *</label>
                             <input type="password" id="admin-password-confirm" class="form-control required" maxlength="512" />
                         </div>
 
                         <div class="form-group">
-                            <label for="admin-calendar-view"><?php echo $this->lang->line('calendar'); ?> *</label>
+                            <label for="admin-calendar-view"><?php echo lang('calendar'); ?> *</label>
                             <select id="admin-calendar-view" class="form-control required">
                                 <option value="default">Default</option>
                                 <option value="table">Table</option>
@@ -174,7 +174,7 @@
 
                         <button type="button" id="admin-notifications" class="btn btn-default" data-toggle="button">
                             <span class="glyphicon glyphicon-envelope"></span>
-                            <span><?php echo $this->lang->line('receive_notifications'); ?></span>
+                            <span><?php echo lang('receive_notifications'); ?></span>
                         </button>
                     </div>
                 </div>
@@ -190,16 +190,16 @@
                 <form class="input-append">
                     <input class="key" type="text" />
                     <div class="btn-group">
-                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
+                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo lang('filter'); ?>">
                             <span class="glyphicon glyphicon-search"></span>
                         </button>
-                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
+                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo lang('clear'); ?>">
                             <span class="glyphicon glyphicon-repeat"></span>
                         </button>
                     </div>
                 </form>
 
-                <h3><?php echo $this->lang->line('providers'); ?></h3>
+                <h3><?php echo lang('providers'); ?></h3>
                 <div class="results"></div>
             </div>
 
@@ -208,34 +208,34 @@
                     <div class="add-edit-delete-group btn-group">
                         <button id="add-provider" class="btn btn-primary">
                             <span class="glyphicon glyphicon-plus"></span>
-                            <?php echo $this->lang->line('add'); ?>
+                            <?php echo lang('add'); ?>
                         </button>
                         <button id="edit-provider" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-pencil"></span>
-                            <?php echo $this->lang->line('edit'); ?>
+                            <?php echo lang('edit'); ?>
                         </button>
                         <button id="delete-provider" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-remove"></span>
-                            <?php echo $this->lang->line('delete'); ?>
+                            <?php echo lang('delete'); ?>
                         </button>
                     </div>
 
                     <div class="save-cancel-group btn-group" style="display:none;">
                         <button id="save-provider" class="btn btn-primary">
                             <span class="glyphicon glyphicon-ok"></span>
-                            <?php echo $this->lang->line('save'); ?>
+                            <?php echo lang('save'); ?>
                         </button>
                         <button id="cancel-provider" class="btn btn-default">
                             <span class="glyphicon glyphicon-ban-circle"></span>
-                            <?php echo $this->lang->line('cancel'); ?>
+                            <?php echo lang('cancel'); ?>
                         </button>
                     </div>
                 </div>
 
                 <div class="switch-view pull-right">
-                    <strong><?php echo $this->lang->line('current_view'); ?></strong>
-                    <div class="display-details current"><?php echo $this->lang->line('details'); ?></div>
-                    <div class="display-working-plan"><?php echo $this->lang->line('working_plan'); ?></div>
+                    <strong><?php echo lang('current_view'); ?></strong>
+                    <div class="display-details current"><?php echo lang('details'); ?></div>
+                    <div class="display-working-plan"><?php echo lang('working_plan'); ?></div>
                 </div>
 
                 <?php // This form message is outside the details view, so that it can be
@@ -243,80 +243,80 @@
                 <div class="form-message alert" style="display:none;"></div>
 
                 <div class="details-view provider-view">
-                    <h3><?php echo $this->lang->line('details'); ?></h3>
+                    <h3><?php echo lang('details'); ?></h3>
 
                     <input type="hidden" id="provider-id" class="record-id" />
 
                     <div class="row">
                         <div class="provider-details col-md-6">
                             <div class="form-group">
-                                <label for="provider-first-name"><?php echo $this->lang->line('first_name'); ?> *</label>
+                                <label for="provider-first-name"><?php echo lang('first_name'); ?> *</label>
                                 <input type="text" id="provider-first-name" class="form-control required" maxlength="256" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-last-name"><?php echo $this->lang->line('last_name'); ?> *</label>
+                                <label for="provider-last-name"><?php echo lang('last_name'); ?> *</label>
                                 <input type="text" id="provider-last-name" class="form-control required" maxlength="512" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-email"><?php echo $this->lang->line('email'); ?> *</label>
+                                <label for="provider-email"><?php echo lang('email'); ?> *</label>
                                 <input type="text" id="provider-email" class="form-control required" max="512" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-phone-number"><?php echo $this->lang->line('phone_number'); ?> *</label>
+                                <label for="provider-phone-number"><?php echo lang('phone_number'); ?> *</label>
                                 <input type="text" id="provider-phone-number" class="form-control required" max="128" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-mobile-number"><?php echo $this->lang->line('mobile_number'); ?></label>
+                                <label for="provider-mobile-number"><?php echo lang('mobile_number'); ?></label>
                                 <input type="text" id="provider-mobile-number" class="form-control" maxlength="128" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-address"><?php echo $this->lang->line('address'); ?></label>
+                                <label for="provider-address"><?php echo lang('address'); ?></label>
                                 <input type="text" id="provider-address" class="form-control" maxlength="256" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-city"><?php echo $this->lang->line('city'); ?></label>
+                                <label for="provider-city"><?php echo lang('city'); ?></label>
                                 <input type="text" id="provider-city" class="form-control" maxlength="256" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-state"><?php echo $this->lang->line('state'); ?></label>
+                                <label for="provider-state"><?php echo lang('state'); ?></label>
                                 <input type="text" id="provider-state" class="form-control" maxlength="256" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-zip-code"><?php echo $this->lang->line('zip_code'); ?></label>
+                                <label for="provider-zip-code"><?php echo lang('zip_code'); ?></label>
                                 <input type="text" id="provider-zip-code" class="form-control" maxlength="64" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-notes"><?php echo $this->lang->line('notes'); ?></label>
+                                <label for="provider-notes"><?php echo lang('notes'); ?></label>
                                 <textarea id="provider-notes" class="form-control" rows="3"></textarea>
                             </div>
                         </div>
                         <div class="provider-settings col-md-6">
                             <div class="form-group">
-                                <label for="provider-username"><?php echo $this->lang->line('username'); ?> *</label>
+                                <label for="provider-username"><?php echo lang('username'); ?> *</label>
                                 <input type="text" id="provider-username" class="form-control required" maxlength="256" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-password"><?php echo $this->lang->line('password'); ?> *</label>
+                                <label for="provider-password"><?php echo lang('password'); ?> *</label>
                                 <input type="password" id="provider-password" class="form-control required" maxlength="512"/>
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-password-confirm"><?php echo $this->lang->line('retype_password'); ?> *</label>
+                                <label for="provider-password-confirm"><?php echo lang('retype_password'); ?> *</label>
                                 <input type="password" id="provider-password-confirm" class="form-control required" maxlength="512" />
                             </div>
 
                             <div class="form-group">
-                                <label for="provider-calendar-view"><?php echo $this->lang->line('calendar'); ?> *</label>
+                                <label for="provider-calendar-view"><?php echo lang('calendar'); ?> *</label>
                                 <select id="provider-calendar-view" class="form-control required">
                                     <option value="default">Default</option>
                                     <option value="table">Table</option>
@@ -327,29 +327,29 @@
 
                             <button type="button" id="provider-notifications" class="btn btn-default" data-toggle="button">
                                 <span class="glyphicon glyphicon-envelope"></span>
-                                <span><?php echo $this->lang->line('receive_notifications'); ?></span>
+                                <span><?php echo lang('receive_notifications'); ?></span>
                             </button>
 
                             <br><br>
 
-                            <h4><?php echo $this->lang->line('services'); ?></h4>
+                            <h4><?php echo lang('services'); ?></h4>
                             <div id="provider-services"></div>
                         </div>
                     </div>
                 </div>
 
                 <div class="working-plan-view provider-view" style="display: none;">
-                    <h3><?php echo $this->lang->line('working_plan'); ?></h3>
+                    <h3><?php echo lang('working_plan'); ?></h3>
                     <button id="reset-working-plan" class="btn btn-primary"
                             title="Reset the working plan back to the default values.">
                         <span class="glyphicon glyphicon-repeat"></span>
-                        <?php echo $this->lang->line('reset_plan'); ?></button>
+                        <?php echo lang('reset_plan'); ?></button>
                     <table class="working-plan table table-striped">
                         <thead>
                             <tr>
-                                <th><?php echo $this->lang->line('day'); ?></th>
-                                <th><?php echo $this->lang->line('start'); ?></th>
-                                <th><?php echo $this->lang->line('end'); ?></th>
+                                <th><?php echo lang('day'); ?></th>
+                                <th><?php echo lang('start'); ?></th>
+                                <th><?php echo lang('end'); ?></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -357,7 +357,7 @@
                                 <td>
                                     <div class="checkbox">
                                         <label><input type="checkbox" id="monday" />
-                                            <?php echo $this->lang->line('monday'); ?></label>
+                                            <?php echo lang('monday'); ?></label>
                                     </div>
                                 </td>
                                 <td><input type="text" id="monday-start" class="work-start" /></td>
@@ -367,7 +367,7 @@
                                 <td>
                                     <div class="checkbox">
                                         <label><input type="checkbox" id="tuesday" />
-                                            <?php echo $this->lang->line('tuesday'); ?></label>
+                                            <?php echo lang('tuesday'); ?></label>
                                     </div>
                                 </td>
                                 <td><input type="text" id="tuesday-start" class="work-start" /></td>
@@ -377,7 +377,7 @@
                                 <td>
                                     <div class="checkbox">
                                         <label><input type="checkbox" id="wednesday" />
-                                            <?php echo $this->lang->line('wednesday'); ?></label>
+                                            <?php echo lang('wednesday'); ?></label>
                                     </div>
                                 </td>
                                 <td><input type="text" id="wednesday-start" class="work-start" /></td>
@@ -387,7 +387,7 @@
                                 <td>
                                     <div class="checkbox">
                                         <label><input type="checkbox" id="thursday" />
-                                            <?php echo $this->lang->line('thursday'); ?></label>
+                                            <?php echo lang('thursday'); ?></label>
                                     </div>
                                 </td>
                                 <td><input type="text" id="thursday-start" class="work-start" /></td>
@@ -397,7 +397,7 @@
                                 <td>
                                     <div class="checkbox">
                                         <label><input type="checkbox" id="friday" />
-                                            <?php echo $this->lang->line('friday'); ?></label>
+                                            <?php echo lang('friday'); ?></label>
                                     </div>
                                 </td>
                                 <td><input type="text" id="friday-start" class="work-start" /></td>
@@ -407,7 +407,7 @@
                                 <td>
                                     <div class="checkbox">
                                         <label><input type="checkbox" id="saturday" />
-                                            <?php echo $this->lang->line('saturday'); ?></label>
+                                            <?php echo lang('saturday'); ?></label>
                                     </div>
                                 </td>
                                 <td><input type="text" id="saturday-start" class="work-start" /></td>
@@ -417,7 +417,7 @@
                                 <td>
                                     <div class="checkbox">
                                         <label><input type="checkbox" id="sunday" />
-                                            <?php echo $this->lang->line('sunday'); ?></label>
+                                            <?php echo lang('sunday'); ?></label>
                                     </div>
                                 </td>
                                 <td><input type="text" id="sunday-start" class="work-start" /></td>
@@ -428,16 +428,16 @@
 
                     <br>
 
-                    <h3><?php echo $this->lang->line('breaks');?></h3>
+                    <h3><?php echo lang('breaks');?></h3>
 
                     <span class="help-block">
-                        <?php echo $this->lang->line('add_breaks_during_each_day');?>
+                        <?php echo lang('add_breaks_during_each_day');?>
                     </span>
 
                     <div>
                         <button type="button" class="add-break btn btn-primary">
                             <span class="glyphicon glyphicon-plus"></span>
-                            <?php echo $this->lang->line('add_break');?>
+                            <?php echo lang('add_break');?>
                         </button>
                     </div>
 
@@ -446,10 +446,10 @@
                     <table class="breaks table table-striped">
                         <thead>
                             <tr>
-                                <th><?php echo $this->lang->line('day');?></th>
-                                <th><?php echo $this->lang->line('start');?></th>
-                                <th><?php echo $this->lang->line('end');?></th>
-                                <th><?php echo $this->lang->line('actions');?></th>
+                                <th><?php echo lang('day');?></th>
+                                <th><?php echo lang('start');?></th>
+                                <th><?php echo lang('end');?></th>
+                                <th><?php echo lang('actions');?></th>
                             </tr>
                         </thead>
                         <tbody></tbody>
@@ -467,16 +467,16 @@
                 <form class="input-append">
                     <input class="key" type="text" />
                     <div class="btn-group">
-                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo $this->lang->line('filter');?>">
+                        <button class="filter btn btn-default btn-sm" type="submit" title="<?php echo lang('filter');?>">
                             <span class="glyphicon glyphicon-search"></span>
                         </button>
-                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo $this->lang->line('clear');?>">
+                        <button class="clear btn btn-default btn-sm" type="button" title="<?php echo lang('clear');?>">
                             <span class="glyphicon glyphicon-repeat"></span>
                         </button>
                     </div>
                 </form>
 
-                <h3><?php echo $this->lang->line('secretaries');?></h3>
+                <h3><?php echo lang('secretaries');?></h3>
                 <div class="results"></div>
             </div>
 
@@ -485,31 +485,31 @@
                     <div class="add-edit-delete-group btn-group">
                         <button id="add-secretary" class="btn btn-primary">
                             <span class="glyphicon glyphicon-plus"></span>
-                            <?php echo $this->lang->line('add');?>
+                            <?php echo lang('add');?>
                         </button>
                         <button id="edit-secretary" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-pencil"></span>
-                            <?php echo $this->lang->line('edit');?>
+                            <?php echo lang('edit');?>
                         </button>
                         <button id="delete-secretary" class="btn btn-default" disabled="disabled">
                             <span class="glyphicon glyphicon-remove"></span>
-                            <?php echo $this->lang->line('delete');?>
+                            <?php echo lang('delete');?>
                         </button>
                     </div>
 
                     <div class="save-cancel-group btn-group" style="display:none;">
                         <button id="save-secretary" class="btn btn-primary">
                             <span class="glyphicon glyphicon-ok"></span>
-                            <?php echo $this->lang->line('save');?>
+                            <?php echo lang('save');?>
                         </button>
                         <button id="cancel-secretary" class="btn btn-default">
                             <span class="glyphicon glyphicon-ban-circle"></span>
-                            <?php echo $this->lang->line('cancel');?>
+                            <?php echo lang('cancel');?>
                         </button>
                     </div>
                 </div>
 
-                <h3><?php echo $this->lang->line('details');?></h3>
+                <h3><?php echo lang('details');?></h3>
 
                 <div class="form-message alert" style="display:none;"></div>
 
@@ -518,73 +518,73 @@
                 <div class="row">
                     <div class="secretary-details col-md-6">
                         <div class="form-group">
-                            <label for="secretary-first-name"><?php echo $this->lang->line('first_name');?> *</label>
+                            <label for="secretary-first-name"><?php echo lang('first_name');?> *</label>
                             <input type="text" id="secretary-first-name" class="form-control required" maxlength="256" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-last-name"><?php echo $this->lang->line('last_name');?> *</label>
+                            <label for="secretary-last-name"><?php echo lang('last_name');?> *</label>
                             <input type="text" id="secretary-last-name" class="form-control required" maxlength="512" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-email"><?php echo $this->lang->line('email');?> *</label>
+                            <label for="secretary-email"><?php echo lang('email');?> *</label>
                             <input type="text" id="secretary-email" class="form-control required" maxlength="512" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-phone-number"><?php echo $this->lang->line('phone_number');?> *</label>
+                            <label for="secretary-phone-number"><?php echo lang('phone_number');?> *</label>
                             <input type="text" id="secretary-phone-number" class="form-control required" maxlength="128" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-mobile-number"><?php echo $this->lang->line('mobile_number');?></label>
+                            <label for="secretary-mobile-number"><?php echo lang('mobile_number');?></label>
                             <input type="text" id="secretary-mobile-number" class="form-control" maxlength="128" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-address"><?php echo $this->lang->line('address');?></label>
+                            <label for="secretary-address"><?php echo lang('address');?></label>
                             <input type="text" id="secretary-address" class="form-control" maxlength="256" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-city"><?php echo $this->lang->line('city');?></label>
+                            <label for="secretary-city"><?php echo lang('city');?></label>
                             <input type="text" id="secretary-city" class="form-control" maxlength="256" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-state"><?php echo $this->lang->line('state');?></label>
+                            <label for="secretary-state"><?php echo lang('state');?></label>
                             <input type="text" id="secretary-state" class="form-control" maxlength="128" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-zip-code"><?php echo $this->lang->line('zip_code');?></label>
+                            <label for="secretary-zip-code"><?php echo lang('zip_code');?></label>
                             <input type="text" id="secretary-zip-code" class="form-control" maxlength="64" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-notes"><?php echo $this->lang->line('notes');?></label>
+                            <label for="secretary-notes"><?php echo lang('notes');?></label>
                             <textarea id="secretary-notes" class="form-control" rows="3"></textarea>
                         </div>
                     </div>
                     <div class="secretary-settings col-md-6">
                         <div class="form-group">
-                            <label for="secretary-username"><?php echo $this->lang->line('username');?> *</label>
+                            <label for="secretary-username"><?php echo lang('username');?> *</label>
                             <input type="text" id="secretary-username" class="form-control required" maxlength="256" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-password"><?php echo $this->lang->line('password');?> *</label>
+                            <label for="secretary-password"><?php echo lang('password');?> *</label>
                             <input type="password" id="secretary-password" class="form-control required" maxlength="512" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-password-confirm"><?php echo $this->lang->line('retype_password');?> *</label>
+                            <label for="secretary-password-confirm"><?php echo lang('retype_password');?> *</label>
                             <input type="password" id="secretary-password-confirm" class="form-control required" maxlength="512" />
                         </div>
 
                         <div class="form-group">
-                            <label for="secretary-calendar-view"><?php echo $this->lang->line('calendar'); ?> *</label>
+                            <label for="secretary-calendar-view"><?php echo lang('calendar'); ?> *</label>
                             <select id="secretary-calendar-view" class="form-control required">
                                 <option value="default">Default</option>
                                 <option value="table">Table</option>
@@ -595,12 +595,12 @@
 
                         <button type="button" id="secretary-notifications" class="btn btn-default" data-toggle="button">
                             <span class="glyphicon glyphicon-envelope"></span>
-                            <span><?php echo $this->lang->line('receive_notifications');?></span>
+                            <span><?php echo lang('receive_notifications');?></span>
                         </button>
 
                         <br><br>
 
-                        <h4><?php echo $this->lang->line('providers');?></h4>
+                        <h4><?php echo lang('providers');?></h4>
                         <div id="secretary-providers"></div>
                     </div>
                 </div>
diff --git a/src/application/views/general/error404.php b/src/application/views/general/error404.php
index 18f99ca5..2f012176 100644
--- a/src/application/views/general/error404.php
+++ b/src/application/views/general/error404.php
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
-    <title><?php echo $this->lang->line('page_not_found') . ' - ' . $company_name; ?></title>
+    <title><?php echo lang('page_not_found') . ' - ' . $company_name; ?></title>
 
     <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
 
@@ -61,22 +61,22 @@
 </head>
 <body>
     <div id="message-frame" class="frame-container">
-        <h3><?php echo $this->lang->line('page_not_found')
-                . ' - ' . $this->lang->line('error') . ' 404' ?></h3>
+        <h3><?php echo lang('page_not_found')
+                . ' - ' . lang('error') . ' 404' ?></h3>
         <p>
-            <?php echo $this->lang->line('page_not_found_message'); ?>
+            <?php echo lang('page_not_found_message'); ?>
         </p>
 
         <br>
 
         <a href="<?php echo site_url(); ?>" class="btn btn-primary btn-large">
             <span class="glyphicon glyphicon-calendar"></span>
-            <?php echo $this->lang->line('book_appointment_title'); ?>
+            <?php echo lang('book_appointment_title'); ?>
         </a>
 
         <a href="<?php echo site_url('backend'); ?>" class="btn btn-default btn-large">
             <span class="glyphicon glyphicon-wrench"></span>
-            <?php echo $this->lang->line('backend_section'); ?>
+            <?php echo lang('backend_section'); ?>
         </a>
     </div>
 
diff --git a/src/application/views/user/forgot_password.php b/src/application/views/user/forgot_password.php
index e9d4eaef..0ec4c19b 100644
--- a/src/application/views/user/forgot_password.php
+++ b/src/application/views/user/forgot_password.php
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
-    <title><?php echo $this->lang->line('forgot_your_password') . ' - ' . $company_name; ?></title>
+    <title><?php echo lang('forgot_your_password') . ' - ' . $company_name; ?></title>
 
     <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
     <script src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
@@ -103,28 +103,28 @@
 </head>
 <body>
     <div id="forgot-password-frame" class="frame-container">
-        <h2><?php echo $this->lang->line('forgot_your_password'); ?></h2>
-        <p><?php echo $this->lang->line('type_username_and_email_for_new_password'); ?></p>
+        <h2><?php echo lang('forgot_your_password'); ?></h2>
+        <p><?php echo lang('type_username_and_email_for_new_password'); ?></p>
         <hr>
         <div class="alert hidden"></div>
         <form>
             <div class="form-group">
-                <label for="username"><?php echo $this->lang->line('username'); ?></label>
-                <input type="text" id="username" placeholder="<?php echo $this->lang->line('enter_username_here'); ?>" class="form-control" />
+                <label for="username"><?php echo lang('username'); ?></label>
+                <input type="text" id="username" placeholder="<?php echo lang('enter_username_here'); ?>" class="form-control" />
             </div>
             <div class="form-group">
-                <label for="email"><?php echo $this->lang->line('email'); ?></label>
-                <input type="text" id="email" placeholder="<?php echo $this->lang->line('enter_email_here'); ?>" class="form-control" />
+                <label for="email"><?php echo lang('email'); ?></label>
+                <input type="text" id="email" placeholder="<?php echo lang('enter_email_here'); ?>" class="form-control" />
             </div>
 
             <br>
 
             <button type="submit" id="get-new-password" class="btn btn-primary btn-large">
-                <?php echo $this->lang->line('regenerate_password'); ?>
+                <?php echo lang('regenerate_password'); ?>
             </button>
 
             <a href="<?php echo site_url('user/login'); ?>" class="user-login">
-                <?php echo $this->lang->line('go_to_login'); ?></a>
+                <?php echo lang('go_to_login'); ?></a>
         </form>
     </div>
     <script src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
diff --git a/src/application/views/user/login.php b/src/application/views/user/login.php
index 94af0d08..75fe5af0 100644
--- a/src/application/views/user/login.php
+++ b/src/application/views/user/login.php
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
-    <title><?php echo $this->lang->line('login') . ' - ' . $company_name; ?></title>
+    <title><?php echo lang('login') . ' - ' . $company_name; ?></title>
 
     <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
     <script src="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
@@ -96,33 +96,33 @@
 </head>
 <body>
     <div id="login-frame" class="frame-container">
-        <h2><?php echo $this->lang->line('backend_section'); ?></h2>
-        <p><?php echo $this->lang->line('you_need_to_login'); ?></p>
+        <h2><?php echo lang('backend_section'); ?></h2>
+        <p><?php echo lang('you_need_to_login'); ?></p>
         <hr>
         <div class="alert hidden"></div>
         <form id="login-form">
             <div class="form-group">
-                <label for="username"><?php echo $this->lang->line('username'); ?></label>
+                <label for="username"><?php echo lang('username'); ?></label>
                 <input type="text" id="username"
-                		placeholder="<?php echo $this->lang->line('enter_username_here'); ?>"
+                		placeholder="<?php echo lang('enter_username_here'); ?>"
                 		class="form-control" />
             </div>
             <div class="form-group">
-                <label for="password"><?php echo $this->lang->line('password'); ?></label>
+                <label for="password"><?php echo lang('password'); ?></label>
                 <input type="password" id="password"
-                		placeholder="<?php echo $this->lang->line('enter_password_here'); ?>"
+                		placeholder="<?php echo lang('enter_password_here'); ?>"
                 		class="form-control" />
             </div>
             <br>
 
             <button type="submit" id="login" class="btn btn-primary">
-            	<?php echo $this->lang->line('login'); ?>
+            	<?php echo lang('login'); ?>
             </button>
 
             <br><br>
 
             <a href="<?php echo site_url('user/forgot_password'); ?>" class="forgot-password">
-            	<?php echo $this->lang->line('forgot_your_password'); ?></a>
+            	<?php echo lang('forgot_your_password'); ?></a>
             |
             <span id="select-language" class="label label-success">
 	        	<?php echo ucfirst($this->config->item('language')); ?>
diff --git a/src/application/views/user/logout.php b/src/application/views/user/logout.php
index 8404b8b6..1e1b0c66 100644
--- a/src/application/views/user/logout.php
+++ b/src/application/views/user/logout.php
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
-    <title><?php echo $this->lang->line('log_out') . ' - ' . $company_name; ?></title>
+    <title><?php echo lang('log_out') . ' - ' . $company_name; ?></title>
 
     <link rel="icon" type="image/x-icon" href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
@@ -57,21 +57,21 @@
 </head>
 <body>
     <div id="logout-frame" class="frame-container">
-        <h3><?php echo $this->lang->line('log_out'); ?></h3>
+        <h3><?php echo lang('log_out'); ?></h3>
         <p>
-            <?php echo $this->lang->line('logout_success'); ?>
+            <?php echo lang('logout_success'); ?>
         </p>
 
         <br>
 
         <a href="<?php echo site_url(); ?>" class="btn btn-success btn-large">
             <span class="glyphicon glyphicon-calendar"></span>
-            <?php echo $this->lang->line('book_appointment_title'); ?>
+            <?php echo lang('book_appointment_title'); ?>
         </a>
 
         <a href="<?php echo site_url('backend'); ?>" class="btn btn-default btn-large">
             <span class="glyphicon glyphicon-wrench"></span>
-            <?php echo $this->lang->line('backend_section'); ?>
+            <?php echo lang('backend_section'); ?>
         </a>
     </div>
 </body>
diff --git a/src/application/views/user/no_privileges.php b/src/application/views/user/no_privileges.php
index 8c2b44a1..ca529a2a 100644
--- a/src/application/views/user/no_privileges.php
+++ b/src/application/views/user/no_privileges.php
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
-    <title><?php echo $this->lang->line('no_privileges') . ' - ' . $company_name; ?></title>
+    <title><?php echo lang('no_privileges') . ' - ' . $company_name; ?></title>
 
     <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
     <script src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
@@ -50,16 +50,16 @@
 </head>
 <body>
     <div id="no-priv-frame" class="frame-container">
-        <h3><?php echo $this->lang->line('no_privileges'); ?></h3>
+        <h3><?php echo lang('no_privileges'); ?></h3>
         <p>
-            <?php echo $this->lang->line('no_privileges_message'); ?>
+            <?php echo lang('no_privileges_message'); ?>
         </p>
 
         <br>
 
         <a href="<?php echo site_url('backend') ?>" class="btn btn-success btn-large">
             <i class="icon-calendar icon-white"></i>
-            <?php echo $this->lang->line('backend_calendar'); ?>
+            <?php echo lang('backend_calendar'); ?>
         </a>
     </div>
 </body>