diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-12-11 03:55:58 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-12-11 03:55:58 +0000 |
| commit | 9f6277e07c94e17f797a257079517af7220f97f1 (patch) | |
| tree | 81c3e3cf016c3debd6a482a8b424450b593cce38 /config | |
| parent | 27b6e595f7ca6b3e66cb43c2683a4fcdb5927690 (diff) | |
| download | redmine-9f6277e07c94e17f797a257079517af7220f97f1.tar.gz redmine-9f6277e07c94e17f797a257079517af7220f97f1.zip | |
Setting to restrict spent times on future dates (#3322).
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@17719 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/settings.yml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 36d2099c8..28da4cecb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -223,6 +223,7 @@ en: warning_fields_cleared_on_bulk_edit: "Changes will result in the automatic deletion of values from one or more fields on the selected objects" error_exceeds_maximum_hours_per_day: "Cannot log more than %{max_hours} hours on the same day (%{logged_hours} hours have already been logged)" error_can_not_delete_auth_source: "This authentication mode is in use and cannot be deleted." + error_spent_on_future_date: "Cannot log time on a future date" mail_subject_lost_password: "Your %{value} password" mail_body_lost_password: 'To change your password, click on the following link:' @@ -469,6 +470,7 @@ en: setting_time_entry_list_defaults: Timelog list defaults setting_timelog_accept_0_hours: Accept time logs with 0 hours setting_timelog_max_hours_per_day: Maximum hours that can be logged per day and user + setting_timelog_accept_future_dates: Accept time logs on future dates permission_add_project: Create project permission_add_subprojects: Create subprojects diff --git a/config/settings.yml b/config/settings.yml index 80946ec42..b6c026104 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -308,3 +308,5 @@ timelog_accept_0_hours: timelog_max_hours_per_day: format: int default: 999 +timelog_accept_future_dates: + default: 1 |