Language: Make production error message translatable #6197

sba · 2022-06-28T12:45:56Z

With this pull request the error message in the file app/Views/errors/html/production.php can be translated.

I have named the file Errors.php because the translation of app/Views/errors/html/error_exception.php could also be added later.

kenjis · 2022-06-29T01:57:45Z

Thank you for sending a PR.

You must GPG-sign your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open-source project. See Developer's Certificate of Origin.
See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#signing

kenjis · 2022-06-29T01:58:24Z

app/Views/errors/html/production.php

    <meta name="robots" content="noindex">

-    <title>Whoops!</title>
+    <title><?= lang('Errors.whoops')?></title>


Suggested change

<title><?= lang('Errors.whoops')?></title>

<title><?= lang('Errors.whoops') ?></title>

kenjis · 2022-06-29T01:58:39Z

app/Views/errors/html/production.php

    <div class="container text-center">

-        <h1 class="headline">Whoops!</h1>
+        <h1 class="headline"><?= lang('Errors.whoops')?></h1>


Suggested change

<h1 class="headline"><?= lang('Errors.whoops')?></h1>

<h1 class="headline"><?= lang('Errors.whoops') ?></h1>

kenjis · 2022-06-29T01:58:51Z

app/Views/errors/html/production.php

+        <h1 class="headline"><?= lang('Errors.whoops')?></h1>

-        <p class="lead">We seem to have hit a snag. Please try again later...</p>
+        <p class="lead"><?= lang('Errors.weHitASnag')?></p>


Suggested change

<p class="lead"><?= lang('Errors.weHitASnag')?></p>

<p class="lead"><?= lang('Errors.weHitASnag') ?></p>

sba · 2022-06-29T08:10:11Z

Hi @kenjis
Thanks for checking my PR and the GPG links. I will try to GPG-sign my commit...never did this before. Should I close this PR and make a new, signed one?
And is the naming "Errors.php" acceptable or do you have a better suggestion?
I thought about another name in case welcome_message.php should be made translatable later - but I think it would be better to name it for this Welcome.php anyway.

kenjis · 2022-06-29T08:30:01Z

Should I close this PR and make a new, signed one?

No. You can do git commit --amend, and force push.

MGatner · 2022-06-29T10:16:09Z

This should go to 4.3 branch. I'm fine with this change but just to note two things:

These files are already in app/ so can be modified for any display already.
The new language file will require adoption by the translations repo before this will actually work.

kenjis · 2022-06-29T10:30:11Z

Agreed. It seems better to go to 4.3.

sba · 2022-06-29T12:05:38Z

These files are already in app/ so can be modified for any display already.

Yes, of corse. But with lang() functions it's multilingual out of the box.

sba · 2022-06-29T12:07:54Z

The new language file will require adoption by the translations repo before this will actually work.

I will have a look to the translations repo and try to update the necessary things (tests etc.)

MGatner · 2022-06-30T10:29:27Z

Thanks @sba. To clarify, this should work fine without the translations (it falls back to English), but any additions you can make to the translations repo to go along with it would be appreciated!

ddevsr · 2022-07-01T11:25:38Z

With this PR, must include in :
https://github.com/codeigniter4/CodeIgniter4/blob/develop/app/Views/errors/html/error_404.php#L79

Sorry! Cannot seem to find the page you were looking for. can multilingual too

[Rector] Apply Rector run on utils/ directory

Apply github workflow to run rector on utils/ directory

fix: Builder insert()/update() does not accept an object

docs: improve contributing Pull Request

kenjis

This should go to 4.3 branch. Please change the base branch.

kenjis

LGTM!

kenjis · 2022-07-05T09:32:14Z

@sba You forgot to sign your commits.
See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#signing

sba · 2022-07-05T10:08:13Z

@sba You forgot to sign your commits. See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#signing

Yes, I know, sorry! It's a crap, I've wasted hours on it and signing still doesn't work...... I'll try again, sometime.

MGatner

Looks good! I like @ddevsr's suggestion to include the 404 error as well, but that could be a separate PR if you're done with this.

Done in the Github editor, should now be signed!

Revert Code Style

Code Style

kenjis

There are many unrelated commits.
Please drop these.

kenjis · 2022-07-05T21:48:50Z

@sba Thank you for GPG signing.

But unfortunately this PR branch has many unrelated commits.
You need to clean up the branch.

I recommend you create a new branch from 4.3,
See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#branching-revisited
and cherry-pick commits you made.
After that remove this PR branch develop, and rename the new branch to develop and force push.

Or it is easier just to create another PR.

Language: Make production error message translatable

b485b50

kenjis reviewed Jun 29, 2022

View reviewed changes

kenjis added 3 commits July 2, 2022 08:06

docs: add about when create branch from next-minor-version-branch

0bd4119

docs: add instruction to create branch from next minor version branch

32961f6

docs: change command style

9aa0c84

kenjis added the enhancement PRs that improve existing functionalities label Jul 1, 2022

kenjis and others added 11 commits July 2, 2022 08:29

docs: brach from develop should be for bugfix PR

4e47e36

fix: Builder insert() does not accept an object

29ed7b4

fix: Builder update() does not accept an object

40252f2

docs: add changelog

8a63886

[Rector] Apply Rector run on utils/ directory

7284998

Merge pull request #6225 from samsonasik/apply-rector-run-on-utils

1d767fd

[Rector] Apply Rector run on utils/ directory

Apply github workflow to run rector on utils/ directory

ea2a074

Merge pull request #6226 from codeigniter4/samsonasik-patch-1

ce951b1

Apply github workflow to run rector on utils/ directory

Merge pull request #6216 from kenjis/fix-builder-insert-update-objects

ddf26e5

fix: Builder insert()/update() does not accept an object

Merge pull request #6222 from kenjis/fix-contributing-PR

edb894f

docs: improve contributing Pull Request

Codestyle

6ce810f

kenjis requested changes Jul 5, 2022

View reviewed changes

sba changed the base branch from develop to 4.3 July 5, 2022 09:15

sba requested a review from kenjis July 5, 2022 09:25

kenjis approved these changes Jul 5, 2022

View reviewed changes

MGatner approved these changes Jul 5, 2022

View reviewed changes

sba and others added 6 commits July 5, 2022 14:33

Update production.php

45d65f1

Done in the Github editor, should now be signed!

Update Errors.php

c0f1a1e

Done in the Github editor, should now be signed!

Revert code style

b71d5cd

Update Errors.php

e61acb9

Revert Code Style

Merge branch 'codeigniter4:develop' into develop

db7e43e

Update production.php

0d5a3ed

Code Style

kenjis requested changes Jul 5, 2022

View reviewed changes

kenjis mentioned this pull request Jul 6, 2022

Language: Make production error message translatable (replaces #6197) #6235

Merged

This pull request was closed.

	<title><?= lang('Errors.whoops')?></title>
	<title><?= lang('Errors.whoops') ?></title>

	<h1 class="headline"><?= lang('Errors.whoops')?></h1>
	<h1 class="headline"><?= lang('Errors.whoops') ?></h1>

	<p class="lead"><?= lang('Errors.weHitASnag')?></p>
	<p class="lead"><?= lang('Errors.weHitASnag') ?></p>

Language: Make production error message translatable #6197

Language: Make production error message translatable #6197

Uh oh!

Conversation

sba commented Jun 28, 2022

Uh oh!

kenjis commented Jun 29, 2022

Uh oh!

kenjis Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

kenjis Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

kenjis Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

sba commented Jun 29, 2022

Uh oh!

kenjis commented Jun 29, 2022

Uh oh!

MGatner commented Jun 29, 2022

Uh oh!

kenjis commented Jun 29, 2022

Uh oh!

sba commented Jun 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sba commented Jun 29, 2022

Uh oh!

MGatner commented Jun 30, 2022

Uh oh!

ddevsr commented Jul 1, 2022

Uh oh!

kenjis left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kenjis left a comment

Choose a reason for hiding this comment

Uh oh!

kenjis commented Jul 5, 2022

Uh oh!

sba commented Jul 5, 2022

Uh oh!

MGatner left a comment

Choose a reason for hiding this comment

Uh oh!

kenjis left a comment

Choose a reason for hiding this comment

Uh oh!

kenjis commented Jul 5, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

sba commented Jun 29, 2022 •

edited

Loading

kenjis left a comment •

edited

Loading