diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-10-29 10:06:30 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-10-29 10:06:30 +0000 |
| commit | b71355f10b247f35a32fc002d52a9ca536537998 (patch) | |
| tree | 02618fb61aedd65e713ae699915b39391dd09f79 /config | |
| parent | 48d83884c36fae4882061360da25f4e2ed1def13 (diff) | |
| download | redmine-b71355f10b247f35a32fc002d52a9ca536537998.tar.gz redmine-b71355f10b247f35a32fc002d52a9ca536537998.zip | |
Ignore non-working days when rescheduling an issue (#2161).
Weekly non-working days can be configured in application settings (set to saturday and sunday by default).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10747 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/fr.yml | 1 | ||||
| -rw-r--r-- | config/settings.yml | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index c223b0f88..23a9abd9f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -399,6 +399,7 @@ en: setting_session_timeout: Session inactivity timeout setting_thumbnails_enabled: Display attachment thumbnails setting_thumbnails_size: Thumbnails size (in pixels) + setting_non_working_week_days: Non-working days permission_add_project: Create project permission_add_subprojects: Create subprojects diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 7baf293e7..eff6caeed 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -395,6 +395,7 @@ fr: setting_session_timeout: Durée maximale d'inactivité setting_thumbnails_enabled: Afficher les vignettes des images setting_thumbnails_size: Taille des vignettes (en pixels) + setting_non_working_week_days: Jours non travaillés permission_add_project: Créer un projet permission_add_subprojects: Créer des sous-projets diff --git a/config/settings.yml b/config/settings.yml index 6aa224166..130e26346 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -220,3 +220,8 @@ thumbnails_enabled: thumbnails_size: format: int default: 100 +non_working_week_days: + serialized: true + default: + - 6 + - 7 |