Fix text-entities statistics, clean ups (#330)

* Fix text-entities statistics, clean ups
* Tests in positive form, use direct count

Author: alfsb

entities/normal.ent-dist

@@ -42,10 +42,15 @@
     exit;
 }
 
-$lang = $argv[1];
-$revc = new RevcheckRun( 'en' , $argv[1] );
-$data = $revc->revData;
+$lang = rtrim( $argv[1] , "/" );
+if ( $lang == 'en' )
+{
+    print "{$argv[0]} cannot run on doc-en.\n";
+    exit( 1 );
+}
 
+$revc = new RevcheckRun( 'en' , $lang );
+$data = $revc->revData;
 print_html_all( $data );
 
 // Output

entities/remove.ent-dist

@@ -225,46 +225,47 @@ static function checkReplaces( bool $debug )
 
         foreach( Entities::$merged as $name => $null )
         {
-            $replaced = Entities::$nameCount[$name] - 1;
-            $languages = Entities::$countLanguages;
+            $count = Entities::$nameCount[$name];
+            $singleLang = Entities::$countLanguages == 1;
+            $translation = Entities::$countLanguages > 1;
             $entityUnique = in_array( $name , Entities::$unique );
             $entityRemove  = in_array( $name , Entities::$remove );
             $entityNormal = ! ( $entityUnique || $entityRemove );
 
-            if ( $entityUnique && $replaced != 0 )
+            if ( $entityUnique && $count != 1 )
             {
                 Entities::$countOtherFailures++;
                 if ( $debug )
-                    print " Unique entity, redefined $replaced times: $name\n";
+                    print " Unique entity, defined $count times: $name\n";
             }
 
-            if ( $entityRemove && $replaced != 0 )
+            if ( $entityRemove && $count != 1 )
             {
                 Entities::$countOtherFailures++;
                 if ( $debug )
-                    print " Remove entity, redefined $replaced times: $name\n";
+                    print " Remove entity, defined $count times: $name\n";
             }
 
-            if ( $entityNormal && $languages == 1 && $replaced != 0 )
+            if ( $entityNormal && $count != 1 && $singleLang )
             {
                 Entities::$countOtherFailures++;
                 if ( $debug )
-                    print " Normal entity, redefined $replaced times: $name\n";
+                    print " Normal entity, defined $count times: $name\n";
             }
 
-            if ( $entityNormal && $languages != 1 )
+            if ( $entityNormal && $translation )
             {
-                if ( $replaced == 0 )
+                if ( $count == 1 )
                 {
                     Entities::$countTransFailures++;
                     if ( $debug )
-                        print " Not translated:                   $name\n";
+                        print " Not translated:                 $name\n";
                 }
-                else
+                if ( $count > 2 )
                 {
                     Entities::$countOtherFailures++;
                     if ( $debug )
-                        print " Multiple redefined/translated:    $name\n";
+                        print " Multiple redefined/translated:  $name\n";
                 }
             }
         }