Skip to content

feat: Language translations finder and update - #7889

Closed
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder
Closed

feat: Language translations finder and update#7889
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder

Conversation

@neznaika0

@neznaika0neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
Contributor

Description
See thread https://forum.codeigniter.com/showthread.php?tid=88299
Ready to discuss the solution

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added 4.5 new feature PRs for new features docs needed Pull requests needing documentation write-ups and/or revisions. labels Sep 2, 2023
@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I fixed typehint for PHP 7.4

@kenjis

Copy link
Copy Markdown
Member

Comment threadtests/system/Commands/Translation/LocalizationFinderTest.php
@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

@neznaika0

neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
ContributorAuthor

There is a conflict between the Rector and php-cs-fixer (pre-commit). The rector erases the indents in the method, and php-cs-fixer adds.

 ---------- begin diff ----------
--- /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php+++ /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php@@ -149,33 +149,33 @@
private function getActualTableWithNewKeys(): string
{
return <<<'TEXT_WRAP'
-+------------------+----------------------------------------------------+-| File | Key |-+------------------+----------------------------------------------------+-| TranslationOne | TranslationOne.Copyright |
...many lines
-| TranslationThree | TranslationThree.formFields.new.short_tag |-+------------------+----------------------------------------------------+-TEXT_WRAP;+ +------------------+----------------------------------------------------++ | File | Key |+ +------------------+----------------------------------------------------++ | TranslationOne | TranslationOne.Copyright |
...many lines
+ | TranslationThree | TranslationThree.formFields.new.short_tag |+ +------------------+----------------------------------------------------++ TEXT_WRAP;
}
private function realizeAssertion(): void
----------- end diff -----------

EDIT: Should I move files from Controllers/Translation to another location? This violates the router's tests

@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

The conflict is not a problem. We always need to run composer cs-fix after refactoring by rector.

@kenjis

Copy link
Copy Markdown
Member

Should I move files from Controllers/Translation to another location? This violates the router's tests

If possible, it is better.
Or update the failed tests.

@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I moved it to another folder with examples.
Added some description in the guide.

Is it possible to get an assessment of the work, is it worth continuing? Or will the function be rejected after the tests?

@kenjiskenjis removed the docs needed Pull requests needing documentation write-ups and/or revisions. label Sep 2, 2023
@kenjis

Copy link
Copy Markdown
Member

We have not yet reviewed the contents of the code because the GitHub Action checks have not passed.

However, this feature is useful and I would like to include it in 4.5.

$countNewKeys += $this->arrayCountRecursive($languageDiff);

if ($cliOptionShowNew) {
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);

@ddevsrddevsrSep 3, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I would like use

Suggested change
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);
$tableRows = [$this->arrayToTableRows($langFileName, $languageDiff), $tableRows];

Ref : https://github.com/rectorphp/rector/blob/main/docs/rector_rules_overview.md#arraymergeofnonarraystosimplearrayrector

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

No. Read the instructions carefully.
You are trying to merge two arrays, and the documentation talks about strings. This will result in an error.

  • I applied the Rector before the commit

dependabotBotand others added 6 commits September 4, 2023 15:17
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
…hub_actions/actions/checkout-4
build(deps): bump actions/checkout from 3 to 4
@neznaika0

neznaika0 commented Sep 4, 2023

Copy link
Copy Markdown
ContributorAuthor

Oops. My commit has merged with the develop branch. Is it ugly? Do I now need a branch from 4.5 and not develop?

I added to PR dashed keys search as lang('Lang-File.dashed.key-with-dash')

@neznaika0
neznaika0 deleted the feat-language-finder branch September 14, 2023 09:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

new featurePRs for new features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@neznaika0@kenjis@ddevsr@samsonasik
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: Language translations finder and update by neznaika0 · Pull Request #7889 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

feat: Language translations finder and update - #7889

Closed
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder
Closed

feat: Language translations finder and update#7889
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder

Conversation

@neznaika0

@neznaika0neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
Contributor

Description
See thread https://forum.codeigniter.com/showthread.php?tid=88299
Ready to discuss the solution

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added 4.5 new feature PRs for new features docs needed Pull requests needing documentation write-ups and/or revisions. labels Sep 2, 2023
@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I fixed typehint for PHP 7.4

@kenjis

Copy link
Copy Markdown
Member

Comment threadtests/system/Commands/Translation/LocalizationFinderTest.php
@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

@neznaika0

neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
ContributorAuthor

There is a conflict between the Rector and php-cs-fixer (pre-commit). The rector erases the indents in the method, and php-cs-fixer adds.

 ---------- begin diff ----------
--- /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php+++ /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php@@ -149,33 +149,33 @@
private function getActualTableWithNewKeys(): string
{
return <<<'TEXT_WRAP'
-+------------------+----------------------------------------------------+-| File | Key |-+------------------+----------------------------------------------------+-| TranslationOne | TranslationOne.Copyright |
...many lines
-| TranslationThree | TranslationThree.formFields.new.short_tag |-+------------------+----------------------------------------------------+-TEXT_WRAP;+ +------------------+----------------------------------------------------++ | File | Key |+ +------------------+----------------------------------------------------++ | TranslationOne | TranslationOne.Copyright |
...many lines
+ | TranslationThree | TranslationThree.formFields.new.short_tag |+ +------------------+----------------------------------------------------++ TEXT_WRAP;
}
private function realizeAssertion(): void
----------- end diff -----------

EDIT: Should I move files from Controllers/Translation to another location? This violates the router's tests

@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

The conflict is not a problem. We always need to run composer cs-fix after refactoring by rector.

@kenjis

Copy link
Copy Markdown
Member

Should I move files from Controllers/Translation to another location? This violates the router's tests

If possible, it is better.
Or update the failed tests.

@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I moved it to another folder with examples.
Added some description in the guide.

Is it possible to get an assessment of the work, is it worth continuing? Or will the function be rejected after the tests?

@kenjiskenjis removed the docs needed Pull requests needing documentation write-ups and/or revisions. label Sep 2, 2023
@kenjis

Copy link
Copy Markdown
Member

We have not yet reviewed the contents of the code because the GitHub Action checks have not passed.

However, this feature is useful and I would like to include it in 4.5.

$countNewKeys += $this->arrayCountRecursive($languageDiff);

if ($cliOptionShowNew) {
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);

@ddevsrddevsrSep 3, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I would like use

Suggested change
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);
$tableRows = [$this->arrayToTableRows($langFileName, $languageDiff), $tableRows];

Ref : https://github.com/rectorphp/rector/blob/main/docs/rector_rules_overview.md#arraymergeofnonarraystosimplearrayrector

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

No. Read the instructions carefully.
You are trying to merge two arrays, and the documentation talks about strings. This will result in an error.

  • I applied the Rector before the commit

dependabotBotand others added 6 commits September 4, 2023 15:17
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
…hub_actions/actions/checkout-4
build(deps): bump actions/checkout from 3 to 4
@neznaika0

neznaika0 commented Sep 4, 2023

Copy link
Copy Markdown
ContributorAuthor

Oops. My commit has merged with the develop branch. Is it ugly? Do I now need a branch from 4.5 and not develop?

I added to PR dashed keys search as lang('Lang-File.dashed.key-with-dash')

@neznaika0
neznaika0 deleted the feat-language-finder branch September 14, 2023 09:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

new featurePRs for new features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@neznaika0@kenjis@ddevsr@samsonasik
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: Language translations finder and update by neznaika0 · Pull Request #7889 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

feat: Language translations finder and update - #7889

Closed
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder
Closed

feat: Language translations finder and update#7889
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder

Conversation

@neznaika0

@neznaika0neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
Contributor

Description
See thread https://forum.codeigniter.com/showthread.php?tid=88299
Ready to discuss the solution

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added 4.5 new feature PRs for new features docs needed Pull requests needing documentation write-ups and/or revisions. labels Sep 2, 2023
@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I fixed typehint for PHP 7.4

@kenjis

Copy link
Copy Markdown
Member

Comment threadtests/system/Commands/Translation/LocalizationFinderTest.php
@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

@neznaika0

neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
ContributorAuthor

There is a conflict between the Rector and php-cs-fixer (pre-commit). The rector erases the indents in the method, and php-cs-fixer adds.

 ---------- begin diff ----------
--- /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php+++ /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php@@ -149,33 +149,33 @@
private function getActualTableWithNewKeys(): string
{
return <<<'TEXT_WRAP'
-+------------------+----------------------------------------------------+-| File | Key |-+------------------+----------------------------------------------------+-| TranslationOne | TranslationOne.Copyright |
...many lines
-| TranslationThree | TranslationThree.formFields.new.short_tag |-+------------------+----------------------------------------------------+-TEXT_WRAP;+ +------------------+----------------------------------------------------++ | File | Key |+ +------------------+----------------------------------------------------++ | TranslationOne | TranslationOne.Copyright |
...many lines
+ | TranslationThree | TranslationThree.formFields.new.short_tag |+ +------------------+----------------------------------------------------++ TEXT_WRAP;
}
private function realizeAssertion(): void
----------- end diff -----------

EDIT: Should I move files from Controllers/Translation to another location? This violates the router's tests

@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

The conflict is not a problem. We always need to run composer cs-fix after refactoring by rector.

@kenjis

Copy link
Copy Markdown
Member

Should I move files from Controllers/Translation to another location? This violates the router's tests

If possible, it is better.
Or update the failed tests.

@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I moved it to another folder with examples.
Added some description in the guide.

Is it possible to get an assessment of the work, is it worth continuing? Or will the function be rejected after the tests?

@kenjiskenjis removed the docs needed Pull requests needing documentation write-ups and/or revisions. label Sep 2, 2023
@kenjis

Copy link
Copy Markdown
Member

We have not yet reviewed the contents of the code because the GitHub Action checks have not passed.

However, this feature is useful and I would like to include it in 4.5.

$countNewKeys += $this->arrayCountRecursive($languageDiff);

if ($cliOptionShowNew) {
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);

@ddevsrddevsrSep 3, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I would like use

Suggested change
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);
$tableRows = [$this->arrayToTableRows($langFileName, $languageDiff), $tableRows];

Ref : https://github.com/rectorphp/rector/blob/main/docs/rector_rules_overview.md#arraymergeofnonarraystosimplearrayrector

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

No. Read the instructions carefully.
You are trying to merge two arrays, and the documentation talks about strings. This will result in an error.

  • I applied the Rector before the commit

dependabotBotand others added 6 commits September 4, 2023 15:17
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
…hub_actions/actions/checkout-4
build(deps): bump actions/checkout from 3 to 4
@neznaika0

neznaika0 commented Sep 4, 2023

Copy link
Copy Markdown
ContributorAuthor

Oops. My commit has merged with the develop branch. Is it ugly? Do I now need a branch from 4.5 and not develop?

I added to PR dashed keys search as lang('Lang-File.dashed.key-with-dash')

@neznaika0
neznaika0 deleted the feat-language-finder branch September 14, 2023 09:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

new featurePRs for new features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@neznaika0@kenjis@ddevsr@samsonasik
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: Language translations finder and update by neznaika0 · Pull Request #7889 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

feat: Language translations finder and update - #7889

Closed
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder
Closed

feat: Language translations finder and update#7889
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder

Conversation

@neznaika0

@neznaika0neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
Contributor

Description
See thread https://forum.codeigniter.com/showthread.php?tid=88299
Ready to discuss the solution

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added 4.5 new feature PRs for new features docs needed Pull requests needing documentation write-ups and/or revisions. labels Sep 2, 2023
@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I fixed typehint for PHP 7.4

@kenjis

Copy link
Copy Markdown
Member

Comment threadtests/system/Commands/Translation/LocalizationFinderTest.php
@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

@neznaika0

neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
ContributorAuthor

There is a conflict between the Rector and php-cs-fixer (pre-commit). The rector erases the indents in the method, and php-cs-fixer adds.

 ---------- begin diff ----------
--- /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php+++ /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php@@ -149,33 +149,33 @@
private function getActualTableWithNewKeys(): string
{
return <<<'TEXT_WRAP'
-+------------------+----------------------------------------------------+-| File | Key |-+------------------+----------------------------------------------------+-| TranslationOne | TranslationOne.Copyright |
...many lines
-| TranslationThree | TranslationThree.formFields.new.short_tag |-+------------------+----------------------------------------------------+-TEXT_WRAP;+ +------------------+----------------------------------------------------++ | File | Key |+ +------------------+----------------------------------------------------++ | TranslationOne | TranslationOne.Copyright |
...many lines
+ | TranslationThree | TranslationThree.formFields.new.short_tag |+ +------------------+----------------------------------------------------++ TEXT_WRAP;
}
private function realizeAssertion(): void
----------- end diff -----------

EDIT: Should I move files from Controllers/Translation to another location? This violates the router's tests

@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

The conflict is not a problem. We always need to run composer cs-fix after refactoring by rector.

@kenjis

Copy link
Copy Markdown
Member

Should I move files from Controllers/Translation to another location? This violates the router's tests

If possible, it is better.
Or update the failed tests.

@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I moved it to another folder with examples.
Added some description in the guide.

Is it possible to get an assessment of the work, is it worth continuing? Or will the function be rejected after the tests?

@kenjiskenjis removed the docs needed Pull requests needing documentation write-ups and/or revisions. label Sep 2, 2023
@kenjis

Copy link
Copy Markdown
Member

We have not yet reviewed the contents of the code because the GitHub Action checks have not passed.

However, this feature is useful and I would like to include it in 4.5.

$countNewKeys += $this->arrayCountRecursive($languageDiff);

if ($cliOptionShowNew) {
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);

@ddevsrddevsrSep 3, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I would like use

Suggested change
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);
$tableRows = [$this->arrayToTableRows($langFileName, $languageDiff), $tableRows];

Ref : https://github.com/rectorphp/rector/blob/main/docs/rector_rules_overview.md#arraymergeofnonarraystosimplearrayrector

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

No. Read the instructions carefully.
You are trying to merge two arrays, and the documentation talks about strings. This will result in an error.

  • I applied the Rector before the commit

dependabotBotand others added 6 commits September 4, 2023 15:17
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
…hub_actions/actions/checkout-4
build(deps): bump actions/checkout from 3 to 4
@neznaika0

neznaika0 commented Sep 4, 2023

Copy link
Copy Markdown
ContributorAuthor

Oops. My commit has merged with the develop branch. Is it ugly? Do I now need a branch from 4.5 and not develop?

I added to PR dashed keys search as lang('Lang-File.dashed.key-with-dash')

@neznaika0
neznaika0 deleted the feat-language-finder branch September 14, 2023 09:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

new featurePRs for new features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@neznaika0@kenjis@ddevsr@samsonasik
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat: Language translations finder and update by neznaika0 · Pull Request #7889 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

feat: Language translations finder and update - #7889

Closed
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder
Closed

feat: Language translations finder and update#7889
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder

Conversation

@neznaika0

@neznaika0neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
Contributor

Description
See thread https://forum.codeigniter.com/showthread.php?tid=88299
Ready to discuss the solution

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added 4.5 new feature PRs for new features docs needed Pull requests needing documentation write-ups and/or revisions. labels Sep 2, 2023
@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I fixed typehint for PHP 7.4

@kenjis

Copy link
Copy Markdown
Member

Comment threadtests/system/Commands/Translation/LocalizationFinderTest.php
@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

@neznaika0

neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
ContributorAuthor

There is a conflict between the Rector and php-cs-fixer (pre-commit). The rector erases the indents in the method, and php-cs-fixer adds.

 ---------- begin diff ----------
--- /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php+++ /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php@@ -149,33 +149,33 @@
private function getActualTableWithNewKeys(): string
{
return <<<'TEXT_WRAP'
-+------------------+----------------------------------------------------+-| File | Key |-+------------------+----------------------------------------------------+-| TranslationOne | TranslationOne.Copyright |
...many lines
-| TranslationThree | TranslationThree.formFields.new.short_tag |-+------------------+----------------------------------------------------+-TEXT_WRAP;+ +------------------+----------------------------------------------------++ | File | Key |+ +------------------+----------------------------------------------------++ | TranslationOne | TranslationOne.Copyright |
...many lines
+ | TranslationThree | TranslationThree.formFields.new.short_tag |+ +------------------+----------------------------------------------------++ TEXT_WRAP;
}
private function realizeAssertion(): void
----------- end diff -----------

EDIT: Should I move files from Controllers/Translation to another location? This violates the router's tests

@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

The conflict is not a problem. We always need to run composer cs-fix after refactoring by rector.

@kenjis

Copy link
Copy Markdown
Member

Should I move files from Controllers/Translation to another location? This violates the router's tests

If possible, it is better.
Or update the failed tests.

@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I moved it to another folder with examples.
Added some description in the guide.

Is it possible to get an assessment of the work, is it worth continuing? Or will the function be rejected after the tests?

@kenjiskenjis removed the docs needed Pull requests needing documentation write-ups and/or revisions. label Sep 2, 2023
@kenjis

Copy link
Copy Markdown
Member

We have not yet reviewed the contents of the code because the GitHub Action checks have not passed.

However, this feature is useful and I would like to include it in 4.5.

$countNewKeys += $this->arrayCountRecursive($languageDiff);

if ($cliOptionShowNew) {
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);

@ddevsrddevsrSep 3, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I would like use

Suggested change
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);
$tableRows = [$this->arrayToTableRows($langFileName, $languageDiff), $tableRows];

Ref : https://github.com/rectorphp/rector/blob/main/docs/rector_rules_overview.md#arraymergeofnonarraystosimplearrayrector

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

No. Read the instructions carefully.
You are trying to merge two arrays, and the documentation talks about strings. This will result in an error.

  • I applied the Rector before the commit

dependabotBotand others added 6 commits September 4, 2023 15:17
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
…hub_actions/actions/checkout-4
build(deps): bump actions/checkout from 3 to 4
@neznaika0

neznaika0 commented Sep 4, 2023

Copy link
Copy Markdown
ContributorAuthor

Oops. My commit has merged with the develop branch. Is it ugly? Do I now need a branch from 4.5 and not develop?

I added to PR dashed keys search as lang('Lang-File.dashed.key-with-dash')

@neznaika0
neznaika0 deleted the feat-language-finder branch September 14, 2023 09:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

new featurePRs for new features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@neznaika0@kenjis@ddevsr@samsonasik
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: Language translations finder and update by neznaika0 · Pull Request #7889 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

feat: Language translations finder and update - #7889

Closed
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder
Closed

feat: Language translations finder and update#7889
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder

Conversation

@neznaika0

@neznaika0neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
Contributor

Description
See thread https://forum.codeigniter.com/showthread.php?tid=88299
Ready to discuss the solution

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added 4.5 new feature PRs for new features docs needed Pull requests needing documentation write-ups and/or revisions. labels Sep 2, 2023
@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I fixed typehint for PHP 7.4

@kenjis

Copy link
Copy Markdown
Member

Comment threadtests/system/Commands/Translation/LocalizationFinderTest.php
@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

@neznaika0

neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
ContributorAuthor

There is a conflict between the Rector and php-cs-fixer (pre-commit). The rector erases the indents in the method, and php-cs-fixer adds.

 ---------- begin diff ----------
--- /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php+++ /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php@@ -149,33 +149,33 @@
private function getActualTableWithNewKeys(): string
{
return <<<'TEXT_WRAP'
-+------------------+----------------------------------------------------+-| File | Key |-+------------------+----------------------------------------------------+-| TranslationOne | TranslationOne.Copyright |
...many lines
-| TranslationThree | TranslationThree.formFields.new.short_tag |-+------------------+----------------------------------------------------+-TEXT_WRAP;+ +------------------+----------------------------------------------------++ | File | Key |+ +------------------+----------------------------------------------------++ | TranslationOne | TranslationOne.Copyright |
...many lines
+ | TranslationThree | TranslationThree.formFields.new.short_tag |+ +------------------+----------------------------------------------------++ TEXT_WRAP;
}
private function realizeAssertion(): void
----------- end diff -----------

EDIT: Should I move files from Controllers/Translation to another location? This violates the router's tests

@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

The conflict is not a problem. We always need to run composer cs-fix after refactoring by rector.

@kenjis

Copy link
Copy Markdown
Member

Should I move files from Controllers/Translation to another location? This violates the router's tests

If possible, it is better.
Or update the failed tests.

@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I moved it to another folder with examples.
Added some description in the guide.

Is it possible to get an assessment of the work, is it worth continuing? Or will the function be rejected after the tests?

@kenjiskenjis removed the docs needed Pull requests needing documentation write-ups and/or revisions. label Sep 2, 2023
@kenjis

Copy link
Copy Markdown
Member

We have not yet reviewed the contents of the code because the GitHub Action checks have not passed.

However, this feature is useful and I would like to include it in 4.5.

$countNewKeys += $this->arrayCountRecursive($languageDiff);

if ($cliOptionShowNew) {
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);

@ddevsrddevsrSep 3, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I would like use

Suggested change
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);
$tableRows = [$this->arrayToTableRows($langFileName, $languageDiff), $tableRows];

Ref : https://github.com/rectorphp/rector/blob/main/docs/rector_rules_overview.md#arraymergeofnonarraystosimplearrayrector

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

No. Read the instructions carefully.
You are trying to merge two arrays, and the documentation talks about strings. This will result in an error.

  • I applied the Rector before the commit

dependabotBotand others added 6 commits September 4, 2023 15:17
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
…hub_actions/actions/checkout-4
build(deps): bump actions/checkout from 3 to 4
@neznaika0

neznaika0 commented Sep 4, 2023

Copy link
Copy Markdown
ContributorAuthor

Oops. My commit has merged with the develop branch. Is it ugly? Do I now need a branch from 4.5 and not develop?

I added to PR dashed keys search as lang('Lang-File.dashed.key-with-dash')

@neznaika0
neznaika0 deleted the feat-language-finder branch September 14, 2023 09:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

new featurePRs for new features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@neznaika0@kenjis@ddevsr@samsonasik
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: Language translations finder and update by neznaika0 · Pull Request #7889 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

feat: Language translations finder and update - #7889

Closed
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder
Closed

feat: Language translations finder and update#7889
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder

Conversation

@neznaika0

@neznaika0neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
Contributor

Description
See thread https://forum.codeigniter.com/showthread.php?tid=88299
Ready to discuss the solution

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added 4.5 new feature PRs for new features docs needed Pull requests needing documentation write-ups and/or revisions. labels Sep 2, 2023
@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I fixed typehint for PHP 7.4

@kenjis

Copy link
Copy Markdown
Member

Comment threadtests/system/Commands/Translation/LocalizationFinderTest.php
@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

@neznaika0

neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
ContributorAuthor

There is a conflict between the Rector and php-cs-fixer (pre-commit). The rector erases the indents in the method, and php-cs-fixer adds.

 ---------- begin diff ----------
--- /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php+++ /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php@@ -149,33 +149,33 @@
private function getActualTableWithNewKeys(): string
{
return <<<'TEXT_WRAP'
-+------------------+----------------------------------------------------+-| File | Key |-+------------------+----------------------------------------------------+-| TranslationOne | TranslationOne.Copyright |
...many lines
-| TranslationThree | TranslationThree.formFields.new.short_tag |-+------------------+----------------------------------------------------+-TEXT_WRAP;+ +------------------+----------------------------------------------------++ | File | Key |+ +------------------+----------------------------------------------------++ | TranslationOne | TranslationOne.Copyright |
...many lines
+ | TranslationThree | TranslationThree.formFields.new.short_tag |+ +------------------+----------------------------------------------------++ TEXT_WRAP;
}
private function realizeAssertion(): void
----------- end diff -----------

EDIT: Should I move files from Controllers/Translation to another location? This violates the router's tests

@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

The conflict is not a problem. We always need to run composer cs-fix after refactoring by rector.

@kenjis

Copy link
Copy Markdown
Member

Should I move files from Controllers/Translation to another location? This violates the router's tests

If possible, it is better.
Or update the failed tests.

@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I moved it to another folder with examples.
Added some description in the guide.

Is it possible to get an assessment of the work, is it worth continuing? Or will the function be rejected after the tests?

@kenjiskenjis removed the docs needed Pull requests needing documentation write-ups and/or revisions. label Sep 2, 2023
@kenjis

Copy link
Copy Markdown
Member

We have not yet reviewed the contents of the code because the GitHub Action checks have not passed.

However, this feature is useful and I would like to include it in 4.5.

$countNewKeys += $this->arrayCountRecursive($languageDiff);

if ($cliOptionShowNew) {
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);

@ddevsrddevsrSep 3, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I would like use

Suggested change
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);
$tableRows = [$this->arrayToTableRows($langFileName, $languageDiff), $tableRows];

Ref : https://github.com/rectorphp/rector/blob/main/docs/rector_rules_overview.md#arraymergeofnonarraystosimplearrayrector

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

No. Read the instructions carefully.
You are trying to merge two arrays, and the documentation talks about strings. This will result in an error.

  • I applied the Rector before the commit

dependabotBotand others added 6 commits September 4, 2023 15:17
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
…hub_actions/actions/checkout-4
build(deps): bump actions/checkout from 3 to 4
@neznaika0

neznaika0 commented Sep 4, 2023

Copy link
Copy Markdown
ContributorAuthor

Oops. My commit has merged with the develop branch. Is it ugly? Do I now need a branch from 4.5 and not develop?

I added to PR dashed keys search as lang('Lang-File.dashed.key-with-dash')

@neznaika0
neznaika0 deleted the feat-language-finder branch September 14, 2023 09:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

new featurePRs for new features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@neznaika0@kenjis@ddevsr@samsonasik
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat: Language translations finder and update by neznaika0 · Pull Request #7889 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

feat: Language translations finder and update - #7889

Closed
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder
Closed

feat: Language translations finder and update#7889
neznaika0 wants to merge 15 commits into
codeigniter4:4.5from
neznaika0:feat-language-finder

Conversation

@neznaika0

@neznaika0neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
Contributor

Description
See thread https://forum.codeigniter.com/showthread.php?tid=88299
Ready to discuss the solution

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added 4.5 new feature PRs for new features docs needed Pull requests needing documentation write-ups and/or revisions. labels Sep 2, 2023
@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I fixed typehint for PHP 7.4

@kenjis

Copy link
Copy Markdown
Member

Comment threadtests/system/Commands/Translation/LocalizationFinderTest.php
@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

@neznaika0

neznaika0 commented Sep 2, 2023

Copy link
Copy Markdown
ContributorAuthor

There is a conflict between the Rector and php-cs-fixer (pre-commit). The rector erases the indents in the method, and php-cs-fixer adds.

 ---------- begin diff ----------
--- /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php+++ /home/aleksandr/www/codeigniter/tests/system/Commands/Translation/LocalizationFinderTest.php@@ -149,33 +149,33 @@
private function getActualTableWithNewKeys(): string
{
return <<<'TEXT_WRAP'
-+------------------+----------------------------------------------------+-| File | Key |-+------------------+----------------------------------------------------+-| TranslationOne | TranslationOne.Copyright |
...many lines
-| TranslationThree | TranslationThree.formFields.new.short_tag |-+------------------+----------------------------------------------------+-TEXT_WRAP;+ +------------------+----------------------------------------------------++ | File | Key |+ +------------------+----------------------------------------------------++ | TranslationOne | TranslationOne.Copyright |
...many lines
+ | TranslationThree | TranslationThree.formFields.new.short_tag |+ +------------------+----------------------------------------------------++ TEXT_WRAP;
}
private function realizeAssertion(): void
----------- end diff -----------

EDIT: Should I move files from Controllers/Translation to another location? This violates the router's tests

@kenjis

kenjis commented Sep 2, 2023

Copy link
Copy Markdown
Member

The conflict is not a problem. We always need to run composer cs-fix after refactoring by rector.

@kenjis

Copy link
Copy Markdown
Member

Should I move files from Controllers/Translation to another location? This violates the router's tests

If possible, it is better.
Or update the failed tests.

@neznaika0

Copy link
Copy Markdown
ContributorAuthor

I moved it to another folder with examples.
Added some description in the guide.

Is it possible to get an assessment of the work, is it worth continuing? Or will the function be rejected after the tests?

@kenjiskenjis removed the docs needed Pull requests needing documentation write-ups and/or revisions. label Sep 2, 2023
@kenjis

Copy link
Copy Markdown
Member

We have not yet reviewed the contents of the code because the GitHub Action checks have not passed.

However, this feature is useful and I would like to include it in 4.5.

$countNewKeys += $this->arrayCountRecursive($languageDiff);

if ($cliOptionShowNew) {
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);

@ddevsrddevsrSep 3, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I would like use

Suggested change
$tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);
$tableRows = [$this->arrayToTableRows($langFileName, $languageDiff), $tableRows];

Ref : https://github.com/rectorphp/rector/blob/main/docs/rector_rules_overview.md#arraymergeofnonarraystosimplearrayrector

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

No. Read the instructions carefully.
You are trying to merge two arrays, and the documentation talks about strings. This will result in an error.

  • I applied the Rector before the commit

dependabotBotand others added 6 commits September 4, 2023 15:17
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
…hub_actions/actions/checkout-4
build(deps): bump actions/checkout from 3 to 4
@neznaika0

neznaika0 commented Sep 4, 2023

Copy link
Copy Markdown
ContributorAuthor

Oops. My commit has merged with the develop branch. Is it ugly? Do I now need a branch from 4.5 and not develop?

I added to PR dashed keys search as lang('Lang-File.dashed.key-with-dash')

@neznaika0
neznaika0 deleted the feat-language-finder branch September 14, 2023 09:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

new featurePRs for new features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@neznaika0@kenjis@ddevsr@samsonasik