Ticket #173: gp.173.diff

scripts/import-originals.php

@@ -22 +22 @@
                         $this->error( __("Couldn't load translations from file!") );
                 }
 
-                list( $originals_added, $originals_existing ) = GP::$original->import_for_project( $project, $translations );
-                echo sprintf( __("%s new strings were added, %s existing were updated."), $originals_added, $originals_existing )."\n";
+                list( $originals_added, $originals_existing, $originals_obsoleted ) = GP::$original->import_for_project( $project, $translations );
+                echo sprintf( __("%s new strings were added, %s existing were updated, %s were removed."), $originals_added, $originals_existing, $originals_obsoleted )."\n";
         }
 }
 

gp-includes/things/original.php

@@ -56 +56 @@
         function import_for_project( $project, $translations ) {
                 global $gpdb;
                 wp_cache_delete( $project->id, self::$count_cache_group );
-                $originals_added = $originals_existing = 0;
+                $originals_added = $originals_existing = $originals_obsoleted = 0;
                 $all_originals_for_project = $this->many_no_map( "SELECT * FROM $this->table WHERE project_id= %d", $project->id );
                 $originals_by_key = array();
                 foreach( $all_originals_for_project as $original ) {
@@ -84 +84 @@
                 // Mark previously active, but now removed strings as obsolete
                 foreach ( $originals_by_key as $key => $value) {
                         if ( !key_exists($key, $translations->entries ) ) {
-                                $this->update( array('status' => '-obsolete'), array( 'id' => $original->id ) );
+                                $this->update( array('status' => '-obsolete'), array( 'id' => $value->id ) );
+                                $originals_obsoleted++;
                         }
                 }
-                return array( $originals_added, $originals_existing );
+                return array( $originals_added, $originals_existing, $originals_obsoleted );
         }
 
         function should_be_updated_with( $data, $original = null ) {