Fixup ts() for bug-level consistency

diff --git a/sql/civicrm_option_groups/account_relationship.sqldata.php b/sql/civicrm_option_groups/account_relationship.sqldata.php
index 559cd58da580bb27ece91f51bb2ad71942180d03..2b297ea9ad8a905330b4a3c11268c5521a67615e 100644 (file)
--- a/sql/civicrm_option_groups/account_relationship.sqldata.php
+++ b/sql/civicrm_option_groups/account_relationship.sqldata.php
@@ -4,18 +4,19 @@ return CRM_Core_CodeGen_OptionGroup::create('account_relationship', 'a/0061')
     'title' => ts('Account Relationship'),
   ])
   ->addValues(['label', 'name', 'value', 'description'], [
-    [ts('Income Account is'), 'Income Account is', 1, ts('Income Account is'), 'is_default' => 1],
-    [ts('Credit/Contra Revenue Account is'), 'Credit/Contra Revenue Account is', 2, ts('Credit/Contra Revenue Account is')],
-    [ts('Accounts Receivable Account is'), 'Accounts Receivable Account is', 3, ts('Accounts Receivable Account is')],
-    [ts('Credit Liability Account is'), 'Credit Liability Account is', 4, ts('Credit Liability Account is'), 'is_active' => 0],
-    [ts('Expense Account is'), 'Expense Account is', 5, ts('Expense Account is')],
-    [ts('Asset Account is'), 'Asset Account is', 6, ts('Asset Account is')],
-    [ts('Cost of Sales Account is'), 'Cost of Sales Account is', 7, ts('Cost of Sales Account is')],
-    [ts('Premiums Inventory Account is'), 'Premiums Inventory Account is', 8, ts('Premiums Inventory Account is')],
-    [ts('Discounts Account is'), 'Discounts Account is', 9, ts('Discounts Account is')],
-    [ts('Sales Tax Account is'), 'Sales Tax Account is', 10, ts('Sales Tax Account is')],
-    [ts('Chargeback Account is'), 'Chargeback Account is', 11, ts('Chargeback Account is')],
-    [ts('Deferred Revenue Account is'), 'Deferred Revenue Account is', 12, ts('Deferred Revenue Account is')],
+    // TODO: Shouldn't we have ts() for these descriptions?
+    [ts('Income Account is'), 'Income Account is', 1, 'Income Account is', 'is_default' => 1],
+    [ts('Credit/Contra Revenue Account is'), 'Credit/Contra Revenue Account is', 2, 'Credit/Contra Revenue Account is'],
+    [ts('Accounts Receivable Account is'), 'Accounts Receivable Account is', 3, 'Accounts Receivable Account is'],
+    [ts('Credit Liability Account is'), 'Credit Liability Account is', 4, 'Credit Liability Account is', 'is_active' => 0],
+    [ts('Expense Account is'), 'Expense Account is', 5, 'Expense Account is'],
+    [ts('Asset Account is'), 'Asset Account is', 6, 'Asset Account is'],
+    [ts('Cost of Sales Account is'), 'Cost of Sales Account is', 7, 'Cost of Sales Account is'],
+    [ts('Premiums Inventory Account is'), 'Premiums Inventory Account is', 8, 'Premiums Inventory Account is'],
+    [ts('Discounts Account is'), 'Discounts Account is', 9, 'Discounts Account is'],
+    [ts('Sales Tax Account is'), 'Sales Tax Account is', 10, 'Sales Tax Account is'],
+    [ts('Chargeback Account is'), 'Chargeback Account is', 11, 'Chargeback Account is'],
+    [ts('Deferred Revenue Account is'), 'Deferred Revenue Account is', 12, 'Deferred Revenue Account is'],
   ])
   ->addDefaults([
     'component_id' => 2,

diff --git a/sql/civicrm_option_groups/activity_type.sqldata.php b/sql/civicrm_option_groups/activity_type.sqldata.php
index 6a5b39c359093c726a9d1bc7754749b12b020c67..8de21bb27491f656e5ccb117b5dc3f2ea7dbc22e 100644 (file)
--- a/sql/civicrm_option_groups/activity_type.sqldata.php
+++ b/sql/civicrm_option_groups/activity_type.sqldata.php
@@ -61,9 +61,10 @@ return CRM_Core_CodeGen_OptionGroup::create('activity_type', 'a/0002')
     [ts('Reminder Sent'), 'Reminder Sent', '40', '40', 'filter' => '1', 'is_reserved' => '1', 'description' => ''],
 
     // Activity Types for Financial Transactions Batch
-    [ts('Export Accounting Batch'), 'Export Accounting Batch', '41', '41', 'filter' => '1', 'description' => ts('Export Accounting Batch'), 'is_reserved' => '1', 'component_id' => '2'],
-    [ts('Create Batch'), 'Create Batch', '42', '42', 'filter' => '1', 'description' => ts('Create Batch'), 'is_reserved' => '1', 'component_id' => '2'],
-    [ts('Edit Batch'), 'Edit Batch', '43', '43', 'filter' => '1', 'description' => ts('Edit Batch'), 'is_reserved' => '1', 'component_id' => '2'],
+    // TODO: Shouldn't we have ts() for these descriptions?
+    [ts('Export Accounting Batch'), 'Export Accounting Batch', '41', '41', 'filter' => '1', 'description' => 'Export Accounting Batch', 'is_reserved' => '1', 'component_id' => '2'],
+    [ts('Create Batch'), 'Create Batch', '42', '42', 'filter' => '1', 'description' => 'Create Batch', 'is_reserved' => '1', 'component_id' => '2'],
+    [ts('Edit Batch'), 'Edit Batch', '43', '43', 'filter' => '1', 'description' => 'Edit Batch', 'is_reserved' => '1', 'component_id' => '2'],
 
     // new sms options
     [ts('SMS delivery'), 'SMS delivery', '44', '44', 'filter' => '1', 'description' => ts('SMS delivery'), 'is_reserved' => '1'],

diff --git a/sql/civicrm_option_groups/batch_mode.sqldata.php b/sql/civicrm_option_groups/batch_mode.sqldata.php
index c2e553b6f758ee7f0098c8b7f8faa5692601806e..9270d33f1a51d958a93f4cd58d1d90eb595dea7b 100644 (file)
--- a/sql/civicrm_option_groups/batch_mode.sqldata.php
+++ b/sql/civicrm_option_groups/batch_mode.sqldata.php
@@ -5,6 +5,7 @@ return CRM_Core_CodeGen_OptionGroup::create('batch_mode', 'a/0065')
     'is_locked' => 1,
   ])
   ->addValues(['label', 'name', 'value', 'description'], [
-    [ts('Manual Batch'), 'Manual Batch', 1, ts('Manual Batch'), 'is_reserved' => 1, 'component_id' => 2],
-    [ts('Automatic Batch'), 'Automatic Batch', 2, ts('Automatic Batch'), 'is_reserved' => 1, 'component_id' => 2],
+    // TODO: Shouldn't we have ts() for these descriptions?
+    [ts('Manual Batch'), 'Manual Batch', 1, 'Manual Batch', 'is_reserved' => 1, 'component_id' => 2],
+    [ts('Automatic Batch'), 'Automatic Batch', 2, 'Automatic Batch', 'is_reserved' => 1, 'component_id' => 2],
   ]);

diff --git a/sql/civicrm_option_groups/financial_item_status.sqldata.php b/sql/civicrm_option_groups/financial_item_status.sqldata.php
index d1572e74ccc91775dff0f8393ef969c7e5069baf..585997bcc6ac180dcd401689a7d99be6c5ac79d4 100644 (file)
--- a/sql/civicrm_option_groups/financial_item_status.sqldata.php
+++ b/sql/civicrm_option_groups/financial_item_status.sqldata.php
@@ -5,7 +5,8 @@ return CRM_Core_CodeGen_OptionGroup::create('financial_item_status', 'a/0071')
     'is_locked' => 1,
   ])
   ->addValues(['label', 'name', 'value', 'weight', 'description'], [
-    [ts('Paid'), 'Paid', 1, 1, ts('Paid'), 'is_reserved' => 1, 'component_id' => 2],
-    [ts('Unpaid'), 'Unpaid', 3, 1, ts('Unpaid'), 'is_reserved' => 1, 'component_id' => 2],
-    [ts('Partially paid'), 'Partially paid', 2, 2, ts('Partially paid'), 'is_reserved' => 1, 'component_id' => 2],
+    // TODO: Shouldn't we have ts() for these descriptions?
+    [ts('Paid'), 'Paid', 1, 1, 'Paid', 'is_reserved' => 1, 'component_id' => 2],
+    [ts('Unpaid'), 'Unpaid', 3, 1, 'Unpaid', 'is_reserved' => 1, 'component_id' => 2],
+    [ts('Partially paid'), 'Partially paid', 2, 2, 'Partially paid', 'is_reserved' => 1, 'component_id' => 2],
   ]);