forked from jan/debianmemberportfolio
Merge branch 'master' into pylons0.10
* master: updated translations add support for non-url information
This commit is contained in:
commit
f2e90118f6
8 changed files with 102 additions and 39 deletions
|
@ -105,6 +105,12 @@ developer name on all bug logs)'),
|
|||
'website' : N_('Debian website'),
|
||||
'search' : N_('Debian search'),
|
||||
},
|
||||
'ssh' : {
|
||||
'label' : N_('Information reachable via ssh (for DDs)'),
|
||||
'owndndoms' : N_('owned debian.net domains'),
|
||||
'miainfo' : N_('<a href="http://wiki.debian.org/qa.debian.org/MIATeam">MIA</a> database information'),
|
||||
'groupinfo' : N_('Group membership information'),
|
||||
},
|
||||
'ubuntu' : {
|
||||
'label' : N_('Ubuntu'),
|
||||
'ubuntudiff' : N_('Available patches from Ubuntu'),
|
||||
|
@ -170,11 +176,11 @@ developer name on all bug logs)'),
|
|||
response.headers['Content-Type'] = 'text/javascript'
|
||||
return simplejson.dumps(
|
||||
dict([("%s.%s" % \
|
||||
(entry[1], entry[2]), entry[3]) \
|
||||
(entry[1], entry[2].name), entry[3]) \
|
||||
for entry in data if entry[0] == 'url']))
|
||||
for entry in data:
|
||||
if entry[0] in ('url', 'error'):
|
||||
entry.append(_(self._get_label(entry[1], entry[2])))
|
||||
entry.append(_(self._get_label(entry[1], entry[2].name)))
|
||||
elif entry[0] == 'section':
|
||||
entry.append(_(self._get_label(entry[1])))
|
||||
c.urldata = data
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue