From 009ca07c531fda75d9a8c8b3e7defee67000718e Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Wed, 24 Jan 2001 05:50:35 +0000
Subject: [PATCH] Fix 21515: context menu should have filename after `Save
 Image...'. patch by doron (doronr@naboonline.com). r=blake sr=alecf

---
 mailnews/base/resources/content/mailWindowOverlay.xul     | 1 -
 xpfe/communicator/jar.mn                                  | 1 +
 .../resources/content/contentAreaContextOverlay.xul       | 1 -
 xpfe/communicator/resources/content/nsContextMenu.js      | 8 ++++++++
 .../resources/locale/en-US/contentAreaCommands.dtd        | 1 -
 .../resources/locale/en-US/contentAreaCommands.properties | 3 +++
 6 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 xpfe/communicator/resources/locale/en-US/contentAreaCommands.properties

diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index cbcb31eb6b98..33125ff3adad 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -606,7 +606,6 @@ Rights Reserved.
                   accesskey="&saveLinkCmd.accesskey;"
                   oncommand="contextMenu.saveLink();"/>
         <menuitem id="context-saveimage"
-                  value="&saveImageCmd.label;"
                   accesskey="&saveImageCmd.accesskey;"
                   oncommand="contextMenu.saveImage();"/>
         <menuitem id="context-bookmarklink"
diff --git a/xpfe/communicator/jar.mn b/xpfe/communicator/jar.mn
index b2d16dae59fb..b0dd871c02a6 100644
--- a/xpfe/communicator/jar.mn
+++ b/xpfe/communicator/jar.mn
@@ -32,6 +32,7 @@ en-US.jar:
         locale/en-US/communicator/tasksOverlay.dtd                  (resources/locale/en-US/tasksOverlay.dtd) 
         locale/en-US/communicator/taskbarOverlay.dtd                (resources/locale/en-US/taskbarOverlay.dtd) 
         locale/en-US/communicator/contentAreaCommands.dtd           (resources/locale/en-US/contentAreaCommands.dtd) 
+        locale/en-US/communicator/contentAreaCommands.properties    (resources/locale/en-US/contentAreaCommands.properties)
         locale/en-US/communicator/askViewZoom.dtd                   (resources/locale/en-US/askViewZoom.dtd)
         locale/en-US/communicator/viewZoomOverlay.dtd               (resources/locale/en-US/viewZoomOverlay.dtd)
         locale/en-US/communicator/viewZoomOverlay.properties        (resources/locale/en-US/viewZoomOverlay.properties)
diff --git a/xpfe/communicator/resources/content/contentAreaContextOverlay.xul b/xpfe/communicator/resources/content/contentAreaContextOverlay.xul
index fb8b95e64d23..a115129411ae 100644
--- a/xpfe/communicator/resources/content/contentAreaContextOverlay.xul
+++ b/xpfe/communicator/resources/content/contentAreaContextOverlay.xul
@@ -135,7 +135,6 @@
                 accesskey="&saveLinkCmd.accesskey;"
                 oncommand="contextMenu.saveLink();"/>
       <menuitem id="context-saveimage"
-                value="&saveImageCmd.label;"
                 accesskey="&saveImageCmd.accesskey;"
                 oncommand="contextMenu.saveImage();"/>
       <menuitem id="context-savebgimage"
diff --git a/xpfe/communicator/resources/content/nsContextMenu.js b/xpfe/communicator/resources/content/nsContextMenu.js
index 5e20db9888e0..4769543fed6f 100644
--- a/xpfe/communicator/resources/content/nsContextMenu.js
+++ b/xpfe/communicator/resources/content/nsContextMenu.js
@@ -116,6 +116,14 @@ nsContextMenu.prototype = {
     
         // Save image depends on whether there is one.
         this.showItem( "context-saveimage", this.onImage );
+        if (this.onImage){ //if onImage, let's get the imagename into the context menu       
+           var saveImageMenuItem = document.getElementById( 'context-saveimage' );
+           var imageName = extractFileNameFromUrl(this.imageURL);
+           var bundle = srGetStrBundle("chrome://communicator/locale/contentAreaCommands.properties");
+           var caption = bundle.formatStringFromName("saveImageAs",[imageName],1);
+
+           saveImageMenuItem.setAttribute( "value", caption );
+        }
 
         // Remove separator if none of these were shown.
         var showSep = !this.inDirList || this.inFrame || this.onSaveableLink || this.hasBGImage || this.onImage;
diff --git a/xpfe/communicator/resources/locale/en-US/contentAreaCommands.dtd b/xpfe/communicator/resources/locale/en-US/contentAreaCommands.dtd
index 041c12d1116c..dd314db88ca2 100644
--- a/xpfe/communicator/resources/locale/en-US/contentAreaCommands.dtd
+++ b/xpfe/communicator/resources/locale/en-US/contentAreaCommands.dtd
@@ -41,7 +41,6 @@
 <!ENTITY saveFrameCmd.accesskey       "f">
 <!ENTITY saveLinkCmd.label            "Save Link As...">
 <!ENTITY saveLinkCmd.accesskey        "a">
-<!ENTITY saveImageCmd.label           "Save Image As...">
 <!ENTITY saveImageCmd.accesskey       "a">
 <!ENTITY saveBGImageCmd.label         "Save Background Image As...">
 <!ENTITY saveBGImageCmd.accesskey     "a">
diff --git a/xpfe/communicator/resources/locale/en-US/contentAreaCommands.properties b/xpfe/communicator/resources/locale/en-US/contentAreaCommands.properties
new file mode 100644
index 000000000000..c18b05f63b71
--- /dev/null
+++ b/xpfe/communicator/resources/locale/en-US/contentAreaCommands.properties
@@ -0,0 +1,3 @@
+# context menu strings
+
+saveImageAs=Save Image (%S)...