=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java	2015-11-23 09:06:48 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java	2015-11-23 09:11:11 +0000
@@ -137,19 +137,19 @@
     @Override
     public List<Attribute> getAttributes( Class<?> klass )
     {
-        return attributeStore.getAttributes( klass );
+        return new ArrayList<>( i18n( i18nService, attributeStore.getAttributes( klass ) ) );
     }
 
     @Override
     public List<Attribute> getMandatoryAttributes( Class<?> klass )
     {
-        return attributeStore.getMandatoryAttributes( klass );
+        return new ArrayList<>( i18n( i18nService, attributeStore.getMandatoryAttributes( klass ) ) );
     }
 
     @Override
     public List<Attribute> getUniqueAttributes( Class<?> klass )
     {
-        return attributeStore.getUniqueAttributes( klass );
+        return new ArrayList<>( i18n( i18nService, attributeStore.getUniqueAttributes( klass ) ) );
     }
 
     @Override