Bug 391407 - Move File Handling dialog into localizable location. r=gavin.sharp, a=blocking1.9
authorsdwilsh@shawnwilsher.com
Wed, 10 Oct 2007 19:04:05 -0700
changeset 6813 1e7c9151eed6579e434474236c998adc31d673b6
parent 6812 958482e6bb9211bd19a7442d32e49940995cc682
child 6814 de62eefb458ad8f0fc774671d57a44be232983ce
push idunknown
push userunknown
push dateunknown
reviewersgavin.sharp, blocking1.9
bugs391407
milestone1.9a9pre
Bug 391407 - Move File Handling dialog into localizable location. r=gavin.sharp, a=blocking1.9
toolkit/locales/en-US/chrome/mozapps/handling/handling.dtd
toolkit/locales/en-US/chrome/mozapps/handling/handling.properties
toolkit/mozapps/handling/content/dialog.xul
toolkit/mozapps/handling/content/handling.dtd
toolkit/mozapps/handling/content/handling.properties
toolkit/mozapps/handling/src/nsContentDispatchChooser.js
toolkit/mozapps/jar.mn
new file mode 100644
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/mozapps/handling/handling.dtd
@@ -0,0 +1,5 @@
+<!ENTITY window.width "320">
+<!ENTITY window.height "250">
+<!ENTITY ChooseApp.description "Choose an Application">
+<!ENTITY ChooseApp.label "Choose...">
+<!ENTITY ChooseApp.accessKey "C">
new file mode 100644
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/mozapps/handling/handling.properties
@@ -0,0 +1,7 @@
+protocol.title=Launch Application
+protocol.description=This link needs to be opened with an application.
+protocol.choices.label=Send to:
+protocol.checkbox.label=Remember my choice for %S links.
+protocol.checkbox.extra=This can be changed in %S's preferences. 
+
+choose.application.title=Another Application...
--- a/toolkit/mozapps/handling/content/dialog.xul
+++ b/toolkit/mozapps/handling/content/dialog.xul
@@ -34,31 +34,30 @@
    - use your version of this file under the terms of the MPL, indicate your
    - decision by deleting the provisions above and replace them with the notice
    - and other provisions required by the LGPL or the GPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!-- TODO this needs to move to locale/ once we are certain of the strings -->
-<!DOCTYPE dialog SYSTEM "chrome://mozapps/content/handling/handling.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/handling/handling.dtd">
 
 <dialog id="handling"
         ondialogaccept="return dialog.onAccept();"
         onload="dialog.initialize();"
         width="&window.width;" height="&window.height;"
         persist="width height screenX screenY sizemode"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script src="chrome://mozapps/content/handling/dialog.js" type="application/javascript"/>
 
   <stringbundleset id="strings">
     <stringbundle id="base-strings"
-                  src="chrome://mozapps/content/handling/handling.properties"/>
+                  src="chrome://mozapps/locale/handling/handling.properties"/>
   </stringbundleset>
 
   <hbox>
     <image id="description-image"/>
     <description id="description-text"/>
   </hbox>
 
   <vbox flex="1">
deleted file mode 100644
--- a/toolkit/mozapps/handling/content/handling.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY window.width "320">
-<!ENTITY window.height "250">
-<!ENTITY ChooseApp.description "Choose an Application">
-<!ENTITY ChooseApp.label "Choose...">
-<!ENTITY ChooseApp.accessKey "C">
deleted file mode 100644
--- a/toolkit/mozapps/handling/content/handling.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-protocol.title=Launch Application
-protocol.description=This link needs to be opened with an application.
-protocol.choices.label=Send to:
-protocol.checkbox.label=Remember my choice for %S links.
-protocol.checkbox.extra=This can be changed in %S's preferences. 
-
-choose.application.title=Another Application...
--- a/toolkit/mozapps/handling/src/nsContentDispatchChooser.js
+++ b/toolkit/mozapps/handling/src/nsContentDispatchChooser.js
@@ -41,19 +41,17 @@ Components.utils.import("resource://gre/
 ////////////////////////////////////////////////////////////////////////////////
 //// Constants
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 
 const CONTENT_HANDLING_URL = "chrome://mozapps/content/handling/dialog.xul";
-// TODO this needs to move to locale, but l10n folks want to wait until we
-//      finalize these for sure before doing so
-const STRINGBUNDLE_URL = "chrome://mozapps/content/handling/handling.properties";
+const STRINGBUNDLE_URL = "chrome://mozapps/locale/handling/handling.properties";
 
 ////////////////////////////////////////////////////////////////////////////////
 //// nsContentDispatchChooser class
 
 function nsContentDispatchChooser()
 {
 }
 
--- a/toolkit/mozapps/jar.mn
+++ b/toolkit/mozapps/jar.mn
@@ -22,12 +22,10 @@ toolkit.jar:
   content/mozapps/plugins/pluginInstallerWizard.js              (plugins/content/pluginInstallerWizard.js)
   content/mozapps/plugins/pluginInstallerWizard.css             (plugins/content/pluginInstallerWizard.css)
   content/mozapps/plugins/pluginInstallerDatasource.js          (plugins/content/pluginInstallerDatasource.js)
   content/mozapps/plugins/pluginInstallerService.js             (plugins/content/pluginInstallerService.js)
   content/mozapps/plugins/missingPlugin.xml                     (plugins/content/missingPlugin.xml)
   content/mozapps/plugins/missingPluginBinding.css              (plugins/content/missingPluginBinding.css)
   content/mozapps/handling/handler.css                          (handling/content/handler.css)
   content/mozapps/handling/handler.xml                          (handling/content/handler.xml)
-  content/mozapps/handling/handling.properties                  (handling/content/handling.properties)
-  content/mozapps/handling/handling.dtd                         (handling/content/handling.dtd)
   content/mozapps/handling/dialog.xul                           (handling/content/dialog.xul)
   content/mozapps/handling/dialog.js                            (handling/content/dialog.js)