Launchpad itself

Merge lp:~stevenk/launchpad/remove-translations-js into lp:launchpad

  1. remove-translations-js
  2. Merge into devel
Proposed by Steve Kowalik on 2012-01-09
Status: Merged
Approved by: Steve Kowalik on 2012-01-09
Approved revision: no longer in the source branch.
Merged at revision: 14657
Proposed branch: lp:~stevenk/launchpad/remove-translations-js
Merge into: lp:launchpad
Diff against target: 71 lines (+0/-17)
5 files modified
lib/lp/translations/templates/distribution-translations.pt (+0/-2)
lib/lp/translations/templates/distroseries-translations.pt (+0/-2)
lib/lp/translations/templates/product-translations.pt (+0/-2)
lib/lp/translations/templates/productseries-translations.pt (+0/-2)
lib/lp/translations/templates/translations-macros.pt (+0/-9)
To merge this branch: bzr merge lp:~stevenk/launchpad/remove-translations-js
Reviewer Review Type Date Requested Status
Deryck Hodge (community) 2012-01-09 Approve on 2012-01-09
Review via email: mp+87933@code.launchpad.net

Commit Message

[r=deryck][no-qa] Remove translations.js METAL macro.

Description of the Change

Remove the devmode-only translations.js METAL macro.

To post a comment you must log in.
Deryck Hodge (deryck) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/translations/templates/distribution-translations.pt'
2--- lib/lp/translations/templates/distribution-translations.pt 2010-12-29 12:36:28 +0000
3+++ lib/lp/translations/templates/distribution-translations.pt 2012-01-09 13:59:43 +0000
4@@ -7,8 +7,6 @@
5
6 <head>
7 <div metal:fill-slot="head_epilogue">
8- <metal:translations-js
9- use-macro="context/@@+translations-macros/translations-js" />
10 <metal:languages-table-js
11 use-macro="context/@@+translations-macros/languages-table-js" />
12 <tal:robots
13
14=== modified file 'lib/lp/translations/templates/distroseries-translations.pt'
15--- lib/lp/translations/templates/distroseries-translations.pt 2011-03-23 06:17:58 +0000
16+++ lib/lp/translations/templates/distroseries-translations.pt 2012-01-09 13:59:43 +0000
17@@ -6,8 +6,6 @@
18
19 <head>
20 <div metal:fill-slot="head_epilogue">
21- <metal:translations-js
22- use-macro="context/@@+translations-macros/translations-js" />
23 <metal:languages-table-js
24 use-macro="context/@@+translations-macros/languages-table-js" />
25 <meta tal:condition="not:context/translations_usage/enumvalue:LAUNCHPAD"
26
27=== modified file 'lib/lp/translations/templates/product-translations.pt'
28--- lib/lp/translations/templates/product-translations.pt 2010-10-26 21:26:27 +0000
29+++ lib/lp/translations/templates/product-translations.pt 2012-01-09 13:59:43 +0000
30@@ -6,8 +6,6 @@
31
32 <head>
33 <div metal:fill-slot="head_epilogue">
34- <metal:translations-js
35- use-macro="context/@@+translations-macros/translations-js" />
36 <metal:languages-table-js
37 use-macro="context/@@+translations-macros/languages-table-js" />
38 <tal:robots
39
40=== modified file 'lib/lp/translations/templates/productseries-translations.pt'
41--- lib/lp/translations/templates/productseries-translations.pt 2011-03-23 06:17:58 +0000
42+++ lib/lp/translations/templates/productseries-translations.pt 2012-01-09 13:59:43 +0000
43@@ -6,8 +6,6 @@
44
45 <head>
46 <div metal:fill-slot="head_epilogue">
47- <metal:translations-js
48- use-macro="context/@@+translations-macros/translations-js" />
49 <metal:languages-table-js
50 use-macro="context/@@+translations-macros/languages-table-js" />
51 <tal:robots
52
53=== modified file 'lib/lp/translations/templates/translations-macros.pt'
54--- lib/lp/translations/templates/translations-macros.pt 2011-11-26 04:03:29 +0000
55+++ lib/lp/translations/templates/translations-macros.pt 2012-01-09 13:59:43 +0000
56@@ -156,15 +156,6 @@
57 </metal:pofile-js-footer>
58
59
60-<metal:translations-js define-macro="translations-js">
61- <script
62- type="text/javascript"
63- tal:condition="devmode"
64- tal:attributes="src string:${icingroot}/build/translations/translations.js">
65- </script>
66-</metal:translations-js>
67-
68-
69 <metal:languages-table-js define-macro="languages-table-js">
70 <script type="text/javascript">
71 LPS.use('lp.translations.languages', 'event', function(Y) {