rbtranslations - pypi Package Compare versions

Comparing version 0.9 to 0.9.1

PKG-INFO

 Metadata-Version: 1.0
 Name: rbtranslations
-Version: 0.9
+Version: 0.9.1
 Summary: Java ResourceBundle like approach to localization.
@@ -5,0 +5,0 @@ Home-page: http://packages.python.org/rbtranslations

rbtranslations.egg-info/PKG-INFO

 Metadata-Version: 1.0
 Name: rbtranslations
-Version: 0.9
+Version: 0.9.1
 Summary: Java ResourceBundle like approach to localization.
@@ -5,0 +5,0 @@ Home-page: http://packages.python.org/rbtranslations

rbtranslations.py

@@ -50,3 +50,3 @@ """
 
-__version__ = "0.9"
+__version__ = "0.9.1"
 
@@ -94,3 +94,3 @@ __all__ = ["BaseTranslations", "Translations", "translation"]
         An internal version of :meth:`add_fallback` that doesn't check
-        if the translation is chached. This may only be used when constructing
+        if the translation is cached. This may only be used when constructing
         a new translation chain.
@@ -230,7 +230,7 @@ """
 
-def translation(basename, localedir, languages):
+def translation(basename, props_dir, languages, key_language=None):
     """
     Return a chain of :class:`Translations` instances that are created 
     from the properties files with the given *basename* in the directory
-    *localedir*. As a convenience, *localedir* may be the name of
+    *props_dir*. As a convenience, *props_dir* may be the name of
     a directory or the name of a file in a directory. This allows
@@ -253,23 +253,49 @@ ``__file__`` to be passed without any modification if the
     fallback to the first instance that has been found. Finally,
-    an instance of :class:`BaseTranslations` is added as fallback
+    an instance of :class:`BaseTranslations` is added as fall back
     and the :class:`Translations` instance at the beginning of the
     chain is returned.
     
-    The result is cached in a global, thread-safe cache. If the
-    result is modified by calling :meth:`.add_fallback` on it,
-    it is automatically removed from the cache.
+    The gettext key/value mapping assumes that the keys themselves
+    are a valid translation for a single given language. Building the
+    translation chain as described above, however, make them the last
+    resort, preferring any match for the given *languages* over
+    using the keys as translations. This behavior can be changed by
+    specifying the *key_language*. If specified, using the the keys as
+    translations is considered equivalent to a file 
+    "*basename.key_locale*.properties". If both a *key_language* is 
+    specified and a file "*basename.key_language*.properties" exists,
+    translations from the file override the key values. This allows
+    easy fixing of single mappings without changing the program's code.
+    
+    The resulting chain of :class:`Translations` is cached in a global,
+    thread-safe cache. If the result is modified by calling 
+    :meth:`.add_fallback` on its head, it is automatically removed 
+    from the cache.
     """
     with Translations._cache_lock:
         lang_hash = ";".join(languages)
-        trans = Translations._cache.get((basename, localedir, lang_hash), None)
+        trans = Translations._cache.get((basename, props_dir, lang_hash), None)
         if trans:
             return trans
-        localedir = os.path.abspath(localedir)
-        if os.path.isfile(localedir):
-            localedir = os.path.dirname(localedir)
+        # Normalize languages
+        langs_norm = []
         for lang in languages:
-            lang.replace("-", "_")
+            parts = lang.replace("-", "_").split("_")
+            if len(parts) > 1:
+                parts[1] = parts[1].upper()
+            langs_norm.append("_".join(parts))
+        lang_norm_hash = ";".join(langs_norm)
+        trans = Translations._cache.get\
+            ((basename, props_dir, lang_norm_hash), None)
+        if trans:
+            Translations._cache[lang_hash] = trans # quicker next time
+            return trans
+        props_dir = os.path.abspath(props_dir)
+        if os.path.isfile(props_dir):
+            props_dir = os.path.dirname(props_dir)
+        stop_searching = False
+        for lang in langs_norm:
             while True:
                 props_file = os.path.join\
-                    (localedir, basename + "_" + lang + ".properties")
+                    (props_dir, basename + "_" + lang + ".properties")
                 try:
@@ -283,2 +309,8 @@ with open(props_file) as fp:
                     pass
+                if lang == key_language:
+                    if trans:
+                        trans._add_fallback_unchecked(BaseTranslations())
+                    # else, returns BaseTranslation as result, see below
+                    stop_searching = True
+                    break;
                 lang_up = lang.rsplit("_", 1)[0]
@@ -288,2 +320,4 @@ if lang_up == lang:
                 lang = lang_up
+            if stop_searching:
+                break
         if trans:
@@ -293,4 +327,5 @@ trans._add_fallback_unchecked(BaseTranslations())
             trans = BaseTranslations()
-        Translations._cache[(basename, localedir, lang_hash)] = trans    
+        Translations._cache[(basename, props_dir, lang_hash)] = trans    
+        Translations._cache[(basename, props_dir, lang_norm_hash)] = trans    
         return trans
 

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

20524

9.34%

Lines of code

356

10.56%