Bug 1576410 - Port |Bug 1215856 ":" should not be selected or copied in Title field| to SeaMonkey. r=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sat, 28 Sep 2019 14:06:24 +0200
changeset 36992 d7af8b628d5192724267fe665b3f1dfd4f3f9c78
parent 36991 71cb3277328b6ccb94f671ee56cf56064b245a83
child 36993 6efcd4165414a70fa63d111791a9f1511b4ab504
push id395
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:38:57 +0000
reviewersfrg
bugs1576410, 1215856
Bug 1576410 - Port |Bug 1215856 ":" should not be selected or copied in Title field| to SeaMonkey. r=frg
suite/browser/pageinfo/pageInfo.js
suite/browser/pageinfo/pageInfo.xul
suite/locales/en-US/chrome/browser/pageInfo.dtd
suite/locales/en-US/chrome/browser/pageInfo.properties
--- a/suite/browser/pageinfo/pageInfo.js
+++ b/suite/browser/pageinfo/pageInfo.js
@@ -482,17 +482,17 @@ function openCacheEntry(key, cb)
   };
   diskStorage.asyncOpenURI(Services.io.newURI(key, null, null), "",
                            Ci.nsICacheStorage.OPEN_READONLY,
                            checkCacheListener);
 }
 
 function makeGeneralTab(metaViewRows, docInfo)
 {
-  var title = (docInfo.title) ? gBundle.getFormattedString("pageTitle", [docInfo.title]) : gBundle.getString("noPageTitle");
+  var title = (docInfo.title) ? docInfo.title : gBundle.getString("noPageTitle");
   document.getElementById("titletext").value = title;
 
   var url = docInfo.location.toString();
   setItemValue("urltext", url);
 
   var referrer = ("referrer" in docInfo && docInfo.referrer);
   setItemValue("refertext", referrer);
 
--- a/suite/browser/pageinfo/pageInfo.xul
+++ b/suite/browser/pageinfo/pageInfo.xul
@@ -110,24 +110,28 @@
              accesskey="&securityTab.accesskey;"/>
         <!-- Others added by overlay -->
       </tabs>
     </vbox>
 
     <tabpanels id="mainDeck" flex="1">
       <!-- General page information -->
       <vbox id="generalPanel">
-        <textbox class="header" readonly="true" id="titletext"/>
         <grid>
           <columns>
             <column/>
             <column class="gridSeparator"/>
             <column flex="1"/>
           </columns>
           <rows>
+            <row id="generalTitle">
+              <label control="titletext" value="&generalTitle;"/>
+              <separator/>
+              <textbox readonly="true" id="titletext"/>
+            </row>
             <row>
               <label control="urltext" value="&generalURL;"/>
               <separator/>
               <textbox readonly="true" id="urltext" class="urltext"/>
             </row>
             <row>
               <separator class="thin"/>
             </row>
--- a/suite/locales/en-US/chrome/browser/pageInfo.dtd
+++ b/suite/locales/en-US/chrome/browser/pageInfo.dtd
@@ -19,16 +19,17 @@
 <!ENTITY  copyLinks.accesskey       "L">
 <!ENTITY  openInNewTab.label        "Open in New Tab">
 <!ENTITY  openInNewTab.accesskey    "T">
 <!ENTITY  openInNewWindow.label     "Open in New Window">
 <!ENTITY  openInNewWindow.accesskey "W">
 
 <!ENTITY  generalTab            "General">
 <!ENTITY  generalTab.accesskey  "G">
+<!ENTITY  generalTitle          "Title:">
 <!ENTITY  generalURL            "Address:">
 <!ENTITY  generalType           "Type:">
 <!ENTITY  generalMode           "Render Mode:">
 <!ENTITY  generalSize           "Size:">
 <!ENTITY  generalReferrer       "Referring URL:">
 <!ENTITY  generalSource         "Cache Source:">
 <!ENTITY  generalModified       "Modified:">
 <!ENTITY  generalEncoding2      "Text Encoding:">
--- a/suite/locales/en-US/chrome/browser/pageInfo.properties
+++ b/suite/locales/en-US/chrome/browser/pageInfo.properties
@@ -1,17 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 pageInfo.page.title=Page Info - %S
 pageInfo.frame.title=Frame Info - %S
 
 noPageTitle=Untitled Page:
-pageTitle=%S:
 unknown=Unknown
 default=Default
 notSet=Not specified
 yes=Yes
 no=No
 
 mediaImg=Image
 mediaVideo=Video