add groups to profile details, fix trans in profile edit

diff --git a/INSTALL b/INSTALL
index c092d6d70f5a68fe6833d58b14a745e6a053037c..5f041c4c0797fedef69d8f94537e3d28abc91cae 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -27,15 +27,14 @@ Install the dependencies
                               python-imaging python-mysqldb mysql-server python-numpy python-scipy \
                               python-ctypes python-setuptools python-support python-docutils
 
-    Just add these lines to your /etc/apt/sources-list::
+    To get MP3 reading and writing, just add these lines to your /etc/apt/sources-list::
 
-        deb http://debian.parisson.org/ binary/
-        deb-src http://debian.parisson.org/ source/
         deb http://www.debian-multimedia.org stable main
 
     Then::
 
         sudo apt-get update
+        sudo aptitude install gstreamer0.10-fluendo-mp3 gstreamer0.10-lame
 
 * On other linux platforms:
 
@@ -48,7 +47,7 @@ Install TimeSide
 In order to get all the Web Audio Components from TimeSide,
 you have to download and install it from source.
 
-So, checkout the last archives at :
+So, checkout the last archive at :
 http://code.google.com/p/timeside/downloads/list
 
 Install it like in the following example::

diff --git a/telemeta/models/system.py b/telemeta/models/system.py
index 5452c9e628ef1bd362288e446eaa083adccf3113..afdc68a8dfbe0720f2dcfae684b5a951cf5e6a08 100644 (file)
--- a/telemeta/models/system.py
+++ b/telemeta/models/system.py
@@ -76,11 +76,11 @@ class UserProfile(django.db.models.Model):
     "User profile extension"
     
     user            = ForeignKey(User, unique=True)
-    institution     = CharField(_('institution'))
-    function        = CharField(_('function'))
-    address         = TextField(_('address'))
-    telephone       = CharField(_('telephone'))
-    expiration_date = DateField(_('expiration_date'))
+    institution     = CharField(_('Institution'))
+    function        = CharField(_('Function'))
+    address         = TextField(_('Address'))
+    telephone       = CharField(_('Telephone'))
+    expiration_date = DateField(_('Expiration_date'))
     
     class Meta(MetaCore):
         db_table = 'profiles'

diff --git a/telemeta/templates/telemeta_default/profile_detail.html b/telemeta/templates/telemeta_default/profile_detail.html
index 87a8e2d40a9cb57acd7013ef6f18da8a68905e1b..d731fe9b6c15b140acb9d070756717c4aa7a9c67 100644 (file)
--- a/telemeta/templates/telemeta_default/profile_detail.html
+++ b/telemeta/templates/telemeta_default/profile_detail.html
@@ -38,6 +38,7 @@
       
       <dt>{% trans "Is staff" %}</dt><dd>{{ usr.is_staff }}</dd>
       <dt>{% trans "Is superuser" %}</dt><dd>{{ usr.is_superuser }}</dd>
+      <dt>{% trans "Groups" %}</dt><dd>{{ usr.groups.all }}</dd>
       <dt>{% trans "Last login" %}</dt><dd>{{ usr.last_login }}</dd>
       {% if user.is_authenticated and user.username == usr.username %}
         {% get_current_language as LANGUAGE_CODE %}