From 717169622ec80f869d0cfc965719d18fe48ab8c5 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Thu, 2 Dec 2010 14:54:58 -0500
Subject: [PATCH] Bug 616193: only show Charlton trademark attribution in
 en-US/en-GB, don't make it localizable, r=dolske, a=blocking

--HG--
extra : rebase_source : b8efb750ebbe80e547f06a7e4cc81caa0153aad7
---
 browser/base/content/aboutDialog.js                   | 11 +++++++++++
 browser/base/content/aboutDialog.xul                  |  5 ++++-
 browser/branding/nightly/locales/en-US/brand.dtd      |  3 +--
 browser/branding/unofficial/locales/en-US/brand.dtd   |  1 -
 .../branding/firefox/locales/en-US/brand.dtd          |  1 -
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js
index 231ba51c3bd..a5de4cb9162 100644
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
@@ -73,6 +73,17 @@ function init(aEvent)
     document.getElementById("version").value += " (" + buildDate + ")";
   }
 
+#ifdef MOZ_OFFICIAL_BRANDING
+  // Hide the Charlton trademark attribution for non-en-US/en-GB
+  // DO NOT REMOVE without consulting people involved with bug 616193
+  let chromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"].
+                       getService(Ci.nsIXULChromeRegistry);
+  let currentLocale = chromeRegistry.getSelectedLocale("global");
+  if (currentLocale != "en-US" && currentLocale != "en-GB") {
+    document.getElementById("extra-trademark").hidden = true;
+  }
+#endif
+
 #ifdef MOZ_UPDATER
   gAppUpdater = new appUpdater();
 #endif
diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul
index 9528e48dbc4..9348ee6b4be 100644
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -125,7 +125,10 @@
       </hbox>
       <description id="trademark">
         <label class="trademark-label">&trademarkInfo.part1;</label>
-        <label class="trademark-label">&trademarkInfo.part2;</label>
+#ifdef MOZ_OFFICIAL_BRANDING
+        <!-- DO NOT REMOVE without consulting people involved with bug 616193 -->
+        <label id="extra-trademark" class="trademark-label">Some of the trademarks used under license from The Charlton Company.</label>
+#endif
       </description>
     </vbox>
   </vbox>
diff --git a/browser/branding/nightly/locales/en-US/brand.dtd b/browser/branding/nightly/locales/en-US/brand.dtd
index 7949f9154e2..67ad7c13f33 100644
--- a/browser/branding/nightly/locales/en-US/brand.dtd
+++ b/browser/branding/nightly/locales/en-US/brand.dtd
@@ -1,5 +1,4 @@
 <!ENTITY  brandShortName        "Minefield">
-<!ENTITY  brandFullName         "Minefield">            
+<!ENTITY  brandFullName         "Minefield">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   " ">
-<!ENTITY  trademarkInfo.part2   " ">
diff --git a/browser/branding/unofficial/locales/en-US/brand.dtd b/browser/branding/unofficial/locales/en-US/brand.dtd
index 987c3bdb219..855d5ce11d6 100644
--- a/browser/branding/unofficial/locales/en-US/brand.dtd
+++ b/browser/branding/unofficial/locales/en-US/brand.dtd
@@ -2,4 +2,3 @@
 <!ENTITY  brandFullName         "Mozilla Developer Preview">
 <!ENTITY  vendorShortName       "mozilla.org">
 <!ENTITY  trademarkInfo.part1   " ">
-<!ENTITY  trademarkInfo.part2   " ">
diff --git a/other-licenses/branding/firefox/locales/en-US/brand.dtd b/other-licenses/branding/firefox/locales/en-US/brand.dtd
index b0ed7ce9591..142d79b95b7 100644
--- a/other-licenses/branding/firefox/locales/en-US/brand.dtd
+++ b/other-licenses/branding/firefox/locales/en-US/brand.dtd
@@ -2,4 +2,3 @@
 <!ENTITY  brandFullName         "Mozilla Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
-<!ENTITY  trademarkInfo.part2   "Some of the trademarks used under license from The Charlton Company.">