Autoload app's js translations #13350
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
|
@Raydiation are you talking about OC.addTranslations() from JS or from PHP ? |
|
@PVince81 since we add script paths ownCloud will break if these scripts are not present. So we should check if they exist |
|
|
@DeepDiver1975 do we agree on this new approach ? |
|
@Raydiation thanks. I'll update the docs. |
|
Fixes #12490 |
|
Fix for calendar is here owncloud/calendar#671 |
|
Refer to this link for build results (access rights to CI server needed): |
|
tested 👍 |
|
sweet shit - thx |
|
It worked for me too, so 👍 |
|
I'd feel even more confident to merge this if another person could check/test this, @MorrisJobke ? |
|
Works here too 👍 |
MorrisJobke
added a commit
that referenced
this pull request
Jan 14, 2015
Autoload app's js translations
|
The inspection completed: 8 new issues, 1 updated code elements |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
As discussed on IRC this tries to automatically load js translations for all apps (that is if your app calls OC_Util::addScript('appName', 'file') and not OC_Util::addScript('madnessmagic').
This currently breaks calendar because they exploit a bug in the method to do weird shit like
instead of
We can patch this easily though
PS: this also loads translations for apps that register their scripts in app.php which is an antipattern.
@PVince81 your addTranslations method seems broken. It does not seem to add any translations at all unless i add translation('news') to my index.php. Then all translations are added properly. We also should handle non existent translations so that the page does not break if the translation is not present. You need to add a check for this in your addTranslations method and fall back to english if no file is found
@georgehrke @raghunayyar @MorrisJobke @DeepDiver1975
Fixes #12490