Skip to content
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

[4.2] unification YubiKey vs Yubikey #38036

Merged
merged 8 commits into from Jun 13, 2022

Conversation

tecpromotion
Copy link
Contributor

Summary of Changes

Unified spelling of the word YubiKey.

Testing Instructions

.

Actual result BEFORE applying this Pull Request

Mix of YubiKey and Yubikey

Expected result AFTER applying this Pull Request

YubiKey

Documentation Changes Required

.

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-4.2-dev labels Jun 12, 2022
@richard67
Copy link
Member

@roland-d Should @tecpromotion revert the changes in the 2 "plg_twofactorauth_yubikey*.ini" files because those will be merged up later from 4.1-dev when his PR #38037 has bee merged into the 4.1-dev branch, and having the same changes here will cause a merge conflict? Or are you ok with that?

@roland-d
Copy link
Contributor

@richard67 That should be OK, because the same lines are changed Git will know what to do with it. If not, I can fix the merge conflict, should be easy.

@richard67
Copy link
Member

I have tested this item ✅ successfully on 9438f51


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/38036.

1 similar comment
@Quy
Copy link
Contributor

Quy commented Jun 13, 2022

I have tested this item ✅ successfully on 9438f51


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/38036.

@Quy
Copy link
Contributor

Quy commented Jun 13, 2022

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/38036.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Jun 13, 2022
@roland-d roland-d merged commit 04a0633 into joomla:4.2-dev Jun 13, 2022
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Jun 13, 2022
@roland-d
Copy link
Contributor

Thanks everybody

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants