From 496d24592b86500d2413bd10ecc850e5fe5a8247 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Mar 2016 19:56:40 +0000
Subject: [PATCH] Correctly handle optgroups in both processed & legacy forms

---
 api/js/etemplate/et2_widget_selectbox.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/js/etemplate/et2_widget_selectbox.js b/api/js/etemplate/et2_widget_selectbox.js
index 1126a82a68..a27f259ee9 100644
--- a/api/js/etemplate/et2_widget_selectbox.js
+++ b/api/js/etemplate/et2_widget_selectbox.js
@@ -690,8 +690,9 @@ var et2_selectbox = (function(){ "use strict"; return et2_inputWidget.extend(
 				// Optgroup
 				if(typeof _options[key]["label"] == 'undefined' && typeof _options[key]["title"] == "undefined")
 				{
+					var label = isNaN(key) ? key : _options[key].value;
 					var group = $j(document.createElement("optgroup"))
-						.attr("label", this.options.no_lang ? _options[key].value : this.egw().lang(_options[key].value))
+						.attr("label", this.options.no_lang ? label : this.egw().lang(label))
 						.appendTo(this.input);
 					if(this.input == null)
 					{