diff --git a/doc/translations.xls b/doc/translations.xls index e6e3a185..573999d2 100644 Binary files a/doc/translations.xls and b/doc/translations.xls differ diff --git a/src/application/controllers/appointments.php b/src/application/controllers/appointments.php index 802f77e8..62bb6325 100644 --- a/src/application/controllers/appointments.php +++ b/src/application/controllers/appointments.php @@ -41,7 +41,8 @@ class Appointments extends CI_Controller { 'message_title' => $this->lang->line('fe_appointment_not_found'), 'message_text' => $this->lang->line('fe_appointment_does_not_exist_in_db'), 'message_icon' => $this->config->item('base_url') - . 'assets/images/error.png' + . 'assets/images/error.png', + 'company_name' => $company_name ); $view['ea_lang'] = $this->lang->language; $this->load->view('appointments/message', $view); diff --git a/src/application/controllers/user.php b/src/application/controllers/user.php index 6976a8a3..40608380 100644 --- a/src/application/controllers/user.php +++ b/src/application/controllers/user.php @@ -11,6 +11,8 @@ class User extends CI_Controller { } public function login() { + $this->load->model('settings_model'); + $view['base_url'] = $this->config->item('base_url'); $view['dest_url'] = $this->session->userdata('dest_url'); @@ -18,10 +20,14 @@ class User extends CI_Controller { $view['dest_url'] = $view['base_url'] . 'backend'; } + $view['company_name'] = $this->settings_model->get_setting('company_name'); + $view['ea_lang'] = $this->lang->language; $this->load->view('user/login', $view); } public function logout() { + $this->load->model('settings_model'); + $this->session->unset_userdata('user_id'); $this->session->unset_userdata('user_email'); $this->session->unset_userdata('role_slug'); @@ -29,16 +35,24 @@ class User extends CI_Controller { $this->session->unset_userdata('dest_url'); $view['base_url'] = $this->config->item('base_url'); + $view['company_name'] = $this->settings_model->get_setting('company_name'); + $view['ea_lang'] = $this->lang->language; $this->load->view('user/logout', $view); } public function forgot_password() { + $this->load->model('settings_model'); $view['base_url'] = $this->config->item('base_url'); + $view['company_name'] = $this->settings_model->get_setting('company_name'); + $view['ea_lang'] = $this->lang->language; $this->load->view('user/forgot_password', $view); } public function no_privileges() { + $this->load->model('settings_model'); $view['base_url'] = $this->config->item('base_url'); + $view['company_name'] = $this->settings_model->get_setting('company_name'); + $view['ea_lang'] = $this->lang->language; $this->load->view('user/no_privileges', $view); } diff --git a/src/application/language/english/backend_lang.php b/src/application/language/english/backend_lang.php index a6b7dad3..dbc6fb44 100644 --- a/src/application/language/english/backend_lang.php +++ b/src/application/language/english/backend_lang.php @@ -159,4 +159,7 @@ $lang['be_delete_unavailable'] = 'Delete Unavailable Period'; $lang['be_delete'] = 'Delete'; $lang['be_unexpected_issues'] = 'Unexpected Issues'; $lang['be_unexpected_issues_message'] = 'The operation could not complete due to unexpected issues.'; -$lang['be_close'] = 'Close'; \ No newline at end of file +$lang['be_close'] = 'Close'; +$lang['be_page_not_found'] = 'Page Not Found'; +$lang['be_page_not_found_message'] = 'Unfortunately the page you requested does not exist. Please check your browser URL or head to another location using the buttons below.'; +$lang['be_error'] = 'Error'; \ No newline at end of file diff --git a/src/application/language/german/backend_lang.php b/src/application/language/german/backend_lang.php index 87e1be65..fffde437 100644 --- a/src/application/language/german/backend_lang.php +++ b/src/application/language/german/backend_lang.php @@ -159,4 +159,7 @@ $lang['be_delete_unavailable'] = 'Nicht zur Verfügung stehender Zeitraum lösch $lang['be_delete'] = 'Löschen'; $lang['be_unexpected_issues'] = 'Unvorhergesene Vorfälle'; $lang['be_unexpected_issues_message'] = 'Dieser Vorgang konnte aufgrund unvorgesehener Vorfälle nicht beendet werden.'; -$lang['be_close'] = 'Schließen'; \ No newline at end of file +$lang['be_close'] = 'Schließen'; +$lang['be_page_not_found'] = 'Seite Nicht Gefunden'; +$lang['be_page_not_found_message'] = 'Leider ist die von Ihnen angeforderte Seite existiert nicht. Bitte überprüfen Sie Ihre Browser-URL oder navigieren Sie zu einem anderen Ort mit den Tasten unten.'; +$lang['be_error'] = 'Fehler'; \ No newline at end of file diff --git a/src/application/language/greek/backend_lang.php b/src/application/language/greek/backend_lang.php index e5b9ba27..c84cb6e6 100644 --- a/src/application/language/greek/backend_lang.php +++ b/src/application/language/greek/backend_lang.php @@ -135,7 +135,7 @@ $lang['be_logout_success'] = 'Έχετε αποσυνδεθεί επιτυχώς $lang['be_book_appointment_title'] = 'Κράτηση Ραντεβού'; $lang['be_backend_section'] = 'Τμήμα Backend'; $lang['be_you_need_to_login'] = 'Καλώς ήρθατε! Θα χρειαστεί να συνδεθείτε για να δείτε τις σελίδες του backend.'; -$lang['be_enter_username_here'] = 'Εισάγετε το όνομα χρήστη εδώ ...'; +$lang['be_enter_username_here'] = 'Εισάγετε το όνομα χρήστη σας εδώ ...'; $lang['be_enter_password_here'] = 'Εισάγετε τον κωδικό σας εδώ ...'; $lang['be_login'] = 'Σύνδεση'; $lang['be_forgot_your_password'] = 'Ξεχάσατε τον κωδικό σας;'; @@ -144,9 +144,9 @@ $lang['be_type_username_and_email_for_new_password'] = 'Εισάγετε το ό $lang['be_enter_email_here'] = 'Εισάγετε το email σας εδώ ...'; $lang['be_regenerate_password'] = 'Παραγωγή Κωδικού'; $lang['be_go_to_login'] = 'Πλοήγηση Πίσω Στην Σελίδα Σύνδεσης'; -$lang['be_new_password_sent_with_email'] = 'Ο νέος σας κωδικός έχει αποσταλεί σε εσάς με email.'; +$lang['be_new_password_sent_with_email'] = 'Ο νέος σας κωδικός έχει αποσταλεί με email.'; $lang['be_new_account_password'] = 'Νέος Κωδικός Λογαριασμού'; -$lang['be_new_password_is'] = 'Ο νέος κωδικός του λογαριασμού σας είναι ........ Παρακαλώ αποθηκεύστε αυτό το email για να μπορείτε να ξαναβρείτε τον κωδικό αν είναι απαραίτητο. Μπορείτε επίσης να αλλάξετε αυτόν τον κωδικό με έναν καινούργιο στην σελίδα των ρυθμίσεων.'; +$lang['be_new_password_is'] = 'Ο νέος κωδικός του λογαριασμού σας είναι $password. Παρακαλώ αποθηκεύστε αυτό το email για να μπορείτε να ξαναβρείτε τον κωδικό αν είναι απαραίτητο. Μπορείτε επίσης να αλλάξετε αυτόν τον κωδικό με έναν καινούργιο στην σελίδα των ρυθμίσεων.'; $lang['be_delete_record_prompt'] = 'Είστε σίγουρος ότι θέλετε να διαγράψετε αυτήν την εγγραφή; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.'; $lang['be_delete_admin'] = 'Διαγραφή Διαχειριστή'; $lang['be_delete_customer'] = 'Διαγραφή Πελάτη'; @@ -159,4 +159,7 @@ $lang['be_delete_unavailable'] = 'Διαγραφή Μη Διαθέσιμης Π $lang['be_delete'] = 'Διαγραφή'; $lang['be_unexpected_issues'] = 'Απροσδόκητα Ζητήματα'; $lang['be_unexpected_issues_message'] = 'Η διαδικασία δεν μπόρεσε να ολοκληρωθεί λόγω απροσδόκητων ζητημάτων.'; -$lang['be_close'] = 'Κλείσιμο'; \ No newline at end of file +$lang['be_close'] = 'Κλείσιμο'; +$lang['be_page_not_found'] = 'Η Σελίδα Δεν Βρέθηκε'; +$lang['be_page_not_found_message'] = 'Δυστυχώς η σελίδα που ζητήσατε δεν υπάρχει. Παρακαλώ ελέγξτε την διεύθυνση του περιηγητή σας ή πηγαίνετε σε κάποια από τις παρακάτω τοποθεσίες.'; +$lang['be_error'] = 'Σφάλμα'; \ No newline at end of file diff --git a/src/application/views/appointments/book_success.php b/src/application/views/appointments/book_success.php index 30d3492f..fae5888d 100644 --- a/src/application/views/appointments/book_success.php +++ b/src/application/views/appointments/book_success.php @@ -1,6 +1,7 @@ + <?php echo $this->lang->line('fe_appointment_registered') . ' - ' . $company_name; ?> @@ -64,6 +65,8 @@ 'googleApiScope' : 'https://www.googleapis.com/auth/calendar' }; + var EALang = ; + $(document).ready(function() { /** * Event: Add Appointment to Google Calendar "Click" @@ -144,13 +147,12 @@ $('#success-frame').append( '

' + '
' + - '

Success!

' + + '

' + EALang['fe_success'] + '

' + '

' + - 'Your appointment has been added to ' + - 'your Google Calendar account.
' + + EALang['fe_appointment_added_to_google_calendar'] + + '
' + '' + - 'Click here to view your appointment on Google ' + - 'Calendar.' + + EALang['fe_view_appointment_in_google_calendar'] + '' + '

' + '
' @@ -183,13 +185,13 @@
-

Your appointment has been successfully registered!

-

An email with the appointment details has been sent to you.

+

lang->line('fe_appointment_registered'); ?>

+

lang->line('fe_appointment_details_was_sent_to_you'); ?>

config->item('ea_google_sync_feature')) { ?> diff --git a/src/application/views/appointments/cancel.php b/src/application/views/appointments/cancel.php index f27332b5..1b12aebc 100644 --- a/src/application/views/appointments/cancel.php +++ b/src/application/views/appointments/cancel.php @@ -1,6 +1,7 @@ + <?php echo $this->lang->line('fe_appointment_cancelled_title'); ?> @@ -48,7 +49,7 @@
-

Your appointment has been successfully cancelled!

+

lang->line('fe_appointment_cancelled'); ?>

+ <?php echo $company_name; ?> diff --git a/src/application/views/general/error404.php b/src/application/views/general/error404.php index 209550ee..643cd787 100644 --- a/src/application/views/general/error404.php +++ b/src/application/views/general/error404.php @@ -1,7 +1,7 @@ - Page Not Found <?php echo $company_name; ?> + <?php echo $this->lang->line('be_page_not_found') . ' - ' . $company_name; ?> @@ -54,23 +54,22 @@
-

Page Not Found - Error 404

+

lang->line('be_page_not_found') + . ' - ' . $this->lang->line('be_error') . ' 404' ?>

- Unfortunately the page you requested does not exist. - Please check your browser URL or head to another location using the - buttons below. + lang->line('be_page_not_found_message'); ?>


- Book Appointment + lang->line('be_book_appointment_title'); ?> - Backend Section + lang->line('be_backend_section'); ?>
diff --git a/src/application/views/user/forgot_password.php b/src/application/views/user/forgot_password.php index fbaed9f5..a6a09489 100644 --- a/src/application/views/user/forgot_password.php +++ b/src/application/views/user/forgot_password.php @@ -1,6 +1,7 @@ + <?php echo $this->lang->line('be_forgot_your_password') . ' - ' . $company_name; ?> @@ -63,6 +64,8 @@ 'AJAX_FAILURE': 'FAILURE' }; + var EALang = ; + /** * Event: Login Button "Click" * @@ -91,7 +94,7 @@ if (response == GlobalVariables.AJAX_SUCCESS) { $('.alert').addClass('alert-success'); - $('.alert').text('Your new password has been sent to you with an email.'); + $('.alert').text(EALang['be_new_password_sent_with_email']); } else { $('.alert').text('The operation failed! Please enter a valid username ' + 'and email address in order to get a new password.'); @@ -104,22 +107,26 @@
-

Forgot Your Password?

-

Type your username and your email address to get your new password.

+

lang->line('be_forgot_your_password'); ?>

+

lang->line('be_type_username_and_email_for_new_password'); ?>


- - + + - - + +

- + - +
diff --git a/src/application/views/user/login.php b/src/application/views/user/login.php index 7d185383..84cde5ac 100644 --- a/src/application/views/user/login.php +++ b/src/application/views/user/login.php @@ -1,6 +1,7 @@ + <?php echo $this->lang->line('be_login') . ' - ' . $company_name; ?> @@ -69,6 +70,8 @@ 'AJAX_FAILURE': 'FAILURE' }; + var EALang = ; + /** * Event: Login Button "Click" * @@ -96,8 +99,7 @@ if (response == GlobalVariables.AJAX_SUCCESS) { window.location.href = GlobalVariables.destUrl; } else { - $('.alert').text('Login failed, please enter the correct credentials ' - + 'and try again.'); + $('.alert').text(EALang['be_login_failed']); $('.alert').removeClass('hidden'); } }, 'json'); @@ -107,22 +109,22 @@
-

Backend Section

-

Welcome! You will need to login in order to view backend pages.

+

lang->line('be_backend_section'); ?>

+

lang->line('be_you_need_to_login'); ?>


- - + + - - + +

- + - Forgot Your Password? + lang->line('be_forgot_your_password'); ?>
diff --git a/src/application/views/user/logout.php b/src/application/views/user/logout.php index 508a682c..8667e29a 100644 --- a/src/application/views/user/logout.php +++ b/src/application/views/user/logout.php @@ -1,6 +1,7 @@ + <?php echo $this->lang->line('be_log_out') . ' - ' . $company_name; ?> @@ -56,22 +57,21 @@
-

Logout

+

lang->line('be_log_out'); ?>

- You have been successfully logged out! Click on one of the following buttons to - navigate to a different page. + lang->line('be_logout_success'); ?>


- Book Appointment + lang->line('be_book_appointment_title'); ?> - Backend Section + lang->line('be_backend_section'); ?>