diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
| commit | 8b4003f7fce9e089f2220e6f1a21681f7cf2df3d (patch) | |
| tree | 15333943091fc3ae79dedee46a6dd34ce3f1a1ec /app/models/track_thing.rb | |
| parent | 646fffde374e575ab53cfae78e7a0c521cd90d6f (diff) | |
| parent | c96b27c301023a6a1f50c12f0c387205b0255836 (diff) | |
Merge remote-tracking branch 'origin/release/0.6.8' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'app/models/track_thing.rb')
| -rw-r--r-- | app/models/track_thing.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb index d1cef4d4d..2a61eb858 100644 --- a/app/models/track_thing.rb +++ b/app/models/track_thing.rb @@ -107,7 +107,12 @@ class TrackThing < ActiveRecord::Base end descriptions = [] if varieties.include? _("requests") - descriptions << _("requests which are {{list_of_statuses}}", :list_of_statuses => Array(statuses).sort.join(_(' or '))) + if statuses.empty? + # HACK: Relies on the 'descriptions.sort' below to luckily put this first + descriptions << _("all requests") + else + descriptions << _("requests which are {{list_of_statuses}}", :list_of_statuses => Array(statuses).sort.join(_(' or '))) + end varieties -= [_("requests")] end if descriptions.empty? and varieties.empty? |