From 4767dc36f90123a7a21ce5c3c485e191d6e4e2d8 Mon Sep 17 00:00:00 2001 From: "alextselegidis@gmail.com" Date: Fri, 20 Dec 2013 17:44:44 +0000 Subject: [PATCH] * Translated datetime pickers. * Merged translation files into one per language. --- doc/translations.xls | Bin 56832 -> 58368 bytes src/application/config/autoload.php | 2 +- src/application/controllers/appointments.php | 16 +- .../language/english/backend_lang.php | 190 ------------- .../language/english/frontend_lang.php | 57 ---- .../language/english/translations_lang.php | 264 ++++++++++++++++++ .../language/german/backend_lang.php | 190 ------------- .../language/german/frontend_lang.php | 57 ---- .../language/german/translations_lang.php | 264 ++++++++++++++++++ .../language/greek/backend_lang.php | 192 ------------- .../language/greek/frontend_lang.php | 57 ---- .../language/greek/translations_lang.php | 264 ++++++++++++++++++ src/application/libraries/notifications.php | 56 ++-- src/application/views/appointments/book.php | 62 ++-- .../views/appointments/book_success.php | 14 +- src/application/views/appointments/cancel.php | 4 +- src/application/views/backend/calendar.php | 82 +++--- src/application/views/backend/customers.php | 38 +-- src/application/views/backend/footer.php | 4 +- src/application/views/backend/header.php | 24 +- src/application/views/backend/services.php | 58 ++-- src/application/views/backend/settings.php | 128 ++++----- src/application/views/backend/users.php | 192 ++++++------- src/application/views/general/error404.php | 12 +- .../views/user/forgot_password.php | 20 +- src/application/views/user/login.php | 20 +- src/application/views/user/logout.php | 10 +- src/application/views/user/no_privileges.php | 8 +- src/assets/js/backend_calendar.js | 196 +++++++++---- src/assets/js/backend_customers.js | 18 +- src/assets/js/backend_services.js | 32 +-- src/assets/js/backend_settings.js | 20 +- src/assets/js/backend_users.js | 4 +- src/assets/js/backend_users_admins.js | 22 +- src/assets/js/backend_users_providers.js | 38 +-- src/assets/js/frontend_book.js | 49 +++- src/assets/js/general_functions.js | 10 +- src/assets/js/working_plan.js | 77 +++-- 38 files changed, 1461 insertions(+), 1290 deletions(-) delete mode 100644 src/application/language/english/backend_lang.php delete mode 100644 src/application/language/english/frontend_lang.php create mode 100644 src/application/language/english/translations_lang.php delete mode 100644 src/application/language/german/backend_lang.php delete mode 100644 src/application/language/german/frontend_lang.php create mode 100644 src/application/language/german/translations_lang.php delete mode 100644 src/application/language/greek/backend_lang.php delete mode 100644 src/application/language/greek/frontend_lang.php create mode 100644 src/application/language/greek/translations_lang.php diff --git a/doc/translations.xls b/doc/translations.xls index 1711ceab65aa77a3b2280c9b3cd2a9b2018acf7d..552dc5a7d14899a731682be66c236359dc69f0c4 100644 GIT binary patch delta 12926 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 diff --git a/src/application/config/autoload.php b/src/application/config/autoload.php index 8846a11a..521ab1c7 100644 --- a/src/application/config/autoload.php +++ b/src/application/config/autoload.php @@ -96,7 +96,7 @@ $autoload['config'] = array(); | */ -$autoload['language'] = array('frontend', 'backend'); +$autoload['language'] = array('translations'); /* diff --git a/src/application/controllers/appointments.php b/src/application/controllers/appointments.php index a6f18ca5..133fb6fb 100644 --- a/src/application/controllers/appointments.php +++ b/src/application/controllers/appointments.php @@ -38,8 +38,8 @@ class Appointments extends CI_Controller { // The requested appointment doesn't exist in the database. Display // a message to the customer. $view = array( - 'message_title' => $this->lang->line('fe_appointment_not_found'), - 'message_text' => $this->lang->line('fe_appointment_does_not_exist_in_db'), + 'message_title' => $this->lang->line('appointment_not_found'), + 'message_text' => $this->lang->line('appointment_does_not_exist_in_db'), 'message_icon' => $this->config->item('base_url') . 'assets/images/error.png', 'company_name' => $company_name @@ -147,22 +147,22 @@ class Appointments extends CI_Controller { ->get_setting('notifications', $provider['id']); if (!$post_data['manage_mode']) { - $customer_title = $this->lang->line('fe_appointment_booked'); - $customer_message = $this->lang->line('fe_thank_your_for_appointment'); + $customer_title = $this->lang->line('appointment_booked'); + $customer_message = $this->lang->line('thank_your_for_appointment'); $customer_link = $this->config->item('base_url') . 'appointments/index/' . $appointment['hash']; - $provider_title = $this->lang->line('fe_appointment_added_to_your_plan'); - $provider_message = $this->lang->line('fe_appointment_link_description'); + $provider_title = $this->lang->line('appointment_added_to_your_plan'); + $provider_message = $this->lang->line('appointment_link_description'); $provider_link = $this->config->item('base_url') . 'backend/index/' . $appointment['hash']; } else { - $customer_title = $this->lang->line('be_appointment_changes_saved'); + $customer_title = $this->lang->line('appointment_changes_saved'); $customer_message = ''; $customer_link = $this->config->item('base_url') . 'appointments/index/' . $appointment['hash']; - $provider_title = $this->lang->line('be_appointment_details_changed'); + $provider_title = $this->lang->line('appointment_details_changed'); $provider_message = ''; $provider_link = $this->config->item('base_url') . 'backend/index/' . $appointment['hash']; diff --git a/src/application/language/english/backend_lang.php b/src/application/language/english/backend_lang.php deleted file mode 100644 index 2f7f2d18..00000000 --- a/src/application/language/english/backend_lang.php +++ /dev/null @@ -1,190 +0,0 @@ - $customer_data['address'], // Translations - 'Appointment Details' => $this->ci->lang->line('fe_appointment_details_title'), - 'Service' => $this->ci->lang->line('fe_service'), - 'Provider' => $this->ci->lang->line('fe_provider'), - 'Start' => $this->ci->lang->line('fe_start'), - 'End' => $this->ci->lang->line('fe_end'), - 'Customer Details' => $this->ci->lang->line('fe_customer_details_title'), - 'Name' => $this->ci->lang->line('fe_name'), - 'Email' => $this->ci->lang->line('fe_email'), - 'Phone' => $this->ci->lang->line('fe_phone'), - 'Address' => $this->ci->lang->line('fe_address'), - 'Appointment Link' => $this->ci->lang->line('fe_appointment_link_title') + 'Appointment Details' => $this->ci->lang->line('appointment_details_title'), + 'Service' => $this->ci->lang->line('service'), + 'Provider' => $this->ci->lang->line('provider'), + 'Start' => $this->ci->lang->line('start'), + 'End' => $this->ci->lang->line('end'), + 'Customer Details' => $this->ci->lang->line('customer_details_title'), + 'Name' => $this->ci->lang->line('name'), + 'Email' => $this->ci->lang->line('email'), + 'Phone' => $this->ci->lang->line('phone'), + 'Address' => $this->ci->lang->line('address'), + 'Appointment Link' => $this->ci->lang->line('appointment_link_title') ); $email_html = file_get_contents(dirname(dirname(__FILE__)) @@ -142,8 +142,8 @@ class Notifications { $service_data, $customer_data, $company_settings, $to_address, $reason) { // :: PREPARE EMAIL REPLACE ARRAY $replace_array = array( - '$email_title' => $this->ci->lang->line('fe_appointment_cancelled_title'), - '$email_message' => $this->ci->lang->line('fe_appointment_removed_from_schedule'), + '$email_title' => $this->ci->lang->line('appointment_cancelled_title'), + '$email_message' => $this->ci->lang->line('appointment_removed_from_schedule'), '$appointment_service' => $service_data['name'], '$appointment_provider' => $provider_data['first_name'] . ' ' . $provider_data['last_name'], '$appointment_date' => date('d/m/Y H:i', strtotime($appointment_data['start_datetime'])), @@ -157,17 +157,17 @@ class Notifications { '$reason' => $reason, // Translations - 'Appointment Details' => $this->ci->lang->line('fe_appointment_details_title'), - 'Service' => $this->ci->lang->line('fe_service'), - 'Provider' => $this->ci->lang->line('fe_provider'), - 'Date' => $this->ci->lang->line('fe_start'), - 'Duration' => $this->ci->lang->line('fe_duration'), - 'Customer Details' => $this->ci->lang->line('fe_customer_details_title'), - 'Name' => $this->ci->lang->line('fe_name'), - 'Email' => $this->ci->lang->line('fe_email'), - 'Phone' => $this->ci->lang->line('fe_phone'), - 'Address' => $this->ci->lang->line('fe_address'), - 'Reason' => $this->ci->lang->line('fe_reason') + 'Appointment Details' => $this->ci->lang->line('appointment_details_title'), + 'Service' => $this->ci->lang->line('service'), + 'Provider' => $this->ci->lang->line('provider'), + 'Date' => $this->ci->lang->line('start'), + 'Duration' => $this->ci->lang->line('duration'), + 'Customer Details' => $this->ci->lang->line('customer_details_title'), + 'Name' => $this->ci->lang->line('name'), + 'Email' => $this->ci->lang->line('email'), + 'Phone' => $this->ci->lang->line('phone'), + 'Address' => $this->ci->lang->line('address'), + 'Reason' => $this->ci->lang->line('reason') ); $email_html = file_get_contents(dirname(dirname(__FILE__)) @@ -181,7 +181,7 @@ class Notifications { $mail->AddAddress($to_address); // "Name" argument crushes the phpmailer class. $mail->IsHTML(true); $mail->CharSet = 'UTF-8'; - $mail->Subject = $this->ci->lang->line('fe_appointment_cancelled_title'); + $mail->Subject = $this->ci->lang->line('appointment_cancelled_title'); $mail->Body = $email_html; if (!$mail->Send()) { @@ -200,8 +200,8 @@ class Notifications { */ public function send_password($password, $email, $company_settings) { $replace_array = array( - '$email_title' => $this->ci->lang->line('be_new_account_password'), - '$email_message' => $this->ci->lang->line('be_new_password_is'), + '$email_title' => $this->ci->lang->line('new_account_password'), + '$email_message' => $this->ci->lang->line('new_password_is'), '$company_name' => $company_settings['company_name'], '$company_email' => $company_settings['company_email'], '$company_link' => $company_settings['company_link'], @@ -219,7 +219,7 @@ class Notifications { $mail->AddAddress($email); // "Name" argument crushes the phpmailer class. $mail->IsHTML(true); $mail->CharSet = 'UTF-8'; - $mail->Subject = $this->ci->lang->line('be_new_account_password'); + $mail->Subject = $this->ci->lang->line('new_account_password'); $mail->Body = $email_html; if (!$mail->Send()) { diff --git a/src/application/views/appointments/book.php b/src/application/views/appointments/book.php index 8eabd293..b208ab16 100644 --- a/src/application/views/appointments/book.php +++ b/src/application/views/appointments/book.php @@ -1,7 +1,7 @@ - <?php echo $this->lang->line('fe_page_title') . ' ' . $company_name; ?> + <?php echo $this->lang->line('page_title') . ' ' . $company_name; ?>
-
+
1
-
+
2
-
+
3
-
+
4
@@ -126,14 +126,14 @@ echo '

' . - $this->lang->line('fe_cancel_appointment_hint') . + $this->lang->line('cancel_appointment_hint') . '

+ $this->lang->line('cancel') . '
'; } @@ -145,7 +145,7 @@ // ------------------------------------------------------ if (isset($exceptions)) { echo '
'; - echo '

' . $this->lang->line('be_unexpected_issues') . '

'; + echo '

' . $this->lang->line('unexpected_issues') . '

'; foreach($exceptions as $exception) { echo exceptionToHtml($exception); } @@ -158,11 +158,11 @@ // ------------------------------------------------------ ?>
-

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

+

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

@@ -233,7 +233,7 @@
@@ -245,7 +245,7 @@