updated localization

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index b59af1b..54f579d 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -2,9 +2,8 @@
 Meabook controller class
 """
 
-import gettext
-
-_ = gettext.gettext
+from meabook.constants import *
+from gettext import gettext as _
 
 
 class MeabookController:
@@ -62,21 +61,34 @@ class MeabookController:
         """Gets all peoples."""
 
         # FIXME: read field names from Config
-        files_dict = self.model.get_files(['cn'], pattern=pattern)
-        return [(files_dict[internal_name]['cn'], internal_name, 'f') for \
-            internal_name in files_dict]
+        files_dict = self.model.get_files(['cn'])
+        return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \
+            for internal_name in files_dict]
 
-    def get_all_files_by_pattern(self, pattern):
+    def get_files_by_pattern(self, pattern, separated=False):
         """Gets all peoples matched pattern."""
 
-        return [(name, internal_name, 'f') for internal_name, name in \
-            self.model.get_files_by_pattern(pattern)]
+        if not separated:
+            return [(name, internal_name, TYPE_FILE) for internal_name, name \
+                in self.model.get_files_by_pattern(pattern)]
+        else:
+            files_dict = self.model.get_files(['cn', 'o', 'ou'], parent=0, \
+                pattern=pattern)
+            return [("%s" % files_dict[iname]['cn'], "%s / %s" % \
+                (files_dict[iname]['o'], files_dict[iname]['ou']), \
+                iname, TYPE_FILE) for iname in files_dict]
 
     def get_fields(self):
         """Returns all exists fields from model."""
 
         return self.model.get_fields()
 
+    def get_localized_fields(self):
+        """Returns dict with original and localized filed names."""
+
+        return dict([(_(field).decode('utf-8'), field) for field in \
+            self.model.get_fields()])
+
     def show_about_dialog(self):
         """Shows view About Dialog."""
 
@@ -87,6 +99,11 @@ class MeabookController:
 
         self.view.create_configuration_dialog(self, self.config)
 
+    def show_search_dialog(self):
+        """Shows view Search Dialog."""
+
+        self.view.create_search_dialog(self)
+
     def show_import_dialog(self):
         """Shows view IMport Dialog."""