Ubuntu Software Center

Merge lp:~kelemeng/software-center/bug640969 into lp:ubuntu/maverick/software-center

  1. bug640969
  2. Merge into maverick
Proposed by Gabor Kelemen
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~kelemeng/software-center/bug640969
Merge into: lp:ubuntu/maverick/software-center
Diff against target: 37 lines (+4/-3)
2 files modified
softwarecenter/view/dependency_dialogs.py (+1/-1)
softwarecenter/view/dialogs.py (+3/-2)
To merge this branch: bzr merge lp:~kelemeng/software-center/bug640969
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+35819@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/view/dependency_dialogs.py'
2--- softwarecenter/view/dependency_dialogs.py 2010-09-09 17:07:29 +0000
3+++ softwarecenter/view/dependency_dialogs.py 2010-09-17 12:28:59 +0000
4@@ -69,7 +69,7 @@
5 return _confirm_remove_internal(parent, datadir, app, db, icons, primary, button_text, depends, cache)
6
7 def _confirm_remove_internal(parent, datadir, app, db, icons, primary, button_text, depends, cache):
8- glade_dialog = SimpleGtkbuilderDialog(datadir)
9+ glade_dialog = SimpleGtkbuilderDialog(datadir, domain="software-center")
10 dialog = glade_dialog.dialog_dependency_alert
11 dialog.set_resizable(True)
12 dialog.set_transient_for(parent)
13
14=== modified file 'softwarecenter/view/dialogs.py'
15--- softwarecenter/view/dialogs.py 2010-09-09 09:11:23 +0000
16+++ softwarecenter/view/dialogs.py 2010-09-17 12:28:59 +0000
17@@ -21,9 +21,10 @@
18 from gettext import gettext as _
19
20 class SimpleGtkbuilderDialog(object):
21- def __init__(self, datadir):
22+ def __init__(self, datadir, domain):
23 # setup ui
24 self.builder = gtk.Builder()
25+ self.builder.set_translation_domain(domain)
26 self.builder.add_from_file(datadir+"/ui/dialogs.ui")
27 self.builder.connect_signals(self)
28 for o in self.builder.get_objects():
29@@ -35,7 +36,7 @@
30
31
32 def confirm_repair_broken_cache(parent, datadir):
33- glade_dialog = SimpleGtkbuilderDialog(datadir)
34+ glade_dialog = SimpleGtkbuilderDialog(datadir, domain="software-center")
35 dialog = glade_dialog.dialog_broken_cache
36 dialog.set_default_size(380, -1)
37 dialog.set_transient_for(parent)

Subscribers

People subscribed via source and target branches

to all changes: