← Back to branch summary

~ubuntu-branches/ubuntu/maverick/pyxdg/maverick

« back to all changes in this revision

Viewing changes to debian/patches/gettext-support.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-05-27 16:12:51 UTC
  • mfrom: (3.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100527161251-y8fgwzi4uvw2ikgx
Tags: 0.19-1ubuntu1
* Resync on Debian
* debian/patches/gettext-support.patch, debian/patches/series:
  - Support X-GNOME-Gettext-Domain and X-Ubuntu-Gettext-Domain fields in 
    .desktop files, for dynamic translation support (corresponding to our 
     glib change).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gettext-support.patch
1
1
Binärdateien pyxdg-0.17/xdg/Exceptions.pyc and pyxdg-0.17.new/xdg/Exceptions.pyc sind verschieden.
2
 
diff -Nur -x '*.orig' -x '*~' pyxdg-0.17/xdg/IniFile.py pyxdg-0.17.new/xdg/IniFile.py
3
 
--- pyxdg-0.17/xdg/IniFile.py   2008-03-02 15:19:40.000000000 +0100
4
 
+++ pyxdg-0.17.new/xdg/IniFile.py       2009-12-22 12:23:11.179474378 +0100
 
2
Index: pyxdg-0.19/xdg/IniFile.py
 
3
===================================================================
 
4
--- pyxdg-0.19.orig/xdg/IniFile.py      2010-05-27 16:10:52.000000000 +0200
 
5
+++ pyxdg-0.19/xdg/IniFile.py   2010-05-27 16:17:42.000000000 +0200
5
6
@@ -5,12 +5,14 @@
6
 
 import re, os.path, codecs
 
7
 import re, os, stat, codecs
7
8
 from Exceptions import *
8
9
 import xdg.Locale
9
10
+import gettext
17
18
 
18
19
     tainted = False
19
20
 
20
 
@@ -79,6 +81,11 @@
21
 
         else:
22
 
             raise ParsingError("[%s]-Header missing" % headers[0], filename)
 
21
@@ -83,6 +85,11 @@
 
22
             else:
 
23
                 raise ParsingError("[%s]-Header missing" % headers[0], filename)
23
24
 
24
25
+        # check for gettext domain
25
26
+        e = self.content.get('Desktop Entry', {})
29
30
     # start stuff to access the keys
30
31
     def get(self, key, group=None, locale=False, type="string", list=False):
31
32
         # set default group
32
 
@@ -88,7 +95,12 @@
 
33
@@ -92,7 +99,12 @@
33
34
         # return key (with locale)
34
35
         if self.content.has_key(group) and self.content[group].has_key(key):
35
36
             if locale: