Merge lp:~adiroiban/launchpad/bug-561586 into lp:launchpad
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Edwin Grubbs | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 10898 | ||||
Proposed branch: | lp:~adiroiban/launchpad/bug-561586 | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
345 lines (+81/-71) 9 files modified
lib/lp/app/templates/base-layout-macros.pt (+4/-0) lib/lp/translations/javascript/importqueue.js (+7/-43) lib/lp/translations/javascript/languages.js (+48/-0) lib/lp/translations/javascript/pofile.js (+5/-6) lib/lp/translations/templates/pofile-translate.pt (+4/-4) lib/lp/translations/templates/translation-import-queue-macros.pt (+4/-9) lib/lp/translations/templates/translationmessage-translate.pt (+4/-4) lib/lp/translations/templates/translations-macros.pt (+4/-5) utilities/lp-deps.py (+1/-0) |
||||
To merge this branch: | bzr merge lp:~adiroiban/launchpad/bug-561586 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Edwin Grubbs (community) | code | Approve | |
Review via email: mp+25565@code.launchpad.net |
Commit message
Move translation javascript files to lib/lp/
Description of the change
= Bug 561586 =
Rosetta javascript files should be moved from lib/canonical to lib/lp
== Proposed fix ==
Move javascript files to lib/lp
== Pre-implementation notes ==
None yet.
== Implementation details ==
rockstar suggested on #launchpad-dev to use "var namespace = Y.namespace" for YUI namespace, so I have changed this in all rosetta js files.
After a chat with mars on #launchpad-dev we agreed that it is best to have all javascript inclusion statements in base-layout-macros, rather than putting them in other templates.
I have split the translations.js file into importqueue.js and languages.js.
== Tests ==
The affected code is covered by Windmill tests.
== Demo and Q/A ==
To test the languages filtering in serieslanguage tables, log in with a user that has preferred languages (for admin you will need to add them).
Go to https:/
To test the import queue you will need to first add a file in the import queue:
Login as admin and go to
https:/
Upload any .po file (you can rename any text file to .po)
The file should be listed an https:/
Click the "Needs review"
A popup choose should appear.
= Make lint =
I was not able to run "make lint" on this branch as it is hanging after XmlLint.
Hi Adi,
This branch looks good.
merge-approved
-Edwin