Merge lp:~amichai2/software-properties/fixes into lp:software-properties

Proposed by amichair on 2010-03-29
Status: Merged
Merged at revision: not available
Proposed branch: lp:~amichai2/software-properties/fixes
Merge into: lp:software-properties
Diff against target: 45 lines (+10/-5)
3 files modified
debian/changelog (+6/-0)
softwareproperties/kde/I18nHelper.py (+1/-1)
softwareproperties/kde/SoftwarePropertiesKDE.py (+3/-4)
To merge this branch: bzr merge lp:~amichai2/software-properties/fixes
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2010-03-29 Pending
Review via email: mp+22343@code.launchpad.net

Description of the change

Fixed another crash bug (bug #545927)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-03-26 13:18:23 +0000
3+++ debian/changelog 2010-03-29 00:18:19 +0000
4@@ -1,3 +1,9 @@
5+software-properties (0.75.9) UNRELEASED; urgency=low
6+
7+ * [KDE] Fix crash caused by translations containing distro name (LP: #545927)
8+
9+ -- Amichai Rothman <amichai2@amichais.net> Mon, 29 Mar 2010 02:34:40 +0300
10+
11 software-properties (0.75.8) lucid; urgency=low
12
13 [ Michael Vogt ]
14
15=== modified file 'softwareproperties/kde/I18nHelper.py'
16--- softwareproperties/kde/I18nHelper.py 2010-02-20 10:40:57 +0000
17+++ softwareproperties/kde/I18nHelper.py 2010-03-29 00:18:19 +0000
18@@ -45,7 +45,7 @@
19 # assume latin1 as fallback
20 return unicode(str, 'latin1')
21
22-def _u(str):
23+def u_(str):
24 """ Translate a string and convert it to unicode using utf8 encoding """
25 return utf8(_(str))
26
27
28=== modified file 'softwareproperties/kde/SoftwarePropertiesKDE.py'
29--- softwareproperties/kde/SoftwarePropertiesKDE.py 2009-12-13 21:07:30 +0000
30+++ softwareproperties/kde/SoftwarePropertiesKDE.py 2010-03-29 00:18:19 +0000
31@@ -206,12 +206,11 @@
32
33 def init_distro(self):
34 # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
35- text = _("%s updates") % self.distro.id
36+ text = u_("%s updates") % self.distro.id
37 text = text.replace("Ubuntu", "Kubuntu")
38- self.userinterface.groupBox_updates.setTitle(utf8(text))
39+ self.userinterface.groupBox_updates.setTitle(text)
40 # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
41- text = _("%s Software") % self.distro.id
42- text = utf8(text)
43+ text = u_("%s Software") % self.distro.id
44 text = text.replace("Ubuntu", "Kubuntu")
45 self.userinterface.tabWidget.setTabText(0, text)
46

Subscribers

People subscribed via source and target branches

to status/vote changes: