CiviEvent - Add labels to field metadata

diff --git a/CRM/Core/I18n/SchemaStructure.php b/CRM/Core/I18n/SchemaStructure.php
index 3752833f5d55149053bdc4a153c69c57464aea2c..fc765945ede4899651f6cec4f66cc20df72dc698 100644 (file)
--- a/CRM/Core/I18n/SchemaStructure.php
+++ b/CRM/Core/I18n/SchemaStructure.php
@@ -624,14 +624,17 @@ class CRM_Core_I18n_SchemaStructure {
         ],
         'civicrm_event' => [
           'title' => [
+            'label' => "Title",
             'type' => "Text",
           ],
           'summary' => [
+            'label' => "Summary",
             'type' => "TextArea",
             'rows' => "4",
             'cols' => "60",
           ],
           'description' => [
+            'label' => "Description",
             'type' => "RichTextEditor",
             'rows' => "8",
             'cols' => "60",
@@ -640,6 +643,7 @@ class CRM_Core_I18n_SchemaStructure {
             'type' => "Text",
           ],
           'event_full_text' => [
+            'label' => "Event Full Message",
             'type' => "TextArea",
             'rows' => "4",
             'cols' => "60",

diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php
index e6474d5415f71855b1827be085ae2bdc46c2c923..08fa02f4f01a7f035b7a85aa2d4e2ab61650c8bf 100644 (file)
--- a/CRM/Event/DAO/Event.php
+++ b/CRM/Event/DAO/Event.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Event.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:52019312abec7e5c00cc499d0c547ef0)
+ * (GenCodeChecksum:82ed6a487ce2639e83cada1ac876c895)
  */
 
 /**
@@ -740,6 +740,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => '1.7',
@@ -761,6 +762,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'localizable' => 1,
           'html' => [
             'type' => 'Text',
+            'label' => ts("Title"),
           ],
           'add' => '1.7',
         ],
@@ -778,6 +780,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'localizable' => 1,
           'html' => [
             'type' => 'TextArea',
+            'label' => ts("Summary"),
           ],
           'add' => '1.7',
         ],
@@ -795,6 +798,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'localizable' => 1,
           'html' => [
             'type' => 'RichTextEditor',
+            'label' => ts("Description"),
           ],
           'add' => '1.7',
         ],
@@ -811,6 +815,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Select',
+            'label' => ts("Type"),
           ],
           'pseudoconstant' => [
             'optionGroupName' => 'event_type',
@@ -852,6 +857,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'CheckBox',
+            'label' => ts("Public"),
           ],
           'add' => '1.7',
         ],
@@ -871,6 +877,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDateTime',
+            'label' => ts("Start Date"),
           ],
           'add' => '1.7',
         ],
@@ -890,6 +897,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDateTime',
+            'label' => ts("End Date"),
           ],
           'add' => '1.7',
         ],
@@ -907,6 +915,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'CheckBox',
+            'label' => ts("Online Registration"),
           ],
           'add' => '1.7',
         ],
@@ -991,6 +1000,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'localizable' => 1,
           'html' => [
             'type' => 'TextArea',
+            'label' => ts("Event Full Message"),
           ],
           'add' => '1.7',
         ],
@@ -1008,6 +1018,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'CheckBox',
+            'label' => ts("Paid Event"),
           ],
           'add' => '1.7',
         ],

diff --git a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php
index 9b69870e2ea30d2ceebeaeaad69884d496136388..0840d6cca99b12567f1396244993ef465036b160 100644 (file)
--- a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php
+++ b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php
@@ -903,7 +903,7 @@ United States', $tokenProcessor->getRow(0)->render('message'));
       '{event.title}' => 'Event Title',
       '{event.start_date}' => 'Event Start Date',
       '{event.end_date}' => 'Event End Date',
-      '{event.event_type_id:label}' => 'Event Type',
+      '{event.event_type_id:label}' => 'Type',
       '{event.summary}' => 'Event Summary',
       '{event.contact_email}' => 'Event Contact Email',
       '{event.contact_phone}' => 'Event Contact Phone',

diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml
index 2fd1d8c9a1b4a2e2095707350c745679f7dc4e8f..c3b4bb8bd414e516888e78e0a44162d0bff1a403 100644 (file)
--- a/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@ -21,6 +21,7 @@
     <required>true</required>
     <comment>Event</comment>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
     <add>1.7</add>
@@ -40,6 +41,7 @@
     <localizable>true</localizable>
     <comment>Event Title (e.g. Fall Fundraiser Dinner)</comment>
     <html>
+      <label>Title</label>
       <type>Text</type>
     </html>
     <add>1.7</add>
@@ -49,6 +51,7 @@
     <type>text</type>
     <title>Event Summary</title>
     <html>
+      <label>Summary</label>
       <type>TextArea</type>
       <rows>4</rows>
       <cols>60</cols>
@@ -63,6 +66,7 @@
     <uniqueName>event_description</uniqueName>
     <title>Event Description</title>
     <html>
+      <label>Description</label>
       <type>RichTextEditor</type>
       <rows>8</rows>
       <cols>60</cols>
@@ -81,6 +85,7 @@
       <optionGroupName>event_type</optionGroupName>
     </pseudoconstant>
     <html>
+      <label>Type</label>
       <type>Select</type>
     </html>
     <comment>Event Type ID.Implicit FK to civicrm_option_value where option_group = event_type.</comment>
@@ -120,6 +125,7 @@
     <comment>Public events will be included in the iCal feeds. Access to private event information may be limited using ACLs.</comment>
     <add>1.7</add>
     <html>
+      <label>Public</label>
       <type>CheckBox</type>
     </html>
   </field>
@@ -133,6 +139,7 @@
     <comment>Date and time that event starts.</comment>
     <add>1.7</add>
     <html>
+      <label>Start Date</label>
       <type>Select Date</type>
       <formatType>activityDateTime</formatType>
     </html>
@@ -147,6 +154,7 @@
     <comment>Date and time that event ends. May be NULL if no defined end date/time</comment>
     <add>1.7</add>
     <html>
+      <label>End Date</label>
       <type>Select Date</type>
       <formatType>activityDateTime</formatType>
     </html>
@@ -160,6 +168,7 @@
     <comment>If true, include registration link on Event Info page.</comment>
     <add>1.7</add>
     <html>
+      <label>Online Registration</label>
       <type>CheckBox</type>
     </html>
   </field>
@@ -213,6 +222,7 @@
     <type>text</type>
     <title>Event Information</title>
     <html>
+      <label>Event Full Message</label>
       <type>TextArea</type>
       <rows>4</rows>
       <cols>60</cols>
@@ -230,6 +240,7 @@
     <comment>If true, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.</comment>
     <add>1.7</add>
     <html>
+      <label>Paid Event</label>
       <type>CheckBox</type>
     </html>
   </field>
@@ -287,6 +298,7 @@
     <comment>Is this Event enabled or disabled/cancelled?</comment>
     <add>1.7</add>
     <html>
+      <label>Enabled</label>
       <type>CheckBox</type>
       <label>Enabled</label>
     </html>