From f8aee3011bc2724db8a382f1116f937bd7aeacfb Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Tue, 29 Jul 2014 15:16:27 -0700 Subject: [PATCH] Fix typos and incorrect terminology in Participant Import preview and summary screens. --- templates/CRM/Event/Import/Form/Preview.tpl | 4 ++-- templates/CRM/Event/Import/Form/Summary.tpl | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/CRM/Event/Import/Form/Preview.tpl b/templates/CRM/Event/Import/Form/Preview.tpl index 59f4a21902..808f2967a1 100644 --- a/templates/CRM/Event/Import/Form/Preview.tpl +++ b/templates/CRM/Event/Import/Form/Preview.tpl @@ -43,7 +43,7 @@ {if $conflictRowCount}

- {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting transaction ids within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - Download Conflicts. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts} + {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting participant IDs within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - Download Conflicts. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}

{/if} @@ -75,7 +75,7 @@ {if $conflictRowCount} {ts}Conflicting Rows{/ts} {$conflictRowCount} - {ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts} + {ts}Rows with conflicting participant IDs within this file. These rows will be skipped (not imported).{/ts} {if $conflictRowCount}

{ts}Download Conflicts{/ts}

{/if} diff --git a/templates/CRM/Event/Import/Form/Summary.tpl b/templates/CRM/Event/Import/Form/Summary.tpl index a809f455cd..42ad05d94b 100644 --- a/templates/CRM/Event/Import/Form/Summary.tpl +++ b/templates/CRM/Event/Import/Form/Summary.tpl @@ -38,16 +38,16 @@ {if $unMatchCount }

- {ts count=$unMatchCount plural='CiviCRM has detected mismatched participant IDs. These records have not been Updated.'}CiviCRM has detected mismatched participant ID. This record have not been updated.{/ts} + {ts count=$unMatchCount plural='CiviCRM has detected mismatched participant IDs. These records have not been updated.'}CiviCRM has detected a mismatched participant ID. This record has not been updated.{/ts}

- {ts 1=$downloadMismatchRecordsUrl}You can Download Mismatched Participantss. You may then correct them, and import the new file with the corrected data.{/ts} + {ts 1=$downloadMismatchRecordsUrl}You can Download Mismatched Participants. You may then correct them, and import the new file with the corrected data.{/ts}

{/if} {if $invalidRowCount }

- {ts count=$invalidRowCount plural='CiviCRM has detected invalid data and/or formatting errors in %count records. These records have not been imported.'}CiviCRM has detected invalid data and/or formatting errors in one record. This record have not been imported.{/ts} + {ts count=$invalidRowCount plural='CiviCRM has detected invalid data and/or formatting errors in %count records. These records have not been imported.'}CiviCRM has detected invalid data and/or formatting errors in one record. This record has not been imported.{/ts}

{ts 1=$downloadErrorRecordsUrl}You can Download Errors. You may then correct them, and import the new file with the corrected data.{/ts} @@ -56,10 +56,10 @@ {if $conflictRowCount}

- {ts count=$conflictRowCount plural='CiviCRM has detected %count records with conflicting transaction IDs within this data file or relative to existing participant records. These records have not been imported.'}CiviCRM has detected one record with conflicting transaction ID within this data file or relative to existing particpant records. This record have not been imported.{/ts} + {ts count=$conflictRowCount plural='CiviCRM has detected %count records with conflicting participant IDs within this data file or relative to existing participant records. These records have not been imported.'}CiviCRM has detected one record with conflicting participant ID within this data file or relative to existing participant records. This record has not been imported.{/ts}

- {ts 1=$downloadConflictRecordsUrl}You can Download Conflicts. You may then review these records to determine if they are actually conflicts, and correct the transaction IDs for those that are not.{/ts} + {ts 1=$downloadConflictRecordsUrl}You can Download Conflicts. You may then review these records to determine if they are actually conflicts, and correct the participant IDs for those that are not.{/ts}

{/if} @@ -68,7 +68,7 @@ {ts count=$duplicateRowCount plural='CiviCRM has detected %count records which are duplicates of existing CiviCRM participant records.'}CiviCRM has detected one record which is a duplicate of existing CiviCRM participant record.{/ts} {$dupeActionString}

- {ts 1=$downloadDuplicateRecordsUrl}You can Download Duplicates. You may then review these records to determine if they are actually duplicates, and correct the transaction IDs for those that are not.{/ts} + {ts 1=$downloadDuplicateRecordsUrl}You can Download Duplicates. You may then review these records to determine if they are actually duplicates, and correct the participant IDs for those that are not.{/ts}

{/if} @@ -108,7 +108,7 @@ {if $conflictRowCount} {ts}Conflicting Rows (skipped){/ts} {$conflictRowCount} - {ts}Rows with conflicting transaction IDs (NOT imported).{/ts} + {ts}Rows with conflicting participant IDs (NOT imported).{/ts} {if $conflictRowCount}

{ts}Download Conflicts{/ts}

{/if} -- 2.25.1