[Pkg-mozext-commits] [adblock-plus] 225/464: Add translators and contributors to localized sections of install.rdf as well so that the default About dialog can use them.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 86b7f8998df0eedfd41f465458bbdf6901cf0e19
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Tue Feb 14 09:42:41 2012 +0100

    Add translators and contributors to localized sections of install.rdf as well so that the default About dialog can use them.
---
 install.rdf.tmpl | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/install.rdf.tmpl b/install.rdf.tmpl
index 8d84100..e4a08d6 100644
--- a/install.rdf.tmpl
+++ b/install.rdf.tmpl
@@ -4,6 +4,22 @@
    - version 2.0 (the "License"). You can obtain a copy of the License at
    - http://mozilla.org/MPL/2.0/. -->
 
+<!DOCTYPE RDF [
+  <!ENTITY meta "
+    <em:creator>{{metadata.get('general', 'author')}}</em:creator>
+
+    {%- if metadata.has_section('contributors') %}
+    {%- for option in metadata.options('contributors')|sort %}
+    <em:contributor>{{metadata.get('contributors', option)}}</em:contributor>
+    {%- endfor %}
+    {%- endif %}
+
+    {%- for translator in localeMetadata|translators %}
+    <em:translator>{{translator}}</em:translator>
+    {%- endfor %}
+  ">
+]>
+
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
@@ -12,7 +28,7 @@
     <em:version>{{version}}</em:version>
     <em:name>{{localeMetadata[defaultLocale].name}}</em:name>
     <em:description>{{localeMetadata[defaultLocale].description}}</em:description>
-    <em:creator>{{metadata.get('general', 'author')}}</em:creator>
+    &meta;
     <em:homepageURL>{{metadata.get('homepage', 'default')}}</em:homepageURL>
     <em:type>2</em:type>
     {%- if metadata.has_option('general', 'restartless') %}
@@ -41,22 +57,13 @@
     <em:optionsType>{{metadata.get('general', 'optionsType')}}</em:optionsType>
     {%- endif %}
 
-    {%- if metadata.has_section('contributors') %}
-    {%- for option in metadata.options('contributors')|sort %}
-    <em:contributor>{{metadata.get('contributors', option)}}</em:contributor>
-    {%- endfor %}
-    {%- endif %}
-
-    {%- for translator in localeMetadata|translators %}
-    <em:translator>{{translator}}</em:translator>
-    {%- endfor %}
-
     {%- if not limitMetadata %}
     {%- for localeCode in localeMetadata.keys()|sort %}
     {%- set locale = localeMetadata[localeCode] %}
     <em:localized>
       <Description>
         <em:locale>{{localeCode}}</em:locale>
+        &meta;
         <em:name>
           {%- if 'name' in locale -%}
             {{locale.name}}
@@ -71,7 +78,6 @@
             {{localeMetadata[defaultLocale].description}}
           {%- endif -%}
         </em:description>
-        <em:creator>{{metadata.get('general', 'author')}}</em:creator>
         <em:homepageURL>
           {%- if metadata.has_option('homepage', localeCode) -%}
             {{- metadata.get('homepage', localeCode) -}}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git