3 files changed, 29 insertions, 5 deletions
diff --git a/src/leap/base/pluggableconfig.py b/src/leap/base/pluggableconfig.py
index 0ca985ea..3517db6b 100644
--- a/src/leap/base/pluggableconfig.py
+++ b/src/leap/base/pluggableconfig.py
@@ -10,6 +10,8 @@ import urlparse
 
 import jsonschema
 
+from leap.util.translations import LEAPTranslatable
+
 logger = logging.getLogger(__name__)
 
 
@@ -118,7 +120,6 @@ adaptors['json'] = JSONAdaptor()
 # to proper python types.
 
 # TODO:
-# - multilingual object.
 # - HTTPS uri
 
 
@@ -132,6 +133,20 @@ class DateType(object):
         return time.strftime(self.fmt, data)
 
 
+class TranslatableType(object):
+    """
+    a type that casts to LEAPTranslatable objects.
+    Used for labels we get from providers and stuff.
+    """
+
+    def to_python(self, data):
+        return LEAPTranslatable(data)
+
+    # needed? we already have an extended dict...
+    #def get_prep_value(self, data):
+        #return dict(data)
+
+
 class URIType(object):
 
     def to_python(self, data):
@@ -164,6 +179,7 @@ types = {
     'date': DateType(),
     'uri': URIType(),
     'https-uri': HTTPSURIType(),
+    'translatable': TranslatableType(),
 }
 
 
diff --git a/src/leap/base/specs.py b/src/leap/base/specs.py
index 962aa07d..f57d7e9c 100644
--- a/src/leap/base/specs.py
+++ b/src/leap/base/specs.py
@@ -22,12 +22,16 @@ leap_provider_spec = {
             #'required': True,
         },
         'name': {
-            'type': dict,  # XXX multilingual object?
+            #'type': LEAPTranslatable,
+            'type': dict,
+            'format': 'translatable',
             'default': {u'en': u'Test Provider'}
             #'required': True
         },
         'description': {
+            #'type': LEAPTranslatable,
             'type': dict,
+            'format': 'translatable',
             'default': {u'en': u'Test provider'}
         },
         'enrollment_policy': {
diff --git a/src/leap/base/tests/test_providers.py b/src/leap/base/tests/test_providers.py
index 9c11f270..f257f54d 100644
--- a/src/leap/base/tests/test_providers.py
+++ b/src/leap/base/tests/test_providers.py
@@ -15,10 +15,12 @@ from leap.base import providers
 
 EXPECTED_DEFAULT_CONFIG = {
     u"api_version": u"0.1.0",
-    u"description": {u'en': u"Test provider"},
+    #u"description": "LEAPTranslatable<{u'en': u'Test provider'}>",
+    u"description": {u'en': u'Test provider'},
     u"default_language": u"en",
     #u"display_name": {u'en': u"Test Provider"},
     u"domain": u"testprovider.example.org",
+    #u'name': "LEAPTranslatable<{u'en': u'Test Provider'}>",
     u'name': {u'en': u'Test Provider'},
     u"enrollment_policy": u"open",
     #u"serial": 1,
@@ -66,6 +68,7 @@ class TestLeapProviderDefinition(BaseLeapTest):
         self.definition.save(to=self.testfile, force=True)
         deserialized = json.load(open(self.testfile, 'rb'))
         self.maxDiff = None
+        #import ipdb;ipdb.set_trace()
         self.assertEqual(deserialized, EXPECTED_DEFAULT_CONFIG)
 
     def test_provider_dump_to_slug(self):
@@ -84,8 +87,9 @@ class TestLeapProviderDefinition(BaseLeapTest):
         with open(self.testfile, 'w') as wf:
             wf.write(json.dumps(EXPECTED_DEFAULT_CONFIG))
         self.definition.load(fromfile=self.testfile)
-        self.assertDictEqual(self.config,
-                             EXPECTED_DEFAULT_CONFIG)
+        #self.assertDictEqual(self.config,
+                             #EXPECTED_DEFAULT_CONFIG)
+        self.assertItemsEqual(self.config, EXPECTED_DEFAULT_CONFIG)
 
     def test_provider_validation(self):
         self.definition.validate(self.config)