Skip to content

Changed "remove" to "delete", "update" to "edit" in lexicons #15155

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.

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

Merged
merged 3 commits into from
Jul 26, 2020
Merged

Changed "remove" to "delete", "update" to "edit" in lexicons #15155

merged 3 commits into from
Jul 26, 2020

Conversation

Ruslan-Aleev
Copy link
Collaborator

@Ruslan-Aleev Ruslan-Aleev commented Jul 8, 2020

What does it do?

Changed "remove" to "delete", "update" to "edit" in lexicons. PR only changes lexicons entries.

p.s. In the future, it is necessary to simplify the lexicons entries (key: value) and create a standard for writing them.

Often there are duplicates:
https://github.com/modxcms/revolution/blob/3.x/core/lexicon/en/snippet.inc.php#L20
https://github.com/modxcms/revolution/blob/3.x/core/lexicon/en/snippet.inc.php#L28

Why is it needed?

For unification in the interface.

Related issue(s)/PR(s)

#13554

@cla-bot cla-bot bot added the cla-signed CLA confirmed for contributors to this PR. label Jul 8, 2020
@Ruslan-Aleev Ruslan-Aleev changed the title Changed "remove" to "delete" in lexicons Changed "remove" to "delete", "update" to "edit" in lexicons Jul 8, 2020
@JoshuaLuckers
Copy link
Contributor

This made me wonder: what's the difference between "remove" and "delete"?

Delete and remove are defined quite similarly, but the main difference between them is that delete means erase (i.e. rendered nonexistent or nonrecoverable), while remove connotes take away and set aside (but kept in existence).

Source: https://english.stackexchange.com/a/52509

@Ruslan-Aleev
Copy link
Collaborator Author

Ruslan-Aleev commented Jul 8, 2020

In MODX, with the exception of Resources, everything is permanently deleted, it seems to me. Therefore, the term "Delete" is more applicable (although it is better to use it for resources too, so that there is no confusion).

Comment on lines 141 to 144
$_lang['empty_recycle_bin'] = 'Delete Deleted Resources';
$_lang['empty_recycle_bin_confirm'] = 'Are you sure you want to completely and permanently delete all deleted Resources? This is irreversible.';
$_lang['empty_recycle_bin_empty'] = 'There are no deleted Resources to delete.';
$_lang['empty_recycle_bin_emptied'] = 'All deleted Resources have been permanently deleted.';
Copy link
Contributor

@JoshuaLuckers JoshuaLuckers Jul 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

English isn't my first language but I would use "Erase" instead of "Delete" when talking about deleting/removing Deleted Resources.
A native English speaker's view on this would be great!

@JoshuaLuckers JoshuaLuckers added the pr/ready-for-merging Pull request reviewed and tested and ready for merging. label Jul 18, 2020
@JoshuaLuckers JoshuaLuckers self-assigned this Jul 26, 2020
JoshuaLuckers added a commit to JoshuaLuckers/revolution that referenced this pull request Jul 26, 2020
…#15155]

Merge remote-tracking branch 'upstream/pr/15155' into 3.x

* upstream/pr/15155:
  Changed "new" to "create" in lexicons
  Changed "update" to "edit" in lexicons
  Changed "remove" to "delete" in lexicons
@JoshuaLuckers JoshuaLuckers merged commit c99299b into modxcms:3.x Jul 26, 2020
@Ruslan-Aleev Ruslan-Aleev deleted the 3.x-fix-13554 branch August 13, 2020 08:19
@opengeek opengeek added this to the v3.0.0-alpha3 milestone Dec 10, 2020
Mark-H added a commit that referenced this pull request Mar 5, 2021
Merge remote-tracking branch 'upstream/pr/15447' into 3.x
@rthrash rthrash removed the pr/ready-for-merging Pull request reviewed and tested and ready for merging. label Apr 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed CLA confirmed for contributors to this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants