← Back to branch summary

~glatzor/aptdaemon/maverick-updates

« back to all changes in this revision

Viewing changes to debian/patches/07_i18n_fixes.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2010-09-08 09:38:31 UTC
  • Revision ID: james.westby@ubuntu.com-20100908093831-xg57uhzyzxuny56a
Tags: 0.31+bzr476-0ubuntu2
https://launchpad.net/bugs/631675
* debian/patches/07_i18n_fixes.patch: 
  - use dgettext to not clobber the clients gettext.textdomain
    on import (LP: #631675)
* debian/patches/05_sources_list_password.patch: 
  - when adding a sources.list entry with a password protect
    the file via mode 0640 and root.admin ownership

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_i18n_fixes.patch
 
1
## Description: add some description
 
2
## Origin/Author: add some origin or author
 
3
## Bug: bug URL
 
4
Index: aptdaemon-0.31+bzr476/aptdaemon/gtkwidgets.py
 
5
===================================================================
 
6
--- aptdaemon-0.31+bzr476.orig/aptdaemon/gtkwidgets.py  2010-08-31 21:11:48.000000000 +0200
 
7
+++ aptdaemon-0.31+bzr476/aptdaemon/gtkwidgets.py       2010-09-08 09:35:35.192767000 +0200
 
8
@@ -31,7 +31,6 @@
 
9
 
 
10
 import difflib
 
11
 import gettext
 
12
-from gettext import gettext as _
 
13
 import os
 
14
 import pty
 
15
 import re
 
16
@@ -51,7 +50,7 @@
 
17
 
 
18
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
19
 
 
20
-gettext.textdomain("aptdaemon")
 
21
+_ = lambda msg: gettext.dgettext("aptdaemon", msg)
 
22
 
 
23
 (COLUMN_ID,
 
24
  COLUMN_PACKAGE) = range(2)