summaryrefslogtreecommitdiffstats
path: root/config/locales
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2009-10-21 22:34:28 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2009-10-21 22:34:28 +0000
commite76d4c5c4c3f2beb8be1f441148e4627a14d37d1 (patch)
tree8f1ea0620882ad97d3804018d109f8a35f1ed4a0 /config/locales
parentac4937a76755de2f9b6a83f6160efa0fde2d03aa (diff)
downloadredmine-e76d4c5c4c3f2beb8be1f441148e4627a14d37d1.tar.gz
redmine-e76d4c5c4c3f2beb8be1f441148e4627a14d37d1.zip
Added an active field track if an Enumeration is active on the frontend view.
* Changed TimelogHelper#activity_collection_for_select_options to only use active TimeEntryActivities. * Changed TimelogHelper#activity_collection_for_select_options to return a blank option if the time_entry's current activity is inactive. #4077 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2946 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f46c57c08..8a07c644a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -748,6 +748,8 @@ en:
status_active: active
status_registered: registered
status_locked: locked
+
+ field_active: Active
text_select_mail_notifications: Select actions for which email notifications should be sent.
text_regexp_info: eg. ^[A-Z0-9]+$