Bug 349319 If you have both the en-GB and the en-GB-oed dictionaries installed you can't distinguish them when trying to select the correct dictionary

p=me r=neil sr=mscott

editor/ui/dialogs/content/EdSpellCheck.js

@@ -208,6 +208,9 @@ function InitLanguageMenu(aCurLang)
           langLabel += "/" + menuStr2;
       }
 
+      if (langLabel && isoStrArray.length > 2 && isoStrArray[2])
+        langLabel += " (" + isoStrArray[2] + ")";
+
       if (!langLabel)
         langLabel = langId;
     }

mail/components/compose/content/EdSpellCheck.js

@@ -207,6 +207,9 @@ function InitLanguageMenu(aCurLang)
           langLabel += "/" + menuStr2;
       }
 
+      if (langLabel && isoStrArray.length > 2 && isoStrArray[2])
+        langLabel += " (" + isoStrArray[2] + ")";
+
       if (!langLabel)
         langLabel = langId;
     }

mail/components/compose/content/MsgComposeCommands.js

@@ -2242,8 +2242,13 @@ function InitLanguageMenu()
       // English (US) and English (UK)
       if (!langLabel)
         langLabel = langId;
-      else if (isoStrArray.length > 1 && isoStrArray[1]) // if we have a language ID like US or UK, append it to the menu item
-        langLabel += ' (' + isoStrArray[1] + ')';
+      // if we have a language ID like US or UK, append it to the menu item, and any sub-variety
+      else if (isoStrArray.length > 1 && isoStrArray[1]) {
+        langLabel += ' (' + isoStrArray[1];
+        if (isoStrArray.length > 2 && isoStrArray[2])
+          langLabel += '-' + isoStrArray[2];
+        langLabel += ')';
+      }
     }
     catch (ex)
     {

mail/components/preferences/compose.js

@@ -348,6 +348,9 @@ var gComposePane = {
             langLabel += "/" + menuStr2;
         }
 
+        if (langLabel && isoStrArray.length > 2 && isoStrArray[2])
+          langLabel += " (" + isoStrArray[2] + ")";
+
         if (!langLabel)
           langLabel = langId;
       } catch (ex) {

mailnews/compose/prefs/resources/content/pref-composing_messages.js

@@ -85,6 +85,9 @@ function InitLanguageMenu() {
           langLabel += "/" + menuStr2;
       }
 
+      if (langLabel && isoStrArray.length > 2 && isoStrArray[2])
+        langLabel += " (" + isoStrArray[2] + ")";
+
       if (!langLabel)
         langLabel = langId;
     } catch (ex) {

mailnews/compose/resources/content/MsgComposeCommands.js

@@ -2167,8 +2167,13 @@ function InitLanguageMenu()
       // English (US) and English (UK)
       if (!langLabel)
         langLabel = langId;
-      else if (isoStrArray.length > 1 && isoStrArray[1]) // if we have a language ID like US or UK, append it to the menu item
-        langLabel += ' (' + isoStrArray[1] + ')';
+      // if we have a language ID like US or UK, append it to the menu item, and any sub-variety
+      else if (isoStrArray.length > 1 && isoStrArray[1]) {
+        langLabel += ' (' + isoStrArray[1];
+        if (isoStrArray.length > 2 && isoStrArray[2])
+          langLabel += '-' + isoStrArray[2];
+        langLabel += ')';
+      }
     }
     catch (ex)
     {