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

Language update #9378

Closed
wants to merge 1 commit into from
Closed

Language update #9378

wants to merge 1 commit into from

Conversation

rmwphd
Copy link
Contributor

@rmwphd rmwphd commented Jun 11, 2020

Description

A first attempt to excise the word "slave" from the repo as part of updating terminology. I've replaced every instance of "slave" found with Sublime Text 3's regex find (not whole word only, not case sensitive) and renamed two files that had "slave" in the filename. So far, a very large number of keyboards build correctly, including several splits (e.g., crkbd, ergodox_ez, kyria), but make all takes forever to run and I'm seeing a lot of keymaps with errors from rgb pin things and other errors that shouldn't have anything to do with my changes.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@rmwphd
Copy link
Contributor Author

rmwphd commented Jun 11, 2020

Okay, apparently I branched off of my own branch for the language_update branch in such a way that commits from my last PR (relating to my personal keymaps) are included.... I'm having a hard time removing them from this PR in a clean way. Any advice?

@zvecr zvecr added the breaking_change Changes that need to wait for a version increment label Jun 11, 2020
@RossBarnie
Copy link

Take a look at https://github.com/RossBarnie/qmk_firmware/tree/language_update, you'll notice the only commit on top of qmk_firmware's master is your language update commit. I created this by doing the following:

git remote add upstream https://github.com/qmk/qmk_firmware.git
git fetch upstream
git checkout -b language_update upstream/language_update
git rebase upstream master -i
... Replace "pick" with "drop" (or "d") for all commits except your language update ...
git push -f

Alternatively (and more safely) you could do the following to get to the same point without rewriting history:

git checkout -b language_update_new upstream/language_update --no-track
git cherry-pick a4952cf3d

You can then update the PR as necessary.

Let me know if you need any lily58 testing @rmwphd

@rmwphd
Copy link
Contributor Author

rmwphd commented Aug 18, 2020

Thanks @RossBarnie ! I used a cherry-pick to get that commit and put it on a more up-to-date branch and then force pushed it over the version on my personal remote.

@zvecr
Copy link
Member

zvecr commented Apr 6, 2022

While there is some desire to proceed, each area needs to be considered in isolation to ensure:

  • Terminology is aligned with standards, For example, I2C will have different terms than SPI.
  • Terms are correct for the QMK use-case. For example, the "role" a keyboard takes within splits.

A blanket find-replace is unfortunately not going to be accepted at this time. Start small with the somewhat "well" defined SPI terms, and build outward.

@zvecr zvecr closed this Apr 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking_change Changes that need to wait for a version increment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants