bug 325473 - Undo separation of language and region/content packs, part 3: remove region selection from profile manager UI, r=jag sr=Neil

git-svn-id: svn://10.0.0.236/trunk@193935 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/profile/resources/content/selectLang.js

@@ -75,10 +75,6 @@ function Startup()
   var defaultLanguage;
   var languageList = document.getElementById("langList");
   var selectedLanguage = window.arguments.length ? window.arguments[0] : null;
-  
-  var defaultRegion;
-  var regionList = document.getElementById("regionList");
-  var selectedRegion = window.arguments.length ? window.arguments[1] : null;
 
   //get pref defaults
   try
@@ -88,7 +84,6 @@ function Startup()
                                .getService(Components.interfaces.nsIPrefService)
                                .getBranch("general.useragent.");
     defaultLanguage = prefBranch.getComplexValue("locale", nsIPrefLocalizedString).data;
-    defaultRegion = prefBranch.getComplexValue("contentlocale", nsIPrefLocalizedString).data;
   }
 
   catch(e) 
@@ -99,12 +94,6 @@ function Startup()
     if (!SelectListItem(languageList, defaultLanguage))
       languageList.selectedIndex = 0;
 
-
-  //persist previous user selection, highlight a default otherwise
-  if (!SelectListItem(regionList, selectedRegion))
-    if (!SelectListItem(regionList, defaultRegion))
-      regionList.selectedIndex = 1;
-
 }
 
 
@@ -122,17 +111,5 @@ function onAccept()
       langStore.setAttribute("data", langName);
   }
 
-  //cache region on the parent window
-  var regionList = document.getElementById("regionList");
-  selectedItem = regionList.selectedItem;
-
-  if (selectedItem) {
-    var regionName = selectedItem.getAttribute("value");
-    var regionStore = opener.document.getElementById("profileRegion");
-
-    if (regionStore)
-      regionStore.setAttribute("data", regionName);
-  }
-
   return true;
 }

mozilla/profile/resources/content/selectLang.xul

@@ -1,7 +1,12 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://communicator/skin/"?>
 
-<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/profile/selectLang.dtd">
+<!DOCTYPE dialog [
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % selectLangDTD SYSTEM "chrome://communicator/locale/profile/selectLang.dtd">
+%selectLangDTD;
+]>
 
 <dialog title="&langSelBox.title.label;"
         style="width: 22em;"
@@ -21,33 +26,14 @@
           sortDirection="ascending">
       
       <template xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+        <!-- This rule eliminates (obsolete) region packs from the language pack list -->
         <rule chrome:localeType="region"/>
-        <rule>
+        <!-- This rule displays only up to date language packs based on the localeVersion -->
+        <rule chrome:localeVersion="&lang.version;">
           <listitem id="treechildren" uri="..." 
                     label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
                     value="rdf:http://www.mozilla.org/rdf/chrome#name"/>
         </rule>
       </template>
     </listbox>
-
-    <separator class="thin" />
-
-    <label value="&regionList.txt.label;" control="regionList"/>
-
-    <separator class="thin" />
- 
-    <menulist id="regionList" flex="1">
-      <menupopup
-            datasources="rdf:chrome"  ref="urn:mozilla:locale:root" 
-            sortResource="http://www.mozilla.org/rdf/chrome#name"
-            sortDirection="ascending">
-        <template xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-          <rule chrome:localeType="region">
-            <menuitem class="standard" uri="rdf:*" 
-              label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
-              value="rdf:http://www.mozilla.org/rdf/chrome#name"/>
-          </rule>
-        </template>
-      </menupopup>
-    </menulist>             
 </dialog>        

mozilla/profile/resources/locale/en-US/createProfileWizard.dtd

@@ -19,5 +19,5 @@
 <!ENTITY button.choosefolder.accesskey  "C">
 <!ENTITY button.usedefault.label        "Use Default Folder">
 <!ENTITY button.usedefault.accesskey    "U">
-<!ENTITY button.langSelection.label     "Region Selection...">
-<!ENTITY button.langSelection.accesskey "R">
+<!ENTITY button.langSelection.label     "Select Language...">
+<!ENTITY button.langSelection.accesskey "L">

mozilla/profile/resources/locale/en-US/selectLang.dtd

@@ -1,5 +1,3 @@
 
-<!ENTITY          langSelBox.title.label       "Language/Region Selection">
+<!ENTITY          langSelBox.title.label       "Language Selection">
 <!ENTITY          langList.txt.label           "Preferred Language">
-<!ENTITY          regionList.txt.label         "Preferred Content">
-<!ENTITY          moreBtn.label               "For more choices...">