Removed Use_escapejs_filter_on_JavaScript_strings.patch applied upstream.

Rewritten-From: e006cf1b8af350a692df403e7271dedca5e3e344

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 825b2dde3f763023da95e3e218f23d427c3d81e6..564622b8032bf8eddce4f960c62a224e074f9e79 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,6 +1,7 @@
 horizon (2014.1.1-1) unstable; urgency=medium
 
   * New upstream release.
+  * Removed Use_escapejs_filter_on_JavaScript_strings.patch applied upstream.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 09 Jun 2014 23:16:43 +0800
 

diff --git a/trusty/debian/patches/Use_escapejs_filter_on_JavaScript_strings.patch b/trusty/debian/patches/Use_escapejs_filter_on_JavaScript_strings.patch
deleted file mode 100644 (file)
index 83a534e..0000000
--- a/trusty/debian/patches/Use_escapejs_filter_on_JavaScript_strings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Use escapejs filter on JavaScript strings
- The escapejs filter will correctly escape single quotes from JavaScript
- strings which may otherwise trigger syntax errors. In this case, the issue
- was visible using the French translation.
- .
- Also removed a trailing paranthesis coming out of nowhere.
-From: Adrien Cunin <adrien.cunin@osones.com>
-Date: Tue, 22 Apr 2014 10:54:33 +0000 (+0200)
-Subject: Use escapejs filter on JavaScript strings
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fhorizon.git;a=commitdiff_plain;h=232b71286f3b1426412a3ffbed5d7065c2e24275
-Origin: upstream, https://review.openstack.org/#/c/92006/
-Change-Id: I25001815e17be5afa8eb28cc28c5423e3dcd973c
-Bug-Ubuntu: https://launchpad.net/bugs/1311047
-
-diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html
-index 9abfc82..5cb2c55 100644
---- a/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html
-+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html
-@@ -40,8 +40,8 @@
- </div>
- 
- <script type="text/javascript" charset="utf-8">
--  some_disabled_msg = '{{_("Some flavors not meeting minimum image requirements have been disabled.")}}';
--  all_disabled_msg = '{{_("No flavors meet minimum criteria for selected image.")}})';
-+  some_disabled_msg = '{{_("Some flavors not meeting minimum image requirements have been disabled.")|escapejs}}';
-+  all_disabled_msg = '{{_("No flavors meet minimum criteria for selected image.")|escapejs}}';
- 
-   if(typeof horizon.Quota !== 'undefined') {
-     horizon.Quota.initWithFlavors({{ flavors|safe|default:"{}" }});

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index f0061f4a95f7c12538e0a620187b78935c99e0db..a017bfa83efd75d565b1ae5186708e7078ea0c85 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -2,4 +2,3 @@ fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
 fix-python-m-coverage.patch
-Use_escapejs_filter_on_JavaScript_strings.patch