Merge branch 'master' into enh-1803-clean-up-routes

ckan · Feb 22, 2012 · 88419af · 88419af
2 parents b542ec4 + 23d34d0
commit 88419af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git 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

diff --git 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>