Standardize DataSource file for Contribution & Membership

[eileenmcnaughton]

Overview

Standardize DataSource file for Contribution & Membership
I've gone through the Datasource.tpl files for Contribution & Membership imports and made them the same - the next step is actually to remove them and use a shared file (& then fix a couple of bugs) but I set out to reconcile them first

Before

After

Note - I tested the membership html & contribution html in an online validator

Technical Details

Most of the noise is formatting - however notable changes

1. Class standardisation across fields - e.g
   <div class="crm-block crm-form-block crm-activity-import-uploadfile-form-block">
   becomes

<div class="crm-block crm-form-block crm-import-datasource-form-block">

2. Re-use of strings - e.g

    {ts 1=$importEntity 2= $importEntities}The %1 Import Wizard allows you to easily upload %2 from other applications into CiviCRM.{/ts}
    {ts}Files to be imported must be in the 'comma-separated-values' format (CSV) and must contain data needed to match an existing contact in your CiviCRM database.{/ts} {help id='upload'}

3. standisation of html around membership import turned out to fix a shoreditch formatting bug :-)

@colemanw - can you confirm the strings approach is OK - if we want to make any further text of class changes now would be the time - I'm gonna check the other tpls for anything that doesn't fit this pattern & consolidate to 1 file

Comments

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[colemanw]

@eileenmcnaughton your approach to strings looks good, but you could actually simplify it further and not require each child class to override the getTranslatedEntity/Entities functions. This ought to work:

Suggested change

	return '';
	return Civi\Api4\Utils\CoreUtil::getInfoItem($this::IMPORT_ENTITY, 'title');

And the other one can do the same thing using 'title_plural'.

[eileenmcnaughton]

@colemanw that works - it does change the capitalisation - but I think that is acceptable

[colemanw]

Did a light r-run and the new strings appear ok.

[eileenmcnaughton]

thanks @colemanw