diff --git a/profile/resources/content/createProfileWizard.js b/profile/resources/content/createProfileWizard.js
index 4c9f2d2210f1..734ef5ce3563 100644
--- a/profile/resources/content/createProfileWizard.js
+++ b/profile/resources/content/createProfileWizard.js
@@ -111,11 +111,19 @@ function onFinish()
var profName = wizardManager.WSM.PageData["newProfile1_2"].ProfileName.value;
var profDir = wizardManager.WSM.PageData["newProfile1_2"].ProfileDir.value;
- var profLocale = wizardManager.WSM.PageData["newProfile1_2"].ProfileLocale.value;
+ var profLang = wizardManager.WSM.PageData["newProfile1_2"].ProfileLanguage.value;
+ var profRegion = wizardManager.WSM.PageData["newProfile1_2"].ProfileRegion.value;
// Get & select langcode
- proceed = processCreateProfileData(profName, profDir, profLocale);
+ proceed = processCreateProfileData(profName, profDir, profLang, profRegion);
+
if( proceed ) {
+
+ //select locale region
+ if (profRegion) {
+ selectLocale(profRegion);
+ }
+
if( window.opener ) {
window.opener.CreateProfile(profName, profDir);
window.close();
@@ -134,7 +142,7 @@ function onFinish()
* - in: nothing
* - out: nothing
**/
-function processCreateProfileData( aProfName, aProfDir, langcode)
+function processCreateProfileData( aProfName, aProfDir, langcode, regioncode)
{
try {
// note: deleted check for empty profName string here as this should be
diff --git a/profile/resources/content/newProfile1_2.js b/profile/resources/content/newProfile1_2.js
index a0ef82d3a30b..9da305ffc862 100644
--- a/profile/resources/content/newProfile1_2.js
+++ b/profile/resources/content/newProfile1_2.js
@@ -32,11 +32,13 @@ function GetFields()
var profDir = document.getElementById("ProfileDir");
var profDirContent = profDir.hasChildNodes() ? profDir.firstChild.nodeValue : "";
var profDirRootFolder = profDir.getAttribute("rootFolder");
- var profLocale = document.getElementById("ProfileLocale").getAttribute("data");
+ var profLanguage = document.getElementById("ProfileLanguage").getAttribute("data");
+ var profRegion = document.getElementById("ProfileRegion").getAttribute("data");
var rv = {
ProfileName: { id: "ProfileName", value: profName },
ProfileDir: { id: "ProfileDir", value: profDirRootFolder },
- ProfileLocale: { id: "ProfileLocale", value: profLocale }
+ ProfileLanguage: { id: "ProfileLanguage", value: profLanguage },
+ ProfileRegion: { id: "ProfileRegion", value: profRegion }
}
return rv;
}
@@ -55,10 +57,15 @@ function SetFields( aElement, aValue, aDataObject )
case "ProfileName":
element.value = aValue;
break;
- case "ProfileLocale":
- document.getElementById("ProfileLocale").setAttribute("data", aValue);
+ case "ProfileLanguage": {
+ document.getElementById("ProfileLanguage").setAttribute("data", aValue);
break;
}
+ case "ProfileRegion": {
+ document.getElementById("ProfileRegion").setAttribute("data", aValue);
+ break;
+ }
+ }
}
// check to see if some user specified profile folder exists, otherwise use
@@ -161,6 +168,7 @@ function setDisplayToDefaultFolder()
function showLangDialog()
{
- var selectedLanguage = document.getElementById("ProfileLocale").getAttribute("data");
- var selectLang = window.openDialog("chrome://communicator/content/profile/selectLang.xul","","modal=yes,titlebar,resizable=no",selectedLanguage);
+ var selectedLanguage = document.getElementById("ProfileLanguage").getAttribute("data");
+ var selectedRegion = document.getElementById("ProfileRegion").getAttribute("data");
+ var selectLang = window.openDialog("chrome://communicator/content/profile/selectLang.xul","","modal=yes,titlebar,resizable=no", selectedLanguage, selectedRegion);
}
diff --git a/profile/resources/content/newProfile1_2.xul b/profile/resources/content/newProfile1_2.xul
index e797057633da..24145ccece3a 100644
--- a/profile/resources/content/newProfile1_2.xul
+++ b/profile/resources/content/newProfile1_2.xul
@@ -67,5 +67,6 @@
&pnl2.finish.text;
-
+
+
diff --git a/profile/resources/content/selectLang.xul b/profile/resources/content/selectLang.xul
index 9093c82032a8..bf3ecf35eefb 100644
--- a/profile/resources/content/selectLang.xul
+++ b/profile/resources/content/selectLang.xul
@@ -7,7 +7,7 @@
@@ -19,7 +19,7 @@
-
@@ -27,7 +27,10 @@
-
+
+
+
+
@@ -36,10 +39,31 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/profile/resources/locale/en-US/selectLang.dtd b/profile/resources/locale/en-US/selectLang.dtd
index e03eef9483e0..8d2b2b13c0ba 100644
--- a/profile/resources/locale/en-US/selectLang.dtd
+++ b/profile/resources/locale/en-US/selectLang.dtd
@@ -1,4 +1,5 @@
-
+
+