New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete repeated title and fix some labels #19565

Merged

seamuslee001 merged 4 commits into civicrm:master from ahed-compucorp:add-missing-labels

Feb 11, 2021

Contributor

ahed-compucorp commented Feb 9, 2021 •

edited

Loading

Overview

This a fellow-up PR after #19531 which will :

Fix some titles and labels that contain the name of its own entity
Fix repeated title.
Fix label typos.
Add label for fields without title.

ahed-compucorp added 2 commits

February 9, 2021 11:44


          Delete repeated title and fix some labels

f2c816a


          Fix titles that contain entity name

1c0d684

Only for fields with title tag and html->label

civibot bot added the master label

civibot bot commented Feb 9, 2021

(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 reviewed

View reviewed changes

xml/schema/Bridge/OG.xml Outdated Show resolved Hide resolved

colemanw reviewed

View reviewed changes

xml/schema/Bridge/Role.xml Outdated Show resolved Hide resolved

colemanw reviewed

View reviewed changes

xml/schema/Contact/Household.xml Outdated Show resolved Hide resolved

colemanw reviewed

View reviewed changes

xml/schema/Contact/Individual.xml Outdated Show resolved Hide resolved

colemanw reviewed

View reviewed changes

xml/schema/Contact/Organization.xml Outdated Show resolved Hide resolved

Member

colemanw commented Feb 9, 2021

Thanks for this PR. I've confirmed that some xml files are unused and have made #19570 to delete them.

ahed-compucorp added 2 commits

February 9, 2021 19:57


          Add label for fields without title

fd735f5

Only for fields with html tag


          Add label for fields without title and html tag

1662d42

ahed-compucorp force-pushed the add-missing-labels branch from 4087e02 to 1662d42 Compare

February 9, 2021 17:59

Contributor Author

ahed-compucorp commented Feb 9, 2021

I removed them from the last two commits.

Contributor

eileenmcnaughton commented Feb 10, 2021

test this please

seamuslee001 self-assigned this

Contributor

seamuslee001 commented Feb 11, 2021

This all looks good to me merging

seamuslee001 merged commit 122a421 into civicrm:master

seamuslee001 added a commit to seamuslee001/civicrm-core that referenced this pull request


          Regenerate DAOs and I18n Schema Structure following merge of civicrm#…

c23563e

…19565

eileenmcnaughton added a commit that referenced this pull request


          Merge pull request #19581 from seamuslee001/dao_regen

48a2c63

REF Regenerate DAOs and I18n Schema Structure following merge of #19565

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels