thomas - r7235 - in flumotion/trunk: . flumotion/common

[flumotion-commit at lists.fluendo.com]

Author: thomas
Date: Wed Aug 13 00:05:54 2008
New Revision: 7235

Log:
	* flumotion/common/messages.py:
	  Put back two translatable classes for compatibility reasons, so
	  trunk code can connect to platform-3 managers.



Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/common/messages.py

Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Aug 13 00:05:54 2008
@@ -1,3 +1,9 @@
+2008-08-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* flumotion/common/messages.py:
+	  Put back two translatable classes for compatibility reasons, so
+	  trunk code can connect to platform-3 managers.
+
 2008-08-12  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/admin/command/common.py:

Modified: flumotion/trunk/flumotion/common/messages.py
==============================================================================
--- flumotion/trunk/flumotion/common/messages.py	(original)
+++ flumotion/trunk/flumotion/common/messages.py	Wed Aug 13 00:05:54 2008
@@ -215,3 +215,63 @@
             self.failed = True
             self.value = None
 pb.setUnjellyableForClass(Result, Result)
+
+
+# F0.8: remove; only here to be able to receive platform-3 translatables
+# in trunk code, because they need to be in exactly the same module
+# this is a straight copy from flumotion.common.i18n for these two classes
+
+
+class TranslatableSingular(Translatable, FancyEqMixin):
+    """
+    I represent a translatable gettext msg in the singular form.
+    """
+
+    compareAttributes = ["domain", "format", "args"]
+
+    def __init__(self, domain, format, *args):
+        """
+        @param domain: the text domain for translations of this message
+        @param format: a format string
+        @param args:   any arguments to the format string
+        """
+        self.domain = domain
+        self.format = format
+        self.args = args
+
+    def untranslated(self):
+        if self.args:
+            result = self.format % self.args
+        else:
+            result = self.format
+        return result
+pb.setUnjellyableForClass(TranslatableSingular, TranslatableSingular)
+
+
+class TranslatablePlural(Translatable, FancyEqMixin):
+    """
+    I represent a translatable gettext msg in the plural form.
+    """
+
+    compareAttributes = ["domain", "singular", "plural", "count", "args"]
+
+    def __init__(self, domain, format, *args):
+        """
+        @param domain: the text domain for translations of this message
+        @param format: a (singular, plural, count) tuple
+        @param args:   any arguments to the format string
+        """
+        singular, plural, count = format
+        self.domain = domain
+        self.singular = singular
+        self.plural = plural
+        self.count = count
+        self.args = args
+
+    def untranslated(self):
+        if self.args:
+            result = self.singular % self.args
+        else:
+            result = self.singular
+        return result
+pb.setUnjellyableForClass(TranslatablePlural, TranslatablePlural)