From 65efffdd2443bebaf35a0d1555cf56bde6ba44d6 Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@symbiotic.coop>
Date: Fri, 8 Jan 2021 09:12:32 -0500
Subject: [PATCH] Fix Contribution Soft Credit entity translation

---
 CRM/Contribute/DAO/ContributionSoft.php    | 2 +-
 CRM/Mailing/DAO/Recipients.php             | 2 +-
 CRM/Mailing/Event/DAO/Delivered.php        | 2 +-
 CRM/Mailing/Event/DAO/Opened.php           | 2 +-
 xml/schema/Contribute/ContributionSoft.xml | 4 ++++
 xml/schema/Contribute/PremiumsProduct.xml  | 2 ++
 xml/schema/Mailing/Event/Bounce.xml        | 2 ++
 xml/schema/Mailing/Event/Confirm.xml       | 2 ++
 xml/schema/Mailing/Event/Delivered.xml     | 2 ++
 xml/schema/Mailing/Event/Forward.xml       | 2 ++
 xml/schema/Mailing/Event/Opened.xml        | 2 ++
 xml/schema/Mailing/Event/Queue.xml         | 2 ++
 12 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php
index 261c59214e..43c518b8dd 100644
--- a/CRM/Contribute/DAO/ContributionSoft.php
+++ b/CRM/Contribute/DAO/ContributionSoft.php
@@ -110,7 +110,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Contribution Softs') : ts('Contribution Soft');
+    return $plural ? ts('Contribution Soft Credits') : ts('Contribution Soft Credit');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/Recipients.php b/CRM/Mailing/DAO/Recipients.php
index 0a0ff212da..7a73e6dc47 100644
--- a/CRM/Mailing/DAO/Recipients.php
+++ b/CRM/Mailing/DAO/Recipients.php
@@ -79,7 +79,7 @@ class CRM_Mailing_DAO_Recipients extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Recipientses') : ts('Recipients');
+    return $plural ? ts('Recipients') : ts('Recipient');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Delivered.php b/CRM/Mailing/Event/DAO/Delivered.php
index 413939c50e..8b54488ae9 100644
--- a/CRM/Mailing/Event/DAO/Delivered.php
+++ b/CRM/Mailing/Event/DAO/Delivered.php
@@ -65,7 +65,7 @@ class CRM_Mailing_Event_DAO_Delivered extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Delivereds') : ts('Delivered');
+    return $plural ? ts('Mailing Delivered Events') : ts('Mailing Delivered Event');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Opened.php b/CRM/Mailing/Event/DAO/Opened.php
index aab7ac9dbe..1dff1102f5 100644
--- a/CRM/Mailing/Event/DAO/Opened.php
+++ b/CRM/Mailing/Event/DAO/Opened.php
@@ -65,7 +65,7 @@ class CRM_Mailing_Event_DAO_Opened extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Openeds') : ts('Opened');
+    return $plural ? ts('Mailing Opened Events') : ts('Mailing Opened Event');
   }
 
   /**
diff --git a/xml/schema/Contribute/ContributionSoft.xml b/xml/schema/Contribute/ContributionSoft.xml
index fc1dac96ee..62144ff625 100644
--- a/xml/schema/Contribute/ContributionSoft.xml
+++ b/xml/schema/Contribute/ContributionSoft.xml
@@ -4,9 +4,13 @@
   <base>CRM/Contribute</base>
   <class>ContributionSoft</class>
   <name>civicrm_contribution_soft</name>
+  <title>Contribution Soft Credit</title>
+  <titlePlural>Contribution Soft Credits</titlePlural>
   <add>2.2</add>
   <log>true</log>
   <component>CiviContribute</component>
+  <title>Contribution Soft Credit</title>
+  <titlePlural>Contribution Soft Credits</titlePlural>
   <field>
     <name>id</name>
     <uniqueName>contribution_soft_id</uniqueName>
diff --git a/xml/schema/Contribute/PremiumsProduct.xml b/xml/schema/Contribute/PremiumsProduct.xml
index d2fe7456de..8e88bd7574 100644
--- a/xml/schema/Contribute/PremiumsProduct.xml
+++ b/xml/schema/Contribute/PremiumsProduct.xml
@@ -8,6 +8,8 @@
   <add>1.4</add>
   <log>true</log>
   <component>CiviContribute</component>
+  <title>Product Premium</title>
+  <titlePlural>Product Premiums</titlePlural>
   <field>
     <name>id</name>
     <title>Premium Product ID</title>
diff --git a/xml/schema/Mailing/Event/Bounce.xml b/xml/schema/Mailing/Event/Bounce.xml
index 8eae87a4a1..0fa36fbc66 100644
--- a/xml/schema/Mailing/Event/Bounce.xml
+++ b/xml/schema/Mailing/Event/Bounce.xml
@@ -7,6 +7,8 @@
   <comment>Tracks when and why an email bounced.</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Mailing Bounce Event</title>
+  <titlePlural>Mailing Bounce Events</titlePlural>
   <field>
     <name>id</name>
     <title>Bounce ID</title>
diff --git a/xml/schema/Mailing/Event/Confirm.xml b/xml/schema/Mailing/Event/Confirm.xml
index cd0b389f77..5e2156e8fe 100644
--- a/xml/schema/Mailing/Event/Confirm.xml
+++ b/xml/schema/Mailing/Event/Confirm.xml
@@ -7,6 +7,8 @@
   <comment>Tracks when a subscription event is confirmed by email</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Mailing Confirmation Event</title>
+  <titlePlural>Mailing Contribution Events</titlePlural>
   <field>
     <name>id</name>
     <title>Mailing Confirmation ID</title>
diff --git a/xml/schema/Mailing/Event/Delivered.xml b/xml/schema/Mailing/Event/Delivered.xml
index 350ba3e5f0..af5aee8c3f 100644
--- a/xml/schema/Mailing/Event/Delivered.xml
+++ b/xml/schema/Mailing/Event/Delivered.xml
@@ -7,6 +7,8 @@
   <comment>Tracks when a queued email is actually delivered to the MTA</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Mailing Delivery Event</title>
+  <titlePlural>Mailing Delivery Events</titlePlural>
   <field>
     <name>id</name>
     <title>Delivered ID</title>
diff --git a/xml/schema/Mailing/Event/Forward.xml b/xml/schema/Mailing/Event/Forward.xml
index a869288416..13c21b57d5 100644
--- a/xml/schema/Mailing/Event/Forward.xml
+++ b/xml/schema/Mailing/Event/Forward.xml
@@ -7,6 +7,8 @@
   <comment>Tracks when a contact forwards a mailing to a (new) contact</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Mailing Forwarded Event</title>
+  <titlePlural>Mailing Forwarded Events</titlePlural>
   <field>
     <name>id</name>
     <title>Forward ID</title>
diff --git a/xml/schema/Mailing/Event/Opened.xml b/xml/schema/Mailing/Event/Opened.xml
index befb98fe87..95a87a1b20 100644
--- a/xml/schema/Mailing/Event/Opened.xml
+++ b/xml/schema/Mailing/Event/Opened.xml
@@ -7,6 +7,8 @@
   <comment>Tracks when a delivered email is opened by the recipient</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Mailing Opened Event</title>
+  <titlePlural>Mailing Opened Events</titlePlural>
   <field>
     <name>id</name>
     <title>Mailing Opened ID</title>
diff --git a/xml/schema/Mailing/Event/Queue.xml b/xml/schema/Mailing/Event/Queue.xml
index 6f3a872779..7abc22afbb 100644
--- a/xml/schema/Mailing/Event/Queue.xml
+++ b/xml/schema/Mailing/Event/Queue.xml
@@ -7,6 +7,8 @@
   <comment>A collection of all intended recipients of a job</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Mailing Queue Event</title>
+  <titlePlural>Mailing Queue Events</titlePlural>
   <field>
     <name>id</name>
     <type>int unsigned</type>
-- 
2.25.1