From 19f245ff861895c99c3f04fbc53404564bb44267 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Fri, 1 Apr 2016 23:08:11 +0000 Subject: [PATCH] Changed a message after a date locking error. --- WEB-INF/resources/en.lang.php | 1 + WEB-INF/resources/ru.lang.php | 1 + WEB-INF/templates/footer.tpl | 2 +- expense_delete.php | 2 +- expense_edit.php | 6 +++--- expenses.php | 2 +- mobile/time.php | 2 +- mobile/time_delete.php | 2 +- mobile/time_edit.php | 4 ++-- mobile/timer.php | 2 +- time.php | 2 +- time_delete.php | 2 +- time_edit.php | 6 +++--- 13 files changed, 18 insertions(+), 16 deletions(-) diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php index 19fc3482..46da7368 100644 --- a/WEB-INF/resources/en.lang.php +++ b/WEB-INF/resources/en.lang.php @@ -88,6 +88,7 @@ $i18n_key_words = array( 'error.no_teams' => 'Your database is empty. Login as admin and create a new team.', 'error.upload' => 'File upload error.', 'error.period_locked' => 'Can\\\'t complete the operation. Records older than a certain number of days cannot be created or modified. Team manager defines this in the "Lock interval in days" value on the "Profile" page. Set it to 0 to remove locking.

Uncompleted records (with 0 or empty duration) can be deleted.', +'error.range_locked' => 'Date range is locked.', 'error.mail_send' => 'Error sending mail.', 'error.no_email' => 'No email associated with this login.', 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.', diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index 0a37683c..b15f1d19 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -88,6 +88,7 @@ $i18n_key_words = array( 'error.no_teams' => 'Ваша база данных пуста. Войдите в систему как администратор и создайте новую команду.', 'error.upload' => 'Ошибка загрузки файла.', 'error.period_locked' => 'Невозможно завершить операцию. Записи, старее чем определённое количество дней, не могут быть созданы или изменены. Менеджер команды определяет интервал блокировки величиной "Интервал блокировки в днях" на странице "Профиль". Установите её в 0, чтобы удалить блокировку.

Неоконченные записи (с 0 или пустой длительностью) могут быть удалены.', +'error.range_locked' => 'Диапазон дат заблокирован.', 'error.mail_send' => 'Ошибка отправки почты.', 'error.no_email' => 'Для данного логина не предоставлен e-mail.', 'error.uncompleted_exists' => 'Неоконченная запись уже существует. Закройте или удалите её.', diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 408ffcfd..6572bcb4 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.22.3470 | Copyright © Anuko | +  Anuko Time Tracker 1.9.22.3471 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/expense_delete.php b/expense_delete.php index 78209aad..38800b62 100644 --- a/expense_delete.php +++ b/expense_delete.php @@ -49,7 +49,7 @@ if ($request->isPost()) { // Determine if it is okay to delete the record. $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']); if ($user->isDateLocked($item_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); if ($err->no()) { // Mark the record as deleted. diff --git a/expense_edit.php b/expense_edit.php index 2a996543..213cfcba 100644 --- a/expense_edit.php +++ b/expense_edit.php @@ -159,11 +159,11 @@ if ($request->isPost()) { // Now, step by step. // 1) Prohibit saving locked entries in any form. if ($user->isDateLocked($item_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // 2) Prohibit saving unlocked entries into locked range. if ($err->no() && $user->isDateLocked($new_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // Now, an update. if ($err->no()) { @@ -179,7 +179,7 @@ if ($request->isPost()) { if ($request->getParameter('btn_copy')) { // We need to prohibit saving into locked interval. if ($user->isDateLocked($new_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // Now, a new insert. if ($err->no()) { diff --git a/expenses.php b/expenses.php index 56446a81..4c2b7b27 100644 --- a/expenses.php +++ b/expenses.php @@ -155,7 +155,7 @@ if ($request->isPost()) { // Prohibit creating entries in locked range. if ($user->isDateLocked($selected_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // Insert record. if ($err->no()) { diff --git a/mobile/time.php b/mobile/time.php index ab0ada0c..679dcadf 100644 --- a/mobile/time.php +++ b/mobile/time.php @@ -235,7 +235,7 @@ if ($request->isPost()) { // Prohibit creating entries in locked range. if ($user->isDateLocked($selected_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // Prohibit creating another uncompleted record. if ($err->no()) { diff --git a/mobile/time_delete.php b/mobile/time_delete.php index e9f0e223..c9602b4e 100644 --- a/mobile/time_delete.php +++ b/mobile/time_delete.php @@ -57,7 +57,7 @@ if ($request->isPost()) { $uncompleted = ($time_rec['duration'] == '0:00'); if ($user->isDateLocked($item_date) && !$uncompleted) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); if ($err->no()) { diff --git a/mobile/time_edit.php b/mobile/time_edit.php index cce99463..452baf29 100644 --- a/mobile/time_edit.php +++ b/mobile/time_edit.php @@ -270,11 +270,11 @@ if ($request->isPost()) { if ($err->no()) { // 1) Prohibit saving locked entries in any form. if ($user->isDateLocked($item_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // 2) Prohibit saving completed unlocked entries into locked range. if ($err->no() && $user->isDateLocked($new_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. $uncompleted = ($cl_finish == '' && $cl_duration == ''); diff --git a/mobile/timer.php b/mobile/timer.php index 752ebca9..d2d3a8df 100644 --- a/mobile/timer.php +++ b/mobile/timer.php @@ -208,7 +208,7 @@ if ($request->isPost()) { // Prohibit creating time entries in locked interval. if ($user->isDateLocked($selected_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // Prohibit creating another uncompleted record. if ($err->no() && $uncompleted) { diff --git a/time.php b/time.php index f6e4b718..f0f2c7de 100644 --- a/time.php +++ b/time.php @@ -256,7 +256,7 @@ if ($request->isPost()) { // Prohibit creating entries in locked range. if ($user->isDateLocked($selected_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // Prohibit creating another uncompleted record. if ($err->no()) { diff --git a/time_delete.php b/time_delete.php index 4e2f99a8..c5017284 100644 --- a/time_delete.php +++ b/time_delete.php @@ -57,7 +57,7 @@ if ($request->isPost()) { $uncompleted = ($time_rec['duration'] == '0:00'); if ($user->isDateLocked($item_date) && !$uncompleted) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); if ($err->no()) { diff --git a/time_edit.php b/time_edit.php index 82875978..b509fcf9 100644 --- a/time_edit.php +++ b/time_edit.php @@ -271,11 +271,11 @@ if ($request->isPost()) { if ($err->no()) { // 1) Prohibit saving locked entries in any form. if ($user->isDateLocked($item_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // 2) Prohibit saving completed unlocked entries into locked range. if ($err->no() && $user->isDateLocked($new_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. $uncompleted = ($cl_finish == '' && $cl_duration == ''); @@ -334,7 +334,7 @@ if ($request->isPost()) { if ($err->no()) { // 1) Prohibit saving into locked range. if ($user->isDateLocked($new_date)) - $err->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.range_locked')); // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. $uncompleted = ($cl_finish == '' && $cl_duration == ''); -- 2.20.1