Changeset 84d12a3


Ignore:
Timestamp:
Apr 20, 2012 3:06:30 PM (3 years ago)
Author:
Guillaume Pellerin <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, security, server, social, storage, telecaster, test
Children:
42d8c45
Parents:
89b6a62 (diff), f0c855e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Guillaume Pellerin <yomguy@…> (20/04/2012 15:06:30)
git-committer:
Guillaume Pellerin <yomguy@…> (20/04/2012 15:06:30)
Message:

Merge branch 'master' of /var/git/telemeta

Location:
telemeta
Files:
133 added
2 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/__init__.py

    r44cc478 rf41ebb8  
    3535#         Guillaume Pellerin <yomguy@parisson.com> 
    3636 
    37 from media import * 
    3837from location import * 
    3938from instrument import * 
     
    4342from dublincore import * 
    4443from language import * 
    45  
     44from media import * 
  • telemeta/views/base.py

    re12b60a8 r768255e  
    14761476    subjects = settings.TELEMETA_SUBJECTS 
    14771477    tags = ['title', 'description', 'comment'] 
    1478     title = organization + ' - Telemeta - ' + ugettext('Last changes') 
     1478    title = organization.decode('utf8') + ' - Telemeta - ' + ugettext('Last changes') 
    14791479    link = "" 
    14801480    description = ' '.join([subject.decode('utf-8') for subject in subjects]) 
Note: See TracChangeset for help on using the changeset viewer.