From 901282c985666bef9c9ce95dcba4578790b6d137 Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Wed, 22 Feb 2012 12:53:03 +0000
Subject: [PATCH 1/2] [bugfix,user/read][xs]: hide email address on user page.

---
 ckan/templates/user/read.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html
index 318b9f12321..43716c66a3f 100644
--- a/ckan/templates/user/read.html
+++ b/ckan/templates/user/read.html
@@ -21,6 +21,13 @@
         <dl class="vcard">
           <dt>Name</dt>
           <dd>${c.user_dict['fullname'] or 'No name provided'}</dd>
+          <dt>Member since</dt>
+          <dd>${h.render_datetime(c.user_dict['created'])}</dd>
+          <py:if test="unicode(c.about_formatted)">
+          <dt>About</dt>
+          <dd>${c.about_formatted}</dd>
+          </py:if>
+        <py:if test="c.is_myself">
           <dt>Email</dt>
           <dd>
             <py:if test="c.user_dict['email']">
@@ -30,13 +37,6 @@
             No email
             </py:if>
           </dd>
-          <dt>Member since</dt>
-          <dd>${h.render_datetime(c.user_dict['created'])}</dd>
-          <py:if test="unicode(c.about_formatted)">
-          <dt>About</dt>
-          <dd>${c.about_formatted}</dd>
-          </py:if>
-        <py:if test="c.is_myself">
           <!--checkpoint:is-myself-->
           <dt>API Key</dt>
           <dd>

From 0fc7cc533650d5477dd0eca6157802054c97132a Mon Sep 17 00:00:00 2001
From: Toby <toby.junk@gmail.com>
Date: Wed, 22 Feb 2012 13:46:57 +0000
Subject: [PATCH 2/2] [xs] bugfix default locale not needed

---
 ckan/lib/i18n.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ckan/lib/i18n.py b/ckan/lib/i18n.py
index c9691e3f213..743ef880aad 100644
--- a/ckan/lib/i18n.py
+++ b/ckan/lib/i18n.py
@@ -89,7 +89,8 @@ def get_available_locales():
 
 def handle_request(request, tmpl_context):
     ''' Set the language for the request '''
-    lang = request.environ.get('CKAN_LANG', config['ckan.locale_default'])
+    lang = request.environ.get('CKAN_LANG',
+                               config.get('ckan.locale_default', 'en'))
     if lang != 'en':
         i18n.set_lang(lang)
     tmpl_context.language = lang