Fix get rules from order with option value instead of option code (#4269)

* Fix get rules from order with option value instead of option code

* Fix get rules from order with option value instead of option code

* fixed reformat

* change oscar-catalogue-menu and fixed some translation space was wrong

* fixed reformat

* change oscar-catalogue-menu and fixed some translation space was wrong

* small change v2

src/oscar/apps/order/abstract_models.py

@@ -707,10 +707,11 @@ class AbstractLine(models.Model):
             value = attribute.value
             if isinstance(value, list):
                 ops.append(
-                    "%s = '%s'" % (attribute.type, (", ".join([str(v) for v in value])))
+                    "%s = '%s'"
+                    % (attribute.option.name, (", ".join([str(v) for v in value])))
                 )
             else:
-                ops.append("%s = '%s'" % (attribute.type, value))
+                ops.append("%s = '%s'" % (attribute.option.name, value))
         if ops:
             desc = "%s (%s)" % (desc, ", ".join(ops))
         return desc