Explicitly attempt to resolve i18n-specific and english-fallback documents as two separate steps #28728
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ments as two separate steps The current way we attempt to find localized templates leverages extension names to make the localized version visible, and relies on search ordering to make sure it gets selected first. We'd like to implement some tweaks to the way we handle extension names to allow for more dynamic template processing, but that becomes difficult to do when the locale is also handled as an extension name. With this change, we explicitly attempt to find the locale-specific version of a file first by treating the locale as part of the _filename_, not the extension name. This will both unblock us to make tweaks to extension names and make the locale-vs-fallback functionality more explicit.
Hamms
changed the title
breville
reviewed
May 23, 2019
pegasus/router.rb
Outdated
| @@ -226,7 +226,8 @@ def self.set_max_age(type, default) | |||
|
|
|||
| # Documents | |||
| get_head_or_post '*' do |uri| | |||
| pass unless path = resolve_document(uri) | |||
| path = resolve_document("#{uri}.#{request.locale}") || resolve_document(uri) | |||
There was a problem hiding this comment.
Whenever I see two possible code paths (separated by the || here) I think a comment could be helpful to explain the difference between the primary and the fallback path, and what would cause one to hit versus the other.
breville
approved these changes
May 23, 2019
|
Correction: I totally added that path back in #25806 so I guess I am familiar with it. :) |
…to attempt both goals
Hamms
force-pushed
the
pegasus-explicit-i18n-resolve
branch
from
f5c7dae
to
877cce0
Compare
breville
approved these changes
May 24, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current way we attempt to find localized templates leverages
extension names to make the localized version visible, and relies on
search ordering to make sure it gets selected first.
We'd like to implement some tweaks to the way we handle extension names
to allow for more dynamic template processing, but that becomes
difficult to do when the locale is also handled as an extension name.
With this change, we explicitly attempt to find the locale-specific
version of a file first by treating the locale as part of the
filename, not the extension name. This will both unblock us to make
tweaks to extension names and make the locale-vs-fallback functionality
more explicit.