Globalize urls when adding them via wymeditor #2533
Merged
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
| @@ -630,7 +630,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) { | |||
| var wym = this; | |||
|
|
|||
| wym.update(); | |||
| var path = this._wym._options.dialogPath + dialogType + '?wymeditor=true&' + window.location.href.match(/switch_locale=[a-z]{2}/); | |||
| var path = this._wym._options.dialogPath + dialogType + '?wymeditor=true&' + window.location.href.match(/switch_locale=[a-z]{2}(-[A-Z]{2})?/)[0]; | |||
There was a problem hiding this comment.
This fails with Uncaught TypeError: Cannot read property '0' of null when there's no switch_locale param available (in the case when we start editing page for the first time).
|
I've changed the regex so there's only one element in the array and therefore no need to access the first element. |
ugisozols
added a commit
that referenced
this pull request
Jan 28, 2014
Globalize urls when adding them via wymeditor
|
Thanks @DanBrooker! |
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.
When adding a link for a translated page via wymeditor, the link wasn't be localised.
This pull request localises URLs based on the locale of the translation.
Also updates the regex for switch_locale to match hyphenated language code, e.g. zh-CN or pt-BR