Changeset 12032 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Timestamp:

21 Nov 2014, 18:52:43 (10 years ago)

Author:

Henrik Bettermann

Message:

Implement translated_state property correctly so that we can more easily customized customer registration and document verification state names.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• customer.py (modified) (2 diffs)
• export.py (modified) (2 diffs)
• utils.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/customer.py

@@ -36 +36 @@
 from waeup.ikoba.interfaces import (
     IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler,
-    IIkobaUtils, registration_states_vocab, IExtFileStore,
+    IIkobaUtils, IExtFileStore,
     CREATED, REQUESTED, APPROVED)
 from waeup.ikoba.customers.export import EXPORTER_NAMES
 from waeup.ikoba.customers.interfaces import (
-    ICustomer, ICustomerNavigation, ICSVCustomerExporter)
+    ICustomer, ICustomerNavigation, ICSVCustomerExporter,
+    ICustomersUtils)
 from waeup.ikoba.customers.utils import generate_customer_id
 from waeup.ikoba.customers.documents import CustomerDocumentsContainer
@@ -126 +127 @@
     @property
     def translated_state(self):
-        state = registration_states_vocab.getTermByToken(
-            self.state).title
-        return state
+        try:
+            TRANSLATED_STATES = getUtility(ICustomersUtils).TRANSLATED_STATES
+            ts = TRANSLATED_STATES[self.state]
+            return ts
+        except KeyError:
+            return
 
     @property

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/export.py

@@ -23 +23 @@
 from zope.component import getUtility
 from waeup.ikoba.interfaces import (
-    IExtFileStore, IFileStoreNameChooser, IIkobaUtils)
+    IExtFileStore, IFileStoreNameChooser)
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.customers.catalog import CustomersQuery
@@ -147 +147 @@
             ICustomerDocument,
             exclude_attribs=False,
-            omit=['is_editable']))) + (
+            omit=['is_editable', 'translated_state']))) + (
             'customer_id',)
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/utils.py

@@ -19 +19 @@
 """
 import grok
-from waeup.ikoba.interfaces import STARTED, APPROVED
+from waeup.ikoba.interfaces import MessageFactory as _
+from waeup.ikoba.interfaces import CREATED, STARTED, REQUESTED, APPROVED
 from waeup.ikoba.customers.interfaces import ICustomersUtils
 
@@ -41 +42 @@
 
     DOCMANAGE_STATES = (APPROVED,)
+
+    TRANSLATED_STATES = {
+        CREATED: _('created'),
+        STARTED: _('started'),
+        REQUESTED: _('requested'),
+        APPROVED: _('approved'),
+        }