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

lang: [nl] Add Dutch Languages #691

Closed
wants to merge 6 commits into from
Closed

lang: [nl] Add Dutch Languages #691

wants to merge 6 commits into from

Conversation

snelledre
Copy link

Added the Dutch languages

Added the Dutch languages
@datamweb datamweb added the lang Languages file label Mar 23, 2023
@datamweb
Copy link
Collaborator

Hello, thanks for the PR.

We have failure in PHPCSFixer, can you run the following command to fix the error?

composer cs-fix tests/Language/AbstractTranslationTestCase

src/Language/nl/Auth.php Outdated Show resolved Hide resolved
Added the translation for line 64
@datamweb datamweb added the GPG-Signing needed Pull requests that need GPG-Signing label Mar 23, 2023
@datamweb
Copy link
Collaborator

@snelledre Please see #672 (comment)

Updated dutch coding standard
@snelledre
Copy link
Author

Sorry, I will try again today to update the previous one as well, but unfortunately I can't at the moment verify the other ones.
Probably due to ignorance as this is my first time on github to help with another project

@snelledre
Copy link
Author

snelledre commented Mar 24, 2023

See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits

Best, I have seen how to commit all the changes but I get errors see below witch the execution off:
git rebase -i --root --exec 'git commit --amend --no-edit --no-verify -S'

Executing: git commit --amend --no-edit --no-verify -S
[detached HEAD 1795958] chore: configure Psalm
 Author: kenjis <kenji.uui@gmail.com>
 Date: Wed Apr 20 09:43:59 2022 +0900
 2 files changed, 24 insertions(+)
 create mode 100644 psalm_autoload.php
Auto-merging src/Controllers/RegisterController.php
CONFLICT (content): Merge conflict in src/Controllers/RegisterController.php
error: could not apply 1a046d5... refactor: fix psalm errors
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1a046d5... refactor: fix psalm errors

@kenjis
Copy link
Member

kenjis commented Mar 24, 2023

It seems your PR branch is a bit out of dated.

Try first:

$ git fetch upstream 
$ git rebase upstream/develop

@snelledre
Copy link
Author

It seems your PR branch is a bit out of dated.

Try first:

$ git fetch upstream 
$ git rebase upstream/develop

Sorry, but that didn't help the output stays the same.
The repo is in sync i'm sure.
With the time from yesterday I'm trying now an hour off 3 with no results.
I don't understand why so small thing is so hard to get right.
I want to help with the dutch translation but not giving up right now so do you have some other solutions.
Or is deleting the pull request the only solution and start again with a new one?

@kenjis
Copy link
Member

kenjis commented Mar 24, 2023

the output stays the same.

Do you mean the same error message?
If so, please delete the branch in your local repository, and fetch the branch in GitHub again,
and try.

I got your PR branch and tried and got:

$ git fetch upstream 
$ git rebase upstream/develop 
Successfully rebased and updated refs/heads/snelledre/develop.

I think you will get the same message.

Your branch has a merge commit, so git rebase will remove it at least.

@kenjis
Copy link
Member

kenjis commented Mar 24, 2023

I don't understand why so small thing is so hard to get right.

It seems you are a very beginner of Git.
Git is very difficult tool, so it is difficult to understand.
And if you don't understand Git concepts, you cannot use it easily.

Starting again new PR might be easier than solving your current issue.

If you create a new PR, I recommend you create a new branch for the PR,
not using develop branch.

@datamweb
Copy link
Collaborator

@snelledre Starting anything is a bit difficult, if you are not familiar with it, it becomes more difficult.

Your situation in this PR has existed for all of us one day, like me confused, ambiguous and 🏋️

You are not the first person in this situation and you will not be the last 🐍

The conflict and difficulties of these PR can make you interested in learning new topics such as git, github cli ,phpunit test and... think positive 🦾

As @kenjis' said before, if you don't succeed, just create a new PR.

@datamweb datamweb added the stale Pull requests with conflicts label Apr 22, 2023
@kenjis kenjis changed the title Add Dutch Languages lang: [ln] Add Dutch Languages Jun 29, 2023
@kenjis kenjis changed the title lang: [ln] Add Dutch Languages lang: [nl] Add Dutch Languages Jun 29, 2023
@kenjis
Copy link
Member

kenjis commented Aug 11, 2023

If you don't know how to use git, I recommend you try https://learngitbranching.js.org/

@snelledre snelledre closed this by deleting the head repository Aug 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
GPG-Signing needed Pull requests that need GPG-Signing lang Languages file stale Pull requests with conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants