[Pkg-mozext-commits] [adblock-plus] 270/464: Don't list all translators in About, only the translators for the current locale
David Prévot
taffit at moszumanska.debian.org
Tue Jul 22 20:44:24 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit 8aab19815e7475081d8ccd5307939df9677522b7
Author: Wladimir Palant <trev at adblockplus.org>
Date: Wed Jul 18 09:38:07 2012 +0200
Don't list all translators in About, only the translators for the current locale
---
install.rdf.tmpl | 9 ++++-----
packager.py | 13 +++++--------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/install.rdf.tmpl b/install.rdf.tmpl
index 5b29402..adb2013 100644
--- a/install.rdf.tmpl
+++ b/install.rdf.tmpl
@@ -10,10 +10,6 @@
{%- for contributor in contributors -%}
<em:contributor>{{contributor}}</em:contributor>
{%- endfor -%}
-
-{%- for translator in localeMetadata|translators -%}
-<em:translator>{{translator}}</em:translator>
-{%- endfor -%}
{%- endmacro %}
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -84,7 +80,10 @@
{{- metadata.get('homepage', 'default') -}}
{%- endif -%}
</em:homepageURL>
- {%- endif -%}
+ {%- endif %}
+ {%- for translator in locale.translators %}
+ <em:translator>{{translator}}</em:translator>
+ {%- endfor %}
</Description>
</em:localized>
{%- endfor %}
diff --git a/packager.py b/packager.py
index ecde259..33a6c02 100644
--- a/packager.py
+++ b/packager.py
@@ -158,23 +158,20 @@ def getContributors(baseDir, metadata):
main.append(value)
return main + sorted(additional, key=unicode.lower)
-def getTranslators(localeMetadata):
- translators = set()
+def initTranslators(localeMetadata):
for locale in localeMetadata.itervalues():
if 'translator' in locale:
- for translator in locale['translator'].split(','):
- translator = translator.strip()
- if translator:
- translators.add(translator)
- return sorted(translators, key=unicode.lower)
+ locale['translators'] = sorted(map(lambda t: t.strip(), locale['translator'].split(',')), key=unicode.lower)
+ else:
+ locale['translators'] = []
def createManifest(baseDir, params):
global KNOWN_APPS, defaultLocale
env = jinja2.Environment(loader=jinja2.FileSystemLoader(buildtools.__path__[0]), autoescape=True, extensions=['jinja2.ext.autoescape'])
- env.filters['translators'] = getTranslators
template = env.get_template('install.rdf.tmpl')
templateData = dict(params)
templateData['localeMetadata'] = readLocaleMetadata(baseDir, params['locales'])
+ initTranslators(templateData['localeMetadata'])
templateData['KNOWN_APPS'] = KNOWN_APPS
templateData['defaultLocale'] = defaultLocale
return template.render(templateData).encode('utf-8')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list