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

Update Locale File Keys #1006

Merged
merged 25 commits into from
Aug 16, 2019

Conversation

amosfolz
Copy link
Contributor

@amosfolz amosfolz commented Jul 1, 2019

Generated missing locale keys for all languages using PR #992 locale:fix-keys command.

The empty key values were populated using en_US and can be identified via locales:missing-values command.

(also wanted to check these files will pass style-ci check)

I also had to go through and modify some files manually to fix keys that were present in other locales but not in en_US. Some of these were due to keys not being in correct sub keys or improper formatting.

amosfolz added 13 commits July 1, 2019 21:02
Added missing keys to ar locale files.
add missing keys for de_DE locale files
add missing keys to es locale files
add missing keys to es_ES locale files
add missing keys to fa locale files
add missing keys to fr_FR locale files.
add missing keys to it_IT locale files
add missing keys to pt_PT locale files.
add missing keys to th_TH locale files.
add missing keys to tr locale files
add missing keys for zh_CN locale files.
Find and remove/fix keys present in other locale files but not found in en_US.
Find and remove/fix keys present in other locale files but not found in en_US
@codecov
Copy link

codecov bot commented Jul 1, 2019

Codecov Report

Merging #1006 into develop will not change coverage.
The diff coverage is 20%.

Impacted file tree graph

@@            Coverage Diff             @@
##             develop    #1006   +/-   ##
==========================================
  Coverage      66.99%   66.99%           
  Complexity      1923     1923           
==========================================
  Files            161      161           
  Lines           6703     6703           
==========================================
  Hits            4491     4491           
  Misses          2212     2212
Impacted Files Coverage Δ Complexity Δ
app/sprinkles/core/src/Util/CheckEnvironment.php 2.91% <0%> (ø) 41 <0> (ø) ⬇️
...sprinkles/admin/src/Controller/GroupController.php 100% <100%> (ø) 55 <0> (ø) ⬇️
.../sprinkles/admin/src/Controller/RoleController.php 100% <100%> (ø) 71 <0> (ø) ⬇️
.../sprinkles/admin/src/Controller/UserController.php 99.59% <100%> (ø) 112 <0> (ø) ⬇️
app/sprinkles/account/src/Database/Models/User.php 75.65% <100%> (ø) 35 <0> (ø) ⬇️

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 4a555a3...3237781. Read the comment docs.

@amosfolz amosfolz changed the base branch from hotfix to develop July 12, 2019 12:40
@amosfolz amosfolz mentioned this pull request Jul 29, 2019
@lcharette lcharette modified the milestones: 4.2.x, 4.3.0 Jul 30, 2019
@amosfolz amosfolz changed the title Hotfix update locale files Update Locale File Keys Jul 30, 2019
@lcharette
Copy link
Member

Would it be easier for translators if we comment all untranslated keys? I know it won't work with the upcoming Bakery commands, but it would make it easier to spot what needs translation and actually use the English fallback instead of having outdated English strings in whatever locale.

@amosfolz
Copy link
Contributor Author

amosfolz commented Aug 9, 2019

Would it be easier for translators if we comment all untranslated keys? I know it won't work with the upcoming Bakery commands, but it would make it easier to spot what needs translation and actually use the English fallback instead of having outdated English strings in whatever locale.

I can do that if you think it's best.

I do have a table with the untranslated keys that I was going to put into a new issue for translators to reference.

@amosfolz
Copy link
Contributor Author

I commented out the keys in recent commits.

@lcharette
Copy link
Member

lcharette commented Aug 13, 2019

PHP Parse error:  syntax error, unexpected ';', expecting ']' in /home/travis/build/userfrosting/UserFrosting/app/sprinkles/core/config/default.php on line 408

https://travis-ci.org/userfrosting/UserFrosting/jobs/571120012#L881

@amosfolz
Copy link
Contributor Author

PHP Parse error:  syntax error, unexpected ';', expecting ']' in /home/travis/build/userfrosting/UserFrosting/app/sprinkles/core/config/default.php on line 408

https://travis-ci.org/userfrosting/UserFrosting/jobs/571120012#L881

I'm not even sure where this change came from?

@lcharette
Copy link
Member

@amosfolz
Copy link
Contributor Author

I don't even understand what happened here...
Missing closing bracket https://github.com/amosfolz/UserFrosting/blame/hotfix-update-locale-files/app/sprinkles/core/config/default.php#L105-L111 ?

@amosfolz
Copy link
Contributor Author

Also, php-cs-fixer is trying to do weird things like change comments now:
image

@lcharette
Copy link
Member

I think it should be safe to merge now? PHP-CS-Fixer didn't brought up any issue on my side?

@amosfolz
Copy link
Contributor Author

I think it should be safe to merge now? PHP-CS-Fixer didn't brought up any issue on my side?

I think it is good to go.

@lcharette lcharette merged commit 7ba72c2 into userfrosting:develop Aug 16, 2019
@amosfolz amosfolz deleted the hotfix-update-locale-files branch August 16, 2019 12:48
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