diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-01-16 11:47:20 +0000 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-01-16 11:47:20 +0000 |
| commit | 682db36dca4db6c0682deeb4fb704e8cf222e38c (patch) | |
| tree | 5811b7e2288f48b0bc814f7f505e19cb705294d9 /perllib/FixMyStreet/DB/Result/Comment.pm | |
| parent | 257b658e49da3665a426f1c98d9760b0d53b8d3d (diff) | |
| parent | 3c4c0ec2f55d82502169d2313745920850efdc99 (diff) | |
Merge branch 'bromley-new-statuses'
Conflicts:
bin/send-comments
conf/crontab.ugly
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/DB/Result/Open311conf.pm
perllib/FixMyStreet/DB/ResultSet/Problem.pm
perllib/Open311.pm
t/app/controller/report_updates.t
t/open311.t
templates/web/default/report/display.html
templates/web/default/report/updates.html
templates/web/fixmystreet/report/display.html
Diffstat (limited to 'perllib/FixMyStreet/DB/Result/Comment.pm')
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Comment.pm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index 8c9fea282..b551be9ef 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -146,6 +146,11 @@ sub check_for_errors { $errors{update} = _('Please enter a message') unless $self->text =~ m/\S/; + if ( $self->text && $self->problem && $self->problem->council + && $self->problem->council eq '2482' && length($self->text) > 2000 ) { + $errors{update} = _('Updates are limited to 2000 characters in length. Please shorten your update'); + } + return \%errors; } @@ -186,6 +191,10 @@ sub meta_problem_state { my $state = $self->problem_state; $state =~ s/ -.*$//; + $state = _("not the council's responsibility") + if $state eq 'not responsible'; + $state = _('duplicate report') if $state eq 'duplicate'; + return $state; } |