[cc-commits] [SCM] cc.engine: License chooser & etc (branch master) updated. 52e2278abd1ac35123ec5b0bc1e6f4218759f92c

git version control git at a7.creativecommons.org
Tue Nov 16 17:01:36 EST 2010


The branch, master has been updated
       via  52e2278abd1ac35123ec5b0bc1e6f4218759f92c (commit)
       via  a8471cdc7c98cc5d82a950d5abe8afbf0191d62c (commit)
       via  6c7618d7e590657922fa2f14703fde4899d12a55 (commit)
      from  cbcfead6f623847f47d2b5fe44788af139db9753 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52e2278abd1ac35123ec5b0bc1e6f4218759f92c
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Tue Nov 16 14:59:10 2010 -0600

    Ah, we should also use get_well_translated_langs on the chooser!

commit a8471cdc7c98cc5d82a950d5abe8afbf0191d62c
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Mon Nov 15 16:06:15 2010 -0600

    Allow for any language to be requested that we translate for, even if
    we aren't listing it

commit 6c7618d7e590657922fa2f14703fde4899d12a55
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Mon Nov 15 15:54:13 2010 -0600

    Use the "well translated languages" metric to decide what languages are "available"

-----------------------------------------------------------------------

Summary of changes (followed by patch):
 cc/engine/chooser/views.py  |    3 ++-
 cc/engine/licenses/views.py |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cc/engine/chooser/views.py b/cc/engine/chooser/views.py
index 70c86b7..346a642 100644
--- a/cc/engine/chooser/views.py
+++ b/cc/engine/chooser/views.py
@@ -12,6 +12,7 @@ from cc.engine.decorators import RestrictHttpMethods
 from cc.engine.chooser.xmp_template import license_xmp_template
 from cc.license._lib.functions import get_selector_jurisdictions
 from cc.i18n import ccorg_i18n_setup
+from cc.i18n.util import get_well_translated_langs
 import cc.license
 from cc.license.formatters.classes import (
     HTMLFormatter, CC0HTMLFormatter, PublicDomainHTMLFormatter,
@@ -30,7 +31,7 @@ def _base_context(request, target_lang=None):
         'target_lang': (
             target_lang
             or util.get_target_lang_from_request(request)),
-        'active_languages': util.active_languages(),
+        'active_languages': get_well_translated_langs(),
         }
 
     context.update(util.rtl_context_stuff(target_lang))
diff --git a/cc/engine/licenses/views.py b/cc/engine/licenses/views.py
index 2b0905c..237ecac 100644
--- a/cc/engine/licenses/views.py
+++ b/cc/engine/licenses/views.py
@@ -7,6 +7,7 @@ from webob import Response, exc
 from cc.engine.decorators import get_license
 from cc.engine import util
 from cc.i18n import ccorg_i18n_setup
+from cc.i18n.util import get_well_translated_langs, get_all_trans_stats
 from cc.license import by_code, CCLicenseError
 from cc.licenserdf.tools.license import license_rdf_filename
 
@@ -84,12 +85,13 @@ def license_deed_view(request, license):
     conditions = util.get_license_conditions(license, target_lang)
 
     # Find out all the active languages
-    active_languages = util.active_languages()
+    active_languages = get_well_translated_langs()
     active_lang_codes = [lang['code'] for lang in active_languages]
+    all_languages = get_all_trans_stats().keys()
 
     # When the target_lang is determined by the url, we should make
     # sure that's a real language to prevent caching bogus stuff
-    if not target_lang in active_lang_codes \
+    if not target_lang in all_languages \
             and request.matchdict.has_key('target_lang'):
         return exc.HTTPNotFound()
 


hooks/post-receive
-- 
cc.engine: License chooser & etc



More information about the cc-commits mailing list