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

fallback keys should still be translated in case they are supposed to be empty. #3210

Merged
merged 1 commit into from May 16, 2018

Conversation

3 participants
@notbakaneko
Contributor

notbakaneko commented May 16, 2018

fixes #3208

@nanaya

This comment has been minimized.

Collaborator

nanaya commented May 16, 2018

More like those empty translations should be removed. Also Crowdin refuses to translate empty strings.

@notbakaneko

This comment has been minimized.

Contributor

notbakaneko commented May 16, 2018

if only the loop on the support page didn't literally rely on the translated string being empty

@peppy

This comment has been minimized.

Member

peppy commented May 16, 2018

I think this is fine. We can remove the strings where possible going forwards, but this will blanket fix these popping up in various places.

@peppy

peppy approved these changes May 16, 2018

@peppy peppy merged commit 3d15b9d into ppy:master May 16, 2018

2 checks passed

continuous-integration/styleci/pr The analysis has passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@@ -29,11 +29,7 @@ function trans($key = null, $replace = [], $locale = null)
if ($translated === null) {
$fallbackLocale = config('app.fallback_locale');
if ($locale === $fallbackLocale) {

This comment has been minimized.

@nanaya

nanaya May 16, 2018

Collaborator

a bunch of stuff in this function is now useless if we're refetching on fallback locale. Or only refetch on non-fallbacks.

@notbakaneko notbakaneko deleted the notbakaneko:fix/3208 branch Jun 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment