pt-BR

[caosdp-rs]

Supersedes #613

[datamweb]

Suggested change

	BrazilianTranslationTest::class => 'pt-BR',
	BrazilianTranslationTest::class => 'pt-BR',

[datamweb]

Hello.
Thanks for the PR and welcome to Shield.

Please sign all your commits.

Also, we have the error Code Style, to fix it, you can run the following command:

composer cs-fix 

[datamweb]

Hi @kenjis,
The question is, why have we used the namespace in the language file! I didn't see any explanation in the documentation about using the namespace for the languages file.
See https://codeigniter.com/user_guide/outgoing/localization.html#id6

Edit:

if you are using the locale fr-CA, then a localized message will first be sought in Language/fr/CA, then in Language/fr, and finally in Language/en.

https://codeigniter.com/user_guide/outgoing/localization.html#id8

[kenjis]

@datamweb Setting namespace in lang files is a mistake.

I sent PR codeigniter4/CodeIgniter4#7210

[kenjis]

Please remove these lines.

[kenjis]

@caosdp-rs It seems you added commits that you didn't make.
Please run git rebase to update your PR branch.
See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch

[kenjis]

There are 4 failing checks in GitHub Actions.
Please fix them.

And I would like you to git rebase not git merge if you can.

[caosdp-rs]

There are 4 failing checks in GitHub Actions. Please fix them.

And I would like you to git rebase not git merge if you can.

PS C:\candre\shield> git rebase
error: cannot rebase: You have unstaged changes.
error: Please commit or stash them.

PS C:\candre\shield> git add .
warning: in the working copy of 'src/Language/pt-BR/Auth.php', LF will be replaced by CRLF the next time Git touches it
PS C:\candre\shield> git commit -m "Teste."
gpg: WARNING: server 'gpg-agent' is older than us (2.2.27-unknown < 2.2.29-unknown)
gpg: Note: Outdated servers may lack important security fixes.
gpg: Note: Use the command "gpgconf --kill all" to restart them.
[develop b051b5a] Teste.
1 file changed, 2 insertions(+), 3 deletions(-)
PS C:\candre\shield> git rebase
Current branch develop is up to date.

[kenjis]

> git fetch upstream
> git switch develop
> git rebase upstream/develop

[caosdp-rs]

git rebase upstream/develop

PS C:\candre\shield> git remote add upstream https://github.com/codeigniter4/shield.git
PS C:\candre\shield> git fetch upstream
remote: Enumerating objects: 84, done.
remote: Counting objects: 100% (28/28), done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 84 (delta 17), reused 18 (delta 17), pack-reused 56
Unpacking objects: 100% (84/84), 528.47 KiB | 1.06 MiB/s, done.
From https://github.com/codeigniter4/shield

• [new branch] develop -> upstream/develop
• [new branch] gh-pages -> upstream/gh-pages
• [new branch] master -> upstream/master
• [new tag] v1.0.0-beta -> v1.0.0-beta
• [new tag] v1.0.0-beta.2 -> v1.0.0-beta.2
• [new tag] v1.0.0-beta.3 -> v1.0.0-beta.3
  PS C:\candre\shield> git switch develop
  Already on 'develop'
  M tests/Language/BrazilianTranslationTest.php
  Your branch is up to date with 'origin/develop'.
  PS C:\candre\shield> git rebase upstream/develop
  error: cannot rebase: You have unstaged changes.
  error: Please commit or stash them.

[kenjis]

> git stash
> git rebase upstream/develop

If you want to get back your local changes:

> git stash pop

[kenjis]

Please resolve conflicts.

[kenjis]

Please resolve conflicts.