2 files changed, 38 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm
index d8695683c..affc6d480 100644
--- a/perllib/FixMyStreet/DB/Result/Contact.pm
+++ b/perllib/FixMyStreet/DB/Result/Contact.pm
@@ -93,6 +93,21 @@ __PACKAGE__->many_to_many( response_templates => 'contact_response_templates', '
 __PACKAGE__->many_to_many( response_priorities => 'contact_response_priorities', 'response_priority' );
 __PACKAGE__->many_to_many( defect_types => 'contact_defect_types', 'defect_type' );
 
+__PACKAGE__->might_have(
+  "translations",
+  "FixMyStreet::DB::Result::Translation",
+  sub {
+    my $args = shift;
+    return {
+        "$args->{foreign_alias}.object_id" => { -ident => "$args->{self_alias}.id" },
+        "$args->{foreign_alias}.tbl" => { '=' => \"?" },
+        "$args->{foreign_alias}.col" => { '=' => \"?" },
+        "$args->{foreign_alias}.lang" => { '=' => \"?" },
+    };
+  },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
+
 sub category_display {
     my $self = shift;
     $self->get_extra_metadata('display_name') || $self->translate_column('category');
diff --git a/perllib/FixMyStreet/DB/ResultSet/Contact.pm b/perllib/FixMyStreet/DB/ResultSet/Contact.pm
index 7b3258262..1643f9931 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Contact.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Contact.pm
@@ -3,6 +3,7 @@ use base 'DBIx::Class::ResultSet';
 
 use strict;
 use warnings;
+use POSIX qw(strcoll);
 
 sub me { join('.', shift->current_source_alias, shift || q{})  }
 
@@ -24,6 +25,28 @@ sub active {
     $rs->search( { $rs->me('state') => [ 'unconfirmed', 'confirmed' ] } );
 }
 
+sub translated {
+    my $rs = shift;
+    my $schema = $rs->result_source->schema;
+    $rs->search(undef, {
+        '+columns' => { 'msgstr' => 'translations.msgstr' },
+        join => 'translations',
+        bind => [ 'category', $schema->lang, 'contact' ],
+    });
+}
+
+sub all_sorted {
+    my $rs = shift;
+
+    my @contacts = $rs->translated->all;
+    @contacts = sort {
+        my $a_name = $a->get_extra_metadata('display_name') || $a->get_column('msgstr') || $a->category;
+        my $b_name = $b->get_extra_metadata('display_name') || $b->get_column('msgstr') || $b->category;
+        strcoll($a_name, $b_name)
+    } @contacts;
+    return @contacts;
+}
+
 sub summary_count {
     my ( $rs, $restriction ) = @_;