From a0a4fc132b5aacd936f2f67af8a1ee7c6be6c7a4 Mon Sep 17 00:00:00 2001
From: Garrett Robinson <grobinson@mozilla.com>
Date: Fri, 31 Jan 2014 21:54:48 -0500
Subject: [PATCH] Bug 963901 - Fix variable format error. r=sstamm

---
 content/base/src/CSPUtils.jsm                    | 4 ++--
 dom/locales/en-US/chrome/security/csp.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/base/src/CSPUtils.jsm b/content/base/src/CSPUtils.jsm
index d5e1db35b150..66f1991072a2 100644
--- a/content/base/src/CSPUtils.jsm
+++ b/content/base/src/CSPUtils.jsm
@@ -403,7 +403,7 @@ CSPRep.fromString = function(aStr, self, reportOnly, docRequest, csp) {
           // relative to "self", but we should let devs know if the scheme is
           // abnormal and may fail a POST.
           if (!uri.schemeIs("http") && !uri.schemeIs("https")) {
-            cspWarn(aCSPR, CSPLocalizer.getFormatStr("reportURInotHttpsOrHttp",
+            cspWarn(aCSPR, CSPLocalizer.getFormatStr("reportURInotHttpsOrHttp2",
                                                      [uri.asciiSpec]));
           }
         } catch(e) {
@@ -651,7 +651,7 @@ CSPRep.fromStringSpecCompliant = function(aStr, self, reportOnly, docRequest, cs
           // relative to "self", but we should let devs know if the scheme is
           // abnormal and may fail a POST.
           if (!uri.schemeIs("http") && !uri.schemeIs("https")) {
-            cspWarn(aCSPR, CSPLocalizer.getFormatStr("reportURInotHttpsOrHttp",
+            cspWarn(aCSPR, CSPLocalizer.getFormatStr("reportURInotHttpsOrHttp2",
                                                      [uri.asciiSpec]));
           }
         } catch(e) {
diff --git a/dom/locales/en-US/chrome/security/csp.properties b/dom/locales/en-US/chrome/security/csp.properties
index c582769d1ecb..923f5933a7af 100644
--- a/dom/locales/en-US/chrome/security/csp.properties
+++ b/dom/locales/en-US/chrome/security/csp.properties
@@ -25,9 +25,9 @@ couldNotProcessUnknownDirective = Couldn't process unknown directive '%1$S'
 # LOCALIZATION NOTE (ignoringUnknownOption):
 # %1$S is the option that could not be understood
 ignoringUnknownOption = Ignoring unknown option %1$S
-# LOCALIZATION NOTE (reportURInotHttpsOrHttp):
+# LOCALIZATION NOTE (reportURInotHttpsOrHttp2):
 # %1$S is the ETLD of the report URI that is not HTTP or HTTPS
-reportURInotHttpsOrHttp = The report URI (%1$) should be an HTTP or HTTPS URI.
+reportURInotHttpsOrHttp2 = The report URI (%1$S) should be an HTTP or HTTPS URI.
 # LOCALIZATION NOTE (pageCannotSendReportsTo):
 # %1$S is the URI of the page with the policy
 # %2$S is the report URI that could not be used