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

Append missing slash to locale directory #174

Merged
merged 1 commit into from
Apr 23, 2020

Conversation

mvorisek
Copy link
Member

No description provided.

@codecov
Copy link

codecov bot commented Apr 23, 2020

Codecov Report

Merging #174 into develop will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             develop     #174   +/-   ##
==========================================
  Coverage      97.03%   97.03%           
  Complexity       448      448           
==========================================
  Files             24       24           
  Lines           1046     1046           
==========================================
  Hits            1015     1015           
  Misses            31       31           
Impacted Files Coverage Δ Complexity Δ
src/Translator/Adapter/Generic.php 100.00% <100.00%> (ø) 18.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 48cee66...5687c7b. Read the comment docs.

@@ -95,7 +95,7 @@ protected function loadDefinitionATK(string $locale): void

if (class_exists('\atk4\data\Locale')) {
$path = Locale::getPath();
$this->addDefinitionFromFile($path . $locale . '/atk.php', $locale, 'atk', 'php-inline');
$this->addDefinitionFromFile($path . '/' . $locale . '/atk.php', $locale, 'atk', 'php-inline');
Copy link
Collaborator

Choose a reason for hiding this comment

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

I suggest replacing / with DIRECTORY_SEPARATOR here

Copy link
Member Author

@mvorisek mvorisek Apr 23, 2020

Choose a reason for hiding this comment

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

I already fixed your feedback for this in atk4/ui#1124 , but it should be not needed and as you can see here - a few chars later :) there is /. So LGTM?

PS: / does work on WIndows perfectly, if there are any issues is general, let me know

Copy link
Collaborator

@georgehristov georgehristov Apr 23, 2020

Choose a reason for hiding this comment

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

We can make it better than it was (replacing the existing /) :)
It is just to keep it being OS agnostic as far as possible

Copy link
Member Author

Choose a reason for hiding this comment

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

It is up too you to fix this, I will not propose these changes.

Copy link
Collaborator

@georgehristov georgehristov left a comment

Choose a reason for hiding this comment

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

LGTM

@mvorisek mvorisek merged commit 39a9583 into develop Apr 23, 2020
@mvorisek mvorisek deleted the mvorisek-patch-locale_slash branch April 23, 2020 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants