[AppDB] Resend: Fix typos and grammatical errors on test result pages

["Alexander N. Sørnes"]

Is there any reason why this patch was rejected?  I am not used to
sending AppDB patches, so please let me know if there is something wrong
with it.

This patch fixes some typos reported by Rich, and a few grammatical
errors I found while fixing it.

Regards,

Alexander N. Sørnes

Index: testResults.php
===================================================================
RCS file: /home/wine/appdb/testResults.php,v
retrieving revision 1.3
diff -u -p -r1.3 testResults.php
--- testResults.php	23 Jan 2006 02:10:31 -0000	1.3
+++ testResults.php	30 Apr 2006 11:48:05 -0000
@@ -1,6 +1,6 @@
 <?php
 /**************************************************/
-/* code to submit, view and resubmit Test Results */
+/* Code to submit, view and resubmit Test Results */
 /**************************************************/

include("path.php");
@@ -111,10 +111,10 @@ if ($_REQUEST['sub'])

//help
-        echo "<p>This is the Screen for imputting testing information so that others looking at the database will know \n";
-        echo "what was working or a particular release of Wine.</p>\n";
+        echo "<p>This is the screen for inputting testing information so that others looking at the database will know \n";
+        echo "what was working in a particular release of Wine.</p>\n";
         echo "<p>Please be as detailed as you can.</p>\n";
-        echo "<p>If you can not find your distribution on the list of existing Distributions please add it add it in the \n";
+        echo "<p>If you can not find your distribution in the list of existing Distributions, please add it in the \n";
         echo "field provided.</p>\n\n";

if(!empty($errors))
@@ -177,7 +177,7 @@ else // if ($_REQUEST['sub']) is not def
     {
         // help
         echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
-        echo "<p>This is the list of Test Results waiting for submition, or to be deleted.</p>\n";
+        echo "<p>This is the list of Test Results waiting for submission, or to be deleted.</p>\n";
         echo "<p>To view a submission, click on its name. From that page you can delete or edit and\n";
         echo "re-submit it into the AppDB .<br>\n";
         echo "</td></tr></table></div>\n\n";
@@ -200,7 +200,7 @@ else // if ($_REQUEST['sub']) is not def
         echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
         echo "<p>This is the list of Rejected Test Results waiting for re-submition or deletion.</p>\n";
         echo "<p>To view a submission, click on its name. From that page you can delete or edit and re-submit it into \n";
-        echo "the AppDB .<br>\n";
+        echo "the AppDB.<br>\n";
         echo "</td></tr></table></div>\n\n";

$oTest->ShowListofTests($hResult,"Rejected Testing Results");

[AppDB] Resend: Fix typos and grammatical errors on test result pages

[KGJ]

Hi,

Alexander N. Sørnes wrote:
> Is there any reason why this patch was rejected?  I am not used to
> sending AppDB patches, so please let me know if there is something wrong
> with it.
>
> This patch fixes some typos reported by Rich, and a few grammatical
> errors I found while fixing it.
>
> Regards,
>
> Alexander N. Sørnes
> Index: testResults.php
>
> RCS file: /home/wine/appdb/testResults.php,v
> retrieving revision 1.3
> diff -u -p -r1.3 testResults.php
> --- testResults.php	23 Jan 2006 02:10:31 -0000	1.3
> +++ testResults.php	30 Apr 2006 11:48:05 -0000
> @@ -1,6 +1,6 @@
>  <?php
>  /**************************************************/
> -/* code to submit, view and resubmit Test Results */
> +/* Code to submit, view and resubmit Test Results */
>  /**************************************************/
>
> include("path.php");
> @@ -111,10 +111,10 @@ if ($_REQUEST['sub'])
>      //help
> -
>    echo "<p>This is the Screen for imputting testing information so that others looking at the database will know \n";
> -
>    echo "what was working or a particular release of Wine.</p>\n";
> -
>    echo "<p>This is the screen for inputting testing information so that others looking at the database will know \n";
> -
>    echo "what was working in a particular release of Wine.</p>\n";
>    echo "<p>Please be as detailed as you can.</p>\n";
> -
>    echo "<p>If you can not find your distribution on the list of existing Distributions please add it add it in the \n";
> -
>    echo "<p>If you can not find your distribution in the list of existing Distributions, please add it in the \n";
>    echo "field provided.</p>\n\n";        
>
>    if(!empty($errors))
>
> @@ -177,7 +177,7 @@ else // if ($_REQUEST['sub']) is not def
>      {
>          // help
>          echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
> -
>    echo "<p>This is the list of Test Results waiting for submition, or to be deleted.</p>\n";
> -
>    echo "<p>This is the list of Test Results waiting for submission, or to be deleted.</p>\n";
>    echo "<p>To view a submission, click on its name. From that page you can delete or edit and\n";
>    echo "re-submit it into the AppDB .<br>\n";
>    echo "</td></tr></table></div>\n\n";
>
> @@ -200,7 +200,7 @@ else // if ($_REQUEST['sub']) is not def
>          echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
>          echo "<p>This is the list of Rejected Test Results waiting for re-submition or deletion.</p>\n";

Shouldn't this line be also:

echo "<p>This is the list of Rejected Test Results waiting for re-submission or deletion.</p>\n";

or

echo "<p>This is the list of rejected Test Results waiting for re-submission or deletion.</p>\n";

? OK, that's not wrong with your patch but with the original file. I
just noticed it while reading...
>      echo "<p>To view a submission, click on its name. From that page you can delete or edit and re-submit it into \n";
> -
>    echo "the AppDB .<br>\n";
> -
>    echo "the AppDB.<br>\n";
>    echo "</td></tr></table></div>\n\n";
>
>    $oTest->ShowListofTests($hResult,"Rejected Testing Results");

Greetings KGJ

["Alexander N. Sørnes"]

This patch fixes some typos reported by Rich, and a few grammatical
errors I found while fixing it.
UPDATED to include some more fixes.  Rename 'testing results' to 'test results', and remove some odd capitalizations.

KGJ skrev:
> > Index: testResults.php
> >
> > RCS file: /home/wine/appdb/testResults.php,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 testResults.php
> > --- testResults.php	23 Jan 2006 02:10:31 -0000	1.3
> > +++ testResults.php	30 Apr 2006 11:48:05 -0000
> > @@ -1,6 +1,6 @@
> > <?php
> > /**************************************************/
> > -/* code to submit, view and resubmit Test Results */
> > +/* Code to submit, view and resubmit Test Results */
> > /**************************************************/
> >
> > include("path.php");
> > @@ -111,10 +111,10 @@ if ($_REQUEST['sub'])
> >     //help
> > -
> >    echo "<p>This is the Screen for imputting testing information so that others looking at the database will know \n";
> > -
> >    echo "what was working or a particular release of Wine.</p>\n";
> > -
> >    echo "<p>This is the screen for inputting testing information so that others looking at the database will know \n";
> > -
> >    echo "what was working in a particular release of Wine.</p>\n";
> >   echo "<p>Please be as detailed as you can.</p>\n";
> > -
> >    echo "<p>If you can not find your distribution on the list of existing Distributions please add it add it in the \n";
> > -
> >    echo "<p>If you can not find your distribution in the list of existing Distributions, please add it in the \n";
> >   echo "field provided.</p>\n\n";        
> >
> >   if(!empty($errors))
> >
> > @@ -177,7 +177,7 @@ else // if ($_REQUEST['sub']) is not def
> >     {
> >         // help
> >         echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
> > -
> >    echo "<p>This is the list of Test Results waiting for submition, or to be deleted.</p>\n";
> > -
> >    echo "<p>This is the list of Test Results waiting for submission, or to be deleted.</p>\n";
> >   echo "<p>To view a submission, click on its name. From that page you can delete or edit and\n";
> >   echo "re-submit it into the AppDB .<br>\n";
> >   echo "</td></tr></table></div>\n\n";
> >
> > @@ -200,7 +200,7 @@ else // if ($_REQUEST['sub']) is not def
> >         echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
> >         echo "<p>This is the list of Rejected Test Results waiting for re-submition or deletion.</p>\n";
>
> Shouldn't this line be also:
>
> echo "<p>This is the list of Rejected Test Results waiting for re-submission or deletion.</p>\n";
>
> or
>
> echo "<p>This is the list of rejected Test Results waiting for re-submission or deletion.</p>\n";
>
> ? OK, that's not wrong with your patch but with the original file. I
> just noticed it while reading...

Thanks!  I guess I should have read through the file a bit more 
thoroughly . . .
Please use the new patch instead.
> >     echo "<p>To view a submission, click on its name. From that page you can delete or edit and re-submit it into \n";
> > -
> >    echo "the AppDB .<br>\n";
> > -
> >    echo "the AppDB.<br>\n";
> >   echo "</td></tr></table></div>\n\n";
> >
> >   $oTest->ShowListofTests($hResult,"Rejected Testing Results");
>
> Greetings KGJ

Index: testResults.php
===================================================================
RCS file: /home/wine/appdb/testResults.php,v
retrieving revision 1.3
diff -u -p -r1.3 testResults.php
--- testResults.php	23 Jan 2006 02:10:31 -0000	1.3
+++ testResults.php	26 May 2006 12:24:28 -0000
@@ -1,6 +1,6 @@
 <?php
 /**************************************************/
-/* code to submit, view and resubmit Test Results */
+/* Code to submit, view and resubmit test results */
 /**************************************************/

include("path.php");
@@ -20,11 +20,11 @@ if ($_REQUEST['sub'])
         $oTest->iVersionId = $_REQUEST['iVersionId'];
     $errors = "";

-    // Submit or Resubmit the new testing results
+    // Submit or resubmit the new test results
     if (($_REQUEST['sub'] == 'Submit') || ($_REQUEST['sub'] == 'Resubmit'))
     {
         $errors = $oTest->CheckOutputEditorInput();
-        $oTest->GetOutputEditorValues(); // retrieve the values from the current $_REQUEST 
+        $oTest->GetOutputEditorValues(); // Retrieve the values from the current $_REQUEST 
         if(empty($errors))
         {
             if(!$_REQUEST['iDistributionId'])
@@ -53,7 +53,7 @@ if ($_REQUEST['sub'])
         }
     }

-    // Delete testing results
+    // Delete test results
     if ($_REQUEST['sub'] == 'Delete')
     {
         if(is_numeric($_REQUEST['iTestingId']))
@@ -65,10 +65,10 @@ if ($_REQUEST['sub'])
         redirect($_SERVER['PHP_SELF']);
     }

-    // is this an old test?
+    // Is this an old test?
     if(is_numeric($_REQUEST['iTestingId']))
     {
-        // make sure the user has permission to view this testing result
+        // Make sure the user has permission to view these test results
         $oVersion = new Version($oTest->iVersionId);
         if(!$_SESSION['current']->hasPriv("admin") && 
            !$_SESSION['current']->hasAppVersionModifyPermission($oVersion)&&
@@ -92,29 +92,29 @@ if ($_REQUEST['sub'])
         switch($oTest->sQueued)
         {
         case "new":
-            apidb_header("Submit new testing results for ".$sVersionInfo);
+            apidb_header("Submit new test results for ".$sVersionInfo);
             $oTest->sTestedDate = date('Y-m-d H:i:s');
             break;
         case "true":
-            apidb_header("Edit new testing results for ".$sVersionInfo);
+            apidb_header("Edit new test results for ".$sVersionInfo);
             break;
         case "rejected":
-            apidb_header("Resubmit testing results for ".$sVersionInfo);
+            apidb_header("Resubmit test results for ".$sVersionInfo);
             break;
         case "False":
-            apidb_header("Edit testing results for ".$sVersionInfo);
+            apidb_header("Edit test results for ".$sVersionInfo);
             break;
         default:
-            apidb_header("Edit testing results for ");
+            apidb_header("Edit test results for ");
         }
         echo '<form name="qform" action="'.$_SERVER['PHP_SELF'].'" method="post" enctype="multipart/form-data">',"\n";

//help
-        echo "<p>This is the Screen for imputting testing information so that others looking at the database will know \n";
-        echo "what was working or a particular release of Wine.</p>\n";
+        echo "<p>This is the screen for inputting testing information so that others looking at the database will know \n";
+        echo "what was working in a particular release of Wine.</p>\n";
         echo "<p>Please be as detailed as you can.</p>\n";
-        echo "<p>If you can not find your distribution on the list of existing Distributions please add it add it in the \n";
+        echo "<p>If you can not find your distribution in the list of existing distributions, please add it in the \n";
         echo "field provided.</p>\n\n";

if(!empty($errors))
@@ -125,7 +125,7 @@ if ($_REQUEST['sub'])
             echo '<p></p>',"\n";
         }

-        // View Testing Details
+        // View test details
         $oTest->OutputEditor($_REQUEST['sDistribution'],true);

echo '<a href="'.BASE."appview.php?versionId=".$oTest->iVersionId.'">Back to Version</a>';
@@ -133,7 +133,7 @@ if ($_REQUEST['sub'])
         echo '<tr valign=top><td class=color3 align=center colspan=2>',"\n";

-        // Submit Buttons
+        // Submit buttons
         switch($oTest->sQueued)
         {
         case "new":
@@ -154,56 +154,56 @@ if ($_REQUEST['sub'])
     else 
     {
         // error no sub!
-        addmsg("Internal Routine Not Found!!", "red");
+        addmsg("Internal routine not found!!", "red");
         redirect($_SERVER['PHP_SELF']);
     } 
 } 
-else // if ($_REQUEST['sub']) is not defined, display the Testing results queue page 
+else // if ($_REQUEST['sub']) is not defined, display the test results queue page 
 {
-    apidb_header("Testing Results");
+    apidb_header("Test results");

-    // Get queued testing results.
+    // Get queued test results.
     $oTest = new TestData();
     $hResult = $oTest->getTestingQueue("true");

if(!$hResult)
     {
-        // no Tests in queue
-        echo html_frame_start("Submitted Testing Results","90%");
-        echo '<p><b>The Submitted Testng Results Queue is empty.</b></p>',"\n";
+        // no tests in queue
+        echo html_frame_start("Submitted test results","90%");
+        echo '<p><b>The submitted test results queue is empty.</b></p>',"\n";
         echo html_frame_end("&nbsp;");         
     }
     else
     {
         // help
         echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
-        echo "<p>This is the list of Test Results waiting for submition, or to be deleted.</p>\n";
+        echo "<p>This is the list of test results waiting to be approved or deleted.</p>\n";
         echo "<p>To view a submission, click on its name. From that page you can delete or edit and\n";
-        echo "re-submit it into the AppDB .<br>\n";
+        echo "resubmit it into the AppDB.<br>\n";
         echo "</td></tr></table></div>\n\n";

-        $oTest->ShowListofTests($hResult,"Submitted Testing Results");
+        $oTest->ShowListofTests($hResult,"Submitted test results");
     }
-    // Get rejected testing results.
+    // Get rejected test results.
     $hResult = $oTest->getTestingQueue("rejected");

if(!$hResult || !mysql_num_rows($hResult))
     {
-        //no Test Results in queue
-        echo html_frame_start("Rejected Testing Results","90%");
-        echo '<p><b>The Rejected Testng Results Queue is empty.</b></p>',"\n";
+        //no test results in queue
+        echo html_frame_start("Rejected test results","90%");
+        echo '<p><b>The rejected test results queue is empty.</b></p>',"\n";
         echo html_frame_end("&nbsp;");         
     }
     else
     {
         //help
         echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
-        echo "<p>This is the list of Rejected Test Results waiting for re-submition or deletion.</p>\n";
+        echo "<p>This is the list of rejected test results waiting for re-submission or deletion.</p>\n";
         echo "<p>To view a submission, click on its name. From that page you can delete or edit and re-submit it into \n";
-        echo "the AppDB .<br>\n";
+        echo "the AppDB.<br>\n";
         echo "</td></tr></table></div>\n\n";

-        $oTest->ShowListofTests($hResult,"Rejected Testing Results");
+        $oTest->ShowListofTests($hResult,"Rejected test results");
     }
 }
 apidb_footer();

[Chris Morgan]

This doesn't apply cleanly after EA Durbin's patch to the same file.

Chris

On Friday 26 May 2006 8:30 am, Alexander N. Sørnes wrote:
> This patch fixes some typos reported by Rich, and a few grammatical
> errors I found while fixing it.
> UPDATED to include some more fixes.  Rename 'testing results' to 'test
> results', and remove some odd capitalizations.
>
> KGJ skrev:
> > > Index: testResults.php
> > >
> > > RCS file: /home/wine/appdb/testResults.php,v
> > > retrieving revision 1.3
> > > diff -u -p -r1.3 testResults.php
> > > --- testResults.php	23 Jan 2006 02:10:31 -0000	1.3
> > > +++ testResults.php	30 Apr 2006 11:48:05 -0000
> > > @@ -1,6 +1,6 @@
> > > <?php
> > > /**************************************************/
> > > -/* code to submit, view and resubmit Test Results */
> > > +/* Code to submit, view and resubmit Test Results */
> > > /**************************************************/
> > >
> > > include("path.php");
> > > @@ -111,10 +111,10 @@ if ($_REQUEST['sub'])
> > >     //help
> > > -
> > >    echo "<p>This is the Screen for imputting testing information so
> > >
> > > that others looking at the database will know \n"; -        echo "what
> > > was working or a particular release of Wine.</p>\n"; +        echo
> > > "<p>This is the screen for inputting testing information so that others
> > > looking at the database will know \n"; +        echo "what was working
> > > in a particular release of Wine.</p>\n"; echo "<p>Please be as detailed
> > > as you can.</p>\n";
> > > -
> > >    echo "<p>If you can not find your distribution on the list of
> > >
> > > existing Distributions please add it add it in the \n"; +        echo
> > > "<p>If you can not find your distribution in the list of existing
> > > Distributions, please add it in the \n"; echo "field provided.</p>\n\n";
> > >     if(!empty($errors))
> > >
> > > @@ -177,7 +177,7 @@ else // if ($_REQUEST['sub']) is not def
> > >     {
> > >         // help
> > >         echo "<div align=center><table width='90%' border=0
> > > cellpadding=3 cellspacing=0><tr><td>\n\n"; -        echo "<p>This is the
> > > list of Test Results waiting for submition, or to be deleted.</p>\n"; + 
> > >       echo "<p>This is the list of Test Results waiting for submission,
> > > or to be deleted.</p>\n"; echo "<p>To view a submission, click on its
> > > name. From that page you can delete or edit and\n"; echo "re-submit it
> > > into the AppDB .<br>\n";
> > >         echo "</td></tr></table></div>\n\n";
> > > @@ -200,7 +200,7 @@ else // if ($_REQUEST['sub']) is not def
> > >         echo "<div align=center><table width='90%' border=0
> > > cellpadding=3 cellspacing=0><tr><td>\n\n"; echo "<p>This is the list of
> > > Rejected Test Results waiting for re-submition or deletion.</p>\n";
> >
> > Shouldn't this line be also:
> >
> > echo "<p>This is the list of Rejected Test Results waiting for
> > re-submission or deletion.</p>\n";
> >
> > or
> >
> > echo "<p>This is the list of rejected Test Results waiting for
> > re-submission or deletion.</p>\n";
> >
> > ? OK, that's not wrong with your patch but with the original file. I
> > just noticed it while reading...
>
> Thanks!  I guess I should have read through the file a bit more
> thoroughly . . .
> Please use the new patch instead.
> > >     echo "<p>To view a submission, click on its name. From that page
> > >
> > > you can delete or edit and re-submit it into \n"; -        echo "the
> > > AppDB .<br>\n";
> > > -
> > >    echo "the AppDB.<br>\n";
> > >   echo "</td></tr></table></div>\n\n";
> > >
> > >   $oTest->ShowListofTests($hResult,"Rejected Testing Results");
> >
> > Greetings KGJ