From 7e2e11f09b14c9c5e0e3f29c13ab5d23079d115e Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 7 Mar 2011 18:10:55 -0500
Subject: [PATCH] Don't do automagic localization for option values provided by
 getters.

---
 common/modules/options.jsm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 31684cba..1c61a40a 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -69,9 +69,10 @@ var Option = Class("Option", {
         this._op = Option.ops[this.type];
 
         // Need to trigger setter
-        if (extraInfo && "values" in extraInfo)
+        if (extraInfo && "values" in extraInfo && !extraInfo.__lookupGetter__("values")) {
             this.values = extraInfo.values;
-        delete extraInfo.values;
+            delete extraInfo.values;
+        }
 
         if (extraInfo)
             update(this, extraInfo);