[cc-commits] [SCM] cc.engine: License chooser, public domain chooser, deeds (branch next) updated. eb79b62a913df8480a330236bcaf53483ab3a292

Gitosis User git at gandi0.creativecommons.org
Wed Jan 18 15:37:38 EST 2012


The branch, next has been updated
       via  eb79b62a913df8480a330236bcaf53483ab3a292 (commit)
       via  6b6a70e917322dae0c9db09a14edf8933e991f33 (commit)
      from  17e71dab679185d23749540e998f4bff006a9cd0 (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 eb79b62a913df8480a330236bcaf53483ab3a292
Merge: 17e71da 6b6a70e
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date:   Wed Jan 18 14:40:45 2012 -0600

    Merge branch 'issue_954' into next

commit 6b6a70e917322dae0c9db09a14edf8933e991f33
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date:   Wed Jan 18 14:36:33 2012 -0600

    request.accept_language.best_match just returns a single object.  Opps!

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

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

diff --git a/cc/engine/util.py b/cc/engine/util.py
index b0f1c28..89f16b5 100644
--- a/cc/engine/util.py
+++ b/cc/engine/util.py
@@ -572,12 +572,12 @@ def get_target_lang_from_request(request):
     if request_form.has_key('lang'):
         return locale_to_lower_upper(request_form['lang'])
 
-    accept_lang_matches = request.accept_language.best_match(
+    accept_lang = request.accept_language.best_match(
         get_all_supported_languages())
     if request.matchdict.has_key('target_lang'):
         target_lang = request.matchdict['target_lang']
-    elif accept_lang_matches:
-        target_lang = accept_lang_matches[0]
+    elif accept_lang:
+        target_lang = accept_lang
     else:
         target_lang = 'en'
 


hooks/post-receive
-- 
cc.engine: License chooser, public domain chooser, deeds


More information about the cc-commits mailing list