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

Jump to bottom

Fix sr locale being selected over sr-Latn #13693

Merged
merged 2 commits into from May 10, 2020
Merged

Fix sr locale being selected over sr-Latn #13693

merged 2 commits into from May 10, 2020

Conversation

ClearlyClaire
Copy link
Contributor

@ClearlyClaire ClearlyClaire commented May 10, 2020 •
edited by Gargron

Fix #13024

@Gargron Gargron mentioned this pull request May 10, 2020
Closed
@ClearlyClaire
Copy link
Contributor Author

Tests fail because it expects “ca-ES, fa” to match “fa” (which is an exact match) rather than “ca” (which isn't). I'm unsure what would be the most sensible approach here.

@ClearlyClaire
Copy link
Contributor Author

ClearlyClaire commented May 10, 2020 •
edited

I updated the test but it's debatable whether that's the behavior we actually want. Another possibility would be to rewrite the preferred_locale lookup to perform case-insensitive comparison.

I also changed the order of languages to avoid the need for a .reverse call.

@ClearlyClaire ClearlyClaire force-pushed the fixes/sr-Latn branch 4 times, most recently from 34e630e to 81c366c Compare May 10, 2020 19:54
@Gargron Gargron merged commit 4bcef12 into mastodon:master May 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gargron Gargron Gargron approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

RegistrationsController spec fails randomly on sr-Latn
2 participants
@ClearlyClaire @Gargron