diff options
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 30 | ||||
| -rw-r--r-- | templates/web/base/report/_council_sent_info.html | 14 |
2 files changed, 13 insertions, 31 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 12dad073e..5b853134e 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -662,36 +662,6 @@ sub can_display_external_id { return 0; } -# TODO Some/much of this could be moved to the template - -# either: -# "sent to council 3 mins later" -# "[Council name] ref: XYZ" -# or -# "sent to council 3 mins later, their ref: XYZ" -# -# Note: some silliness with pronouns and the adjacent comma mean this is -# being presented as a single string rather than two -sub processed_summary_string { - my ( $problem, $c ) = @_; - my ($duration_clause, $external_ref_clause); - if ($problem->whensent) { - $duration_clause = $problem->duration_string($c); - } - if ($problem->can_display_external_id) { - if ($duration_clause) { - $external_ref_clause = '<strong>' . sprintf(_('Council ref: %s'), $problem->external_id) . '.</strong>'; - } else { - $external_ref_clause = '<strong>' . sprintf(_('%s ref: %s'), $problem->external_body, $problem->external_id) . '.</strong>'; - } - } - if ($duration_clause and $external_ref_clause) { - return "$duration_clause. $external_ref_clause" - } else { - return $duration_clause || $external_ref_clause - } -} - sub duration_string { my ( $problem, $c ) = @_; my $body = $problem->body( $c ); diff --git a/templates/web/base/report/_council_sent_info.html b/templates/web/base/report/_council_sent_info.html index 4496611e0..affc73414 100644 --- a/templates/web/base/report/_council_sent_info.html +++ b/templates/web/base/report/_council_sent_info.html @@ -1,5 +1,17 @@ [% IF problem.whensent || problem.can_display_external_id %] <p class="council_sent_info"> - [% problem.processed_summary_string(c) %] + [% SET duration_clause = problem.duration_string(c) IF problem.whensent %] + [%- IF problem.can_display_external_id %] + [%- IF duration_clause %] + [%- external_ref_clause = tprintf(loc('Council ref: %s'), problem.external_id) %] + [%- ELSE %] + [%- external_ref_clause = tprintf(loc('%s ref: %s'), problem.external_body, problem.external_id) %] + [%- END %] + [%- END -%] + [% duration_clause %] + [%- IF external_ref_clause %] + [%- IF duration_clause %]. [% END %] + <strong>[% external_ref_clause %].</strong> + [%- END %] </p> [% END %] |