From bcf328da9b27554e1f11d5ebf4d6de0c02e5544d Mon Sep 17 00:00:00 2001
From: aceman <acelists@atlas.sk>
Date: Wed, 26 Jun 2019 13:37:00 +0200
Subject: [PATCH] Bug 1560307 - Handle missing server type description for
 addon-provided server types in account manager. r=jork DONTBUILD

---
 mailnews/base/prefs/content/am-server.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mailnews/base/prefs/content/am-server.js b/mailnews/base/prefs/content/am-server.js
index c5c7f29122..a625d9e7d8 100644
--- a/mailnews/base/prefs/content/am-server.js
+++ b/mailnews/base/prefs/content/am-server.js
@@ -156,7 +156,14 @@ function initServerType() {
   var propertyName = "serverType-" + serverType;
 
   var messengerBundle = document.getElementById("bundle_messenger");
-  var verboseName = messengerBundle.getString(propertyName);
+  var verboseName;
+  try {
+    verboseName = messengerBundle.getString(propertyName);
+  } catch (e) {
+    // Addon-provided server types do not have a description string,
+    // then display the raw server type.
+    verboseName = serverType;
+  }
   setDivText("servertype.verbose", verboseName);
 
   secureSelect(true);