Merge branch '1383-remove-dead-projects'

mysociety · Apr 22, 2016 · c923ee7 · c923ee7
2 parents c9d7be8 + 66eb844
commit c923ee7
Show file tree

Hide file tree

Showing 245 changed files with 319 additions and 8,843 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,8 +27,6 @@ before_install:
 install:
   - .travis/install
 before_script:
-  - ./bin/make_po FixMyStreet-EmptyHomes
-  - ./bin/emptyhomes/make_welsh_po
   - commonlib/bin/gettext-makemo FixMyStreet
 script: "bin/run-tests t"
 after_success:

diff --git a/bin/emptyhomes/canonicalise-eha b/bin/emptyhomes/canonicalise-eha
diff --git a/bin/emptyhomes/make_welsh_po b/bin/emptyhomes/make_welsh_po
diff --git a/bin/gettext-extract b/bin/gettext-extract
@@ -20,7 +20,7 @@ rm -f $PO
 
 # we don't want to extract strings from all the cobrand templates so list
 # the ones we care about
-find templates/web/base templates/web/fixmystreet templates/web/zurich -name '*.html' > template_list
+find templates/web/base templates/web/zurich -name '*.html' > template_list
 
 # Extract from Perl
 xgettext.pl --gnu-gettext --verbose --output $PO --plugin perl=* --plugin tt2 --directory perllib -f template_list --directory db --directory bin
@@ -34,6 +34,3 @@ bin/update_po_header.bash $PO
 
 echo "$( bin/gettext-nget-patch )" >> $PO
 
-#bin/make_po FixMyStreet-EmptyHomes
-#bin/make_po FixMyBarangay
-
diff --git a/bin/gettext-merge b/bin/gettext-merge
@@ -14,11 +14,6 @@ do
     then
         cd $X/LC_MESSAGES
         echo $X
-        if [ -e EmptyHomes.po ]
-        then
-            msgmerge --no-wrap -o New.po EmptyHomes.po ../../FixMyStreet-EmptyHomes.po
-            mv New.po EmptyHomes.po
-        fi
         if [ -e FixMyStreet.po ]
         then
             msgmerge --no-wrap -o New.po FixMyStreet.po ../../FixMyStreet.po

diff --git a/bin/install-as-user b/bin/install-as-user
@@ -133,8 +133,6 @@ echo $DONE_MSG
 
 # Generate po and mo files (these invocations taken from Kagee's script):
 echo "Creating locale .mo files"
-bin/make_po FixMyStreet-EmptyHomes
-bin/emptyhomes/make_welsh_po
 commonlib/bin/gettext-makemo FixMyStreet
 echo $DONE_MSG
 

diff --git a/bin/problem-creation-graph b/bin/problem-creation-graph
@@ -34,7 +34,6 @@ my %config = (
 my $base_url = FixMyStreet->config('BASE_URL');
 $config{date} = '2007-02-01';
 $config{date} = '2011-03-03' if $base_url =~ /fiksgatami/;
-$config{date} = '2008-10-01' if $base_url =~ /emptyhomes/;
 
 my %sources;
 sub grab_data {

diff --git a/bin/update-all-reports b/bin/update-all-reports
@@ -81,14 +81,6 @@ while ( my @problem = $problems->next ) {
     }
 }
 
-if ( FixMyStreet->config('BASE_URL') =~ /emptyhomes/ ) {
-    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('emptyhomes')->new();
-    my $stats = $cobrand->old_site_stats;
-    foreach (keys %$stats) {
-        $open{$_}{unknown} += $stats->{$_};
-    }
-}
-
 my $body = encode_json( {
     fixed => \%fixed,
     open  => \%open,

diff --git a/perllib/CronFns.pm b/perllib/CronFns.pm
@@ -26,20 +26,14 @@ sub options {
 sub site {
     my $base_url = shift;
     my $site = 'fixmystreet';
-    $site = 'emptyhomes' if $base_url =~ 'emptyhomes';
     $site = 'zurich' if $base_url =~ /zurich|zueri/;
     return $site;
 }
 
 sub language {
     my $site = shift;
-    if ($site eq 'emptyhomes') {
-        mySociety::Locale::negotiate_language('en-gb,English,en_GB|cy,Cymraeg,cy_GB');
-        mySociety::Locale::gettext_domain('FixMyStreet-EmptyHomes', 1);
-    } else {
-        mySociety::Locale::negotiate_language('en-gb,English,en_GB|nb,Norwegian,nb_NO'); # XXX Testing
-        mySociety::Locale::gettext_domain('FixMyStreet', 1);
-    }
+    mySociety::Locale::negotiate_language('en-gb,English,en_GB|nb,Norwegian,nb_NO'); # XXX Testing
+    mySociety::Locale::gettext_domain('FixMyStreet', 1);
 }
 
 1;
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -345,8 +345,6 @@ sub update_contacts : Private {
         $errors{email} = _('Please enter a valid email') unless is_valid_email($email) || $email eq 'REFUSED';
         $errors{note} = _('Please enter a message') unless $c->get_param('note');
 
-        $category = 'Empty property' if $c->cobrand->moniker eq 'emptyhomes';
-
         my $contact = $c->model('DB::Contact')->find_or_new(
             {
                 body_id => $c->stash->{body_id},
@@ -743,16 +741,6 @@ sub report_edit : Path('report_edit') : Args(1) {
 
         my $new_state = $c->get_param('state');
         my $old_state = $problem->state;
-        if (   $new_state eq 'confirmed'
-            && $problem->state eq 'unconfirmed'
-            && $c->cobrand->moniker eq 'emptyhomes' )
-        {
-            $c->stash->{status_message} =
-                '<p><em>'
-              . _('I am afraid you cannot confirm unconfirmed reports.')
-              . '</em></p>';
-            $done = 1;
-        }
 
         my $flagged = $c->get_param('flagged') ? 1 : 0;
         my $non_public = $c->get_param('non_public') ? 1 : 0;

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -47,7 +47,7 @@ sub index : Path : Args(0) {
     }
 
     # Check to see if the spot is covered by a area - if not show an error.
-    return unless $c->cobrand->moniker eq 'fixmybarangay' || $c->forward('check_location_is_acceptable');
+    return unless $c->forward('check_location_is_acceptable');
 
     # If we have a partial - redirect to /report/new so that it can be
     # completed.
@@ -182,7 +182,7 @@ sub display_location : Private {
 
     # create a list of all the pins
     my @pins;
-    unless ($c->get_param('no_pins') || $c->cobrand->moniker eq 'emptyhomes') {
+    unless ($c->get_param('no_pins')) {
         @pins = map {
             # Here we might have a DB::Problem or a DB::Nearby, we always want the problem.
             my $p = (ref $_ eq 'FixMyStreet::App::Model::DB::Nearby') ? $_->problem : $_;

diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -47,14 +47,6 @@ sub check_questionnaire : Private {
 
     $c->stash->{problem} = $problem;
     $c->stash->{answered_ever_reported} = $problem->user->answered_ever_reported;
-
-    # EHA needs to know how many to alter display, and whether to send another or not
-    if ($c->cobrand->moniker eq 'emptyhomes') {
-        $c->stash->{num_questionnaire} = $c->model('DB::Questionnaire')->count(
-            { problem_id => $problem->id }
-        );
-    }
-
 }
 
 =head2 submit
@@ -236,11 +228,6 @@ sub process_questionnaire : Private {
 
     $c->stash->{update} = Utils::cleanup_text($c->stash->{update}, { allow_multiline => 1 });
 
-    # EHA questionnaires done for you
-    if ($c->cobrand->moniker eq 'emptyhomes') {
-        $c->stash->{another} = $c->stash->{num_questionnaire}==1 ? 'Yes' : 'No';
-    }
-
     my @errors;
     push @errors, _('Please state whether or not the problem has been fixed')
         unless $c->stash->{been_fixed};

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -230,7 +230,7 @@ to moderation, however we'd need to inform all the other
 users too about this change, at which point we can delete:
 
  - this method
- - the call to it in templates/web/fixmystreet/report/display.html
+ - the call to it in templates/web/base/report/display_tools.html
  - the users_can_hide cobrand method, in favour of user->has_permission_to
 
 =cut