-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Fixed consistency in language strings #6414
Conversation
Will work on the failed tests once I understand how to run the database tests locally... |
I think this is not a bug fix, so it is better to go to |
The database tests work by default, because the default config is to use SQLite3. |
@tangix The failures all appear to be expected language string changes. If I were you I would pull up the Actions log for one of the tests (I.e. https://github.com/codeigniter4/CodeIgniter4/runs/7966690208?check_suite_focus=true) and use that to track down the strings that need changing. Thanks for taking this on! Seeing that we previously had strings like this makes me even more grateful:
|
@MGatner I did not know it. It is unreasonable to require users to read and remember all past changelogs. |
Agreed. We had a contributor comment to that effect, not sure why it was ignored: #4068 (review) |
@kenjis |
@tangix As MGatner says this is not a breaking change. So we can merge into |
@kenjis OK, I’ll sit on the sideline watching you sort it out. |
@MGatner This is not a breaking change, but the changes are many. |
Oh yes that's absolutely fine! I was referring to the |
@tangix Could you create a new PR for the 4.3 branch? |
@tangix One more thing. Something like this is sufficient:
|
$ git remote add upstream git@github.com:codeigniter4/CodeIgniter4.git
$ git fetch upstream
$ git switch 4.3
$ git push origin 4.3 |
5adfe11
to
7c9bf66
Compare
OK.... thanks for all the help! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@@ -31,9 +31,9 @@ | |||
'commandType' => 'Command type', | |||
'databaseGroup' => 'Database group', | |||
'fileCreate' => 'File created: {0}', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
'fileCreate' => 'File created: {0}', | |
'fileCreate' => 'File created: "{0}"', |
Can you rebase to resolve the conflict? |
Hmmmm.... don't know if I managed to rebase, in GitKraken it looks like I didn't succeed. |
Obviously you ran But no problem. All you need to do is still $ git fetch upstream
$ git rebase upstream/4.3 ...Resolve conflict... $ git add -u
$ git rebase --continue Rebase is complete. And force push:
|
…x/CodeIgniter4 into lang-consistency-fixes
@kenjis I really appreciate your efforts but seems like I am a complete idiot when it comes to using github (we are using git on a daily bases for multiple projects but rebase is something I have never needed to do). As said before - I am perfectly fine re-forking and doing all again. This might save us both a lot of time and efforts.
|
No problem. If you don't use
After running
And I recommend you don't use |
Description
Referencing #6341
Updated strings in Language/en to improve consistency.
Checklist: