Changed a message after a date locking error.

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 19fc34828e28da3cc465cf1c4ab6d1ac30b2ed0f..46da73680a1bf9a6a233395873794aa271bc0a00 100644 (file)
--- 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. <br><br>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 0a37683cbf665b7575ad65cfa2a4c6eac75c801a..b15f1d19292ebab684e3d0fccf8c24ed3fe0f875 100644 (file)
--- 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, чтобы удалить блокировку.<br><br>Неоконченные записи (с 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 408ffcfd1b4a96fe5277d4ab8fac4bdbbf91bb1e..6572bcb433bce902e4fa4e4fd2bb9dbb2dfb9aea 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.9.22.3470 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.22.3471 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/expense_delete.php b/expense_delete.php
index 78209aad95f144be4c924eb95b08a8e68ee4fc3e..38800b629d21fc1687022abccaa470a7013c9bd7 100644 (file)
--- 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 2a996543ca3d80f4e49bea8cc58d43e21377bb6a..213cfcba739e8b280ae8a414d7cbaff4e38bbc91 100644 (file)
--- 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 56446a81eca1799dfd9c1c40e7554da9acb791b5..4c2b7b27ef08b18d1a6739311247add9e825fed3 100644 (file)
--- 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 ab0ada0c5ebec94a277663baf1b648d69798d8cf..679dcadf950541479af7bf903592d1f348174f7e 100644 (file)
--- 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 e9f0e2231a1d869c831178a135bbd209d08e941f..c9602b4e7f7bba7312eda710711c3a481237979e 100644 (file)
--- 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 cce9946359c2148d3fe7f24c95467147015a3ebb..452baf29d6406f9447d0dad80db45e6a13752142 100644 (file)
--- 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 752ebca90077c3ba759c7997b8797d957c9d79d3..d2d3a8df7df2adbc3bb6c1b9da73e9b4951089ed 100644 (file)
--- 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 f6e4b7182e6a79f61ba24e8739320badab11ddfc..f0f2c7de86f4047e99c7ee80460e7dedf99d7e49 100644 (file)
--- 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 4e2f99a80a0aea3ebe7db0b398b81684e107f465..c50172849aceea17cd40f842ede54d2334cfcb23 100644 (file)
--- 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 82875978c632434a460c7bbdfed059105e0b2d4e..b509fcf9f9b8079d94a2046d36bb7d92f9eea99f 100644 (file)
--- 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 == '');