[5.0] toolbar cancel or close button

The convention is that when it is a NEW item then its a cancel button and when editing an item its a close button.

During the updates in #39537 it looks like @wilsonge missed a few changes etc

Author: brianteeman

administrator/components/com_categories/src/View/Category/HtmlView.php

@@ -201,7 +201,7 @@ function (Toolbar $childBar) {
                 }
             );
 
-            $toolbar->cancel('category.cancel');
+            $toolbar->cancel('category.cancel', 'JTOOLBAR_CANCEL');
         } else {
             // If not checked out, can save the item.
             // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.

administrator/components/com_contact/src/View/Contact/HtmlView.php

@@ -134,7 +134,7 @@ function (Toolbar $childBar) use ($user) {
                 );
             }
 
-            $toolbar->cancel('contact.cancel');
+            $toolbar->cancel('contact.cancel', 'JTOOLBAR_CANCEL');
         } else {
             // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
             $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);

administrator/components/com_fields/src/View/Field/HtmlView.php

@@ -130,7 +130,7 @@ function (Toolbar $childBar) {
                     $childBar->save2new('field.save2new');
                 }
             );
-            $toolbar->cancel('field.cancel');
+            $toolbar->cancel('field.cancel', 'JTOOLBAR_CANCEL');
         } else {
             // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
             $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);

administrator/components/com_fields/src/View/Group/HtmlView.php

@@ -154,7 +154,7 @@ function (Toolbar $childBar) {
                 }
             );
 
-            $toolbar->cancel('group.cancel');
+            $toolbar->cancel('group.cancel', 'JTOOLBAR_CANCEL');
         } else {
             // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
             $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);

administrator/components/com_finder/src/View/Filter/HtmlView.php

@@ -140,7 +140,7 @@ function (Toolbar $childBar) {
                 );
             }
 
-            $toolbar->cancel('filter.cancel');
+            $toolbar->cancel('filter.cancel', 'JTOOLBAR_CANCEL');
         } else {
             // Can't save the record if it's checked out.
             // Since it's an existing record, check the edit permission.

administrator/components/com_languages/src/View/Language/HtmlView.php

@@ -121,7 +121,7 @@ function (Toolbar $childBar) use ($canDo, $isNew) {
         );
 
         if ($isNew) {
-            $toolbar->cancel('language.cancel');
+            $toolbar->cancel('language.cancel', 'JTOOLBAR_CANCEL');
         } else {
             $toolbar->cancel('language.cancel');
         }