X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUpgrade%2FIncremental%2Fphp%2FFourThree.php;h=d265b96b70a93c9272b8e924086ba17d04cb901e;hb=10a5be278e60b1f8c6926dfa9f9b189312132441;hp=de37b456865b0e168ab2235ab9b9d50f7e90f5cd;hpb=68d36190d340137a13c51ce84613fa6e6cff9c11;p=civicrm-core.git diff --git a/CRM/Upgrade/Incremental/php/FourThree.php b/CRM/Upgrade/Incremental/php/FourThree.php index de37b45686..d265b96b70 100644 --- a/CRM/Upgrade/Incremental/php/FourThree.php +++ b/CRM/Upgrade/Incremental/php/FourThree.php @@ -99,10 +99,10 @@ class CRM_Upgrade_Incremental_php_FourThree { } list($context, $orgName) = self::createDomainContacts(); if ($context == 'added') { - $postUpgradeMessage .= '
' . ts("A new organization contact has been added as the default domain contact using the information from your Organization Address and Contact Info settings: '{$orgName}'."); + $postUpgradeMessage .= '
' . ts("A new organization contact has been added as the default domain contact using the information from your Organization Address and Contact Info settings: '%1'.", array(1 => $orgName)); } elseif ($context == 'merged') { - $postUpgradeMessage .= '
' . ts("The existing organization contact record for '{$orgName}' has been marked as the default domain contact, and has been updated with information from your Organization Address and Contact Info settings."); + $postUpgradeMessage .= '
' . ts("The existing organization contact record for '%1' has been marked as the default domain contact, and has been updated with information from your Organization Address and Contact Info settings.", array(1 => $orgName)); } $providerExists = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_sms_provider LIMIT 1"); @@ -199,10 +199,7 @@ WHERE ceft.entity_id IS NULL;"; $maxId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(max(id),0) FROM civicrm_contact'); for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) { $endId = $startId + self::BATCH_SIZE - 1; - $title = ts('Upgrade timestamps (%1 => %2)', array( - 1 => $startId, - 2 => $endId, - )); + $title = ts('Upgrade timestamps (%1 => %2)', array(1 => $startId, 2 => $endId)); $this->addTask($title, 'convertTimestamps', $startId, $endId); } @@ -908,4 +905,4 @@ ADD INDEX UI_entity_financial_trxn_entity_id (entity_id);"); ); $queue->createItem($task, array('weight' => -1)); } -} \ No newline at end of file +}