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

Unicode mapping for CYRILLIC LETTER I WITH GRAVE, RUBLE, BG #2621

Merged
merged 5 commits into from Jun 21, 2023
Merged

Conversation

Torinde
Copy link
Contributor

@Torinde Torinde commented Jun 19, 2023

Closes #2592

adding CYRILLIC LETTER I WITH GRAVE
adding RUBLE SIGN
adding as placeholder Bulgarian romanization
mentioning "printable 7-bit ASCII" on the top instead of "7-bit ASCII"
DECOMPOSITION.TXT adding CYRILLIC LETTER I WITH GRAVE, SHORT I
@FeralChild64 FeralChild64 added the translation Issues related to translations label Jun 19, 2023
Copy link
Collaborator

@FeralChild64 FeralChild64 left a comment

Choose a reason for hiding this comment

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

I have just one remark - please make these changes in one commit:

  1. Backup your changed files somewhere, just to be sure.
  2. Execute the following commands in your repository:
git reset HEAD~4
git add .
git commit
git push --force

One advice for the future: it is best to keep the main branch of your repository a mirror of the original main and only do your development in branches.

@Torinde
Copy link
Contributor Author

Torinde commented Jun 20, 2023

Hoping that the "refreshed Github" has extra features - first tried entering those commands at the "Command palette" in the Github.com web interface:
image
Not working. Obviously not the right place.
Installed Github Desktop, "cloned" my repository locally, but again no place to enter commands, referred me to yet another tool to install: "Git"
Installed Git (which installs 100 other stuff like editor, SSH, etc.?)

  1. git reset HEAD~4 - seems OK
  2. git add . - seems OK
  3. git commit - opened some kind of text editor (vim??) with some pre-filled comment, but I couldn't "save" it
  4. opened GIT GUI - clicked "Commit" button, wrote comment, seems OK
  5. git push --force (or GUI "Push" button and then "force ..." checkbox) - doesn't work. In the background appears "Git credentials manager" console - if I click on it "Required command not provided" or something like that flashes in red quickly...
  6. Force-closing this background window, AFTER Windows terminates it makes another window to appear: "OpenSSH Login". Entering credentials there doesn't help.

Takeaways:

  • it's something simple/obvious that I'm missing (like entering my credentials in yet another place, probably in Git somewhere?)
  • Github web interface should provide "command prompt" equivalent supporting those git commands.

@weirddan455
Copy link
Collaborator

git commit - opened some kind of text editor (vim??) with some pre-filled comment, but I couldn't "save" it

Yeah, that's probably vim or vi by default. Type :wq to save and quit. You can also just do git commit -m "My commit description" instead to skip the editor

git push --force (or GUI "Push" button and then "force ..." checkbox) - doesn't work. In the background appears "Git credentials manager" console - if I click on it "Required command not provided" or something like that flashes in red quickly...

Get the exact error message for that. I believe Git for Windows has a special GitHub credential manager that should just work when you type your GitHub username and password into it. On other operating systems, (like what I had to do on Linux) you have to make a "Personal Access Token" and use that as your git password: https://github.com/settings/tokens

I believe that's not needed on Windows but maybe worth a try if you want to bypass the credential manager.

If you want to hop on Discord I might be able to help you further.

Copy link
Member

@kcgen kcgen left a comment

Choose a reason for hiding this comment

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

@Torinde, cheers - very nice PR, 🍻!

@FeralChild64, if you want to try, GitHub has a handy squash-at-merge time. Use the pulldown button beside the Merge:

Screenshot_20230620_191515

It will let you edit the single squashed commit:

  1. Author will be Torinde.

  2. Title will be the PR:
    Unicode mapping for CYRILLIC LETTER I WITH GRAVE, RUBLE, BG

  3. Body is aggregated from all commits:

    DECOMPOSITION.TXT adding CYRILLIC LETTER I WITH GRAVE, CYRILLIC LETTER SHORT I
    
    ASCII.TXT - adding CYRILLIC LETTER I WITH GRAVE, RUBLE
    adding CYRILLIC LETTER I WITH GRAVE
    adding RUBLE SIGN
    adding as placeholder Bulgarian romanization
    mentioning "printable 7-bit ASCII" on the top instead of "7-bit ASCII"
    
    CAPITAL_SMALL.TXT adding CYRILLIC LETTER I WITH GRAVE
    
    MAIN.TXT - adding CYRILLIC LETTER I WITH GRAVE, RUBLE 
    

@kcgen kcgen requested a review from FeralChild64 June 21, 2023 02:14
Copy link
Collaborator

@FeralChild64 FeralChild64 left a comment

Choose a reason for hiding this comment

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

OK, let's try squash-merge.

@FeralChild64 FeralChild64 merged commit 40a49ae into dosbox-staging:main Jun 21, 2023
44 checks passed
@Torinde
Copy link
Contributor Author

Torinde commented Jun 21, 2023

@weirddan455 it seems the git-credential-manager.exe is being run by git.exe without any parameter. The text that flashes quickly seems quite similar to what I get when running it manually:

C:\Program Files\Git\mingw64\bin>git-credential-manager.exe
Required command was not provided.

git-credential-manager

Usage:
  git-credential-manager [options] [command]

Options:
  --version       Show version information
  -?, -h, --help  Show help and usage information

Commands:
  get          [Git] Return a stored credential
  store        [Git] Store a credential
  erase        [Git] Erase a stored credential
  configure    Configure Git Credential Manager as the Git credential helper
  unconfigure  Unconfigure Git Credential Manager as the Git credential helper
  diagnose     Run diagnostics and gather logs to diagnose problems with Git Credential Manager
  azure-repos  Commands for interacting with the Azure Repos host provider

Maybe I need to first "store" and/or "configure" the credentials manager...

For now, FeralChild64 managed it on his side, so that's OK.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
translation Issues related to translations
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants