Merge lp:~evfool/software-center/fix739272 into lp:software-center

Proposed by Robert Roth
Status: Merged
Merged at revision: 1746
Proposed branch: lp:~evfool/software-center/fix739272
Merge into: lp:software-center
Diff against target: 81 lines (+14/-14)
2 files modified
softwarecenter/db/application.py (+13/-13)
softwarecenter/version.py (+1/-1)
To merge this branch: bzr merge lp:~evfool/software-center/fix739272
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+57400@code.launchpad.net

This proposal supersedes a proposal from 2011-04-05.

Description of the change

Not found screen capitalization and citation marks fixed (LP: #739272)

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote : Posted in a previous version of this proposal

Thanks for your work on this! Its probably better to use \uXXXX (like \u2026 for …). Otherwise it seems to confuse setup.py build_i18n.

When merging we need to make sure to manually unfuzzy the existing translations for this string. Thats fine (as the string is the same) but if we forget it, the string will not be translated anymore as gettext is not sure its the same or not.

Revision history for this message
Robert Roth (evfool) wrote : Posted in a previous version of this proposal

Updated as requested to use the unicode character codes instead of the characters.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py 2011-04-12 13:19:00 +0000
+++ softwarecenter/db/application.py 2011-04-12 21:39:34 +0000
@@ -210,8 +210,8 @@
210 not debfile_matches and 210 not debfile_matches and
211 not channel_matches and 211 not channel_matches and
212 not section_matches):212 not section_matches):
213 self._error = _("Not Found")213 self._error = _("Not found")
214 self._error_not_found = _("There isn't a software package called \"%s\" in your current software sources.") % self.pkgname.capitalize()214 self._error_not_found = _(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.") % self.pkgname
215215
216 def same_app(self, other):216 def same_app(self, other):
217 return self.pkgname == other.pkgname217 return self.pkgname == other.pkgname
@@ -310,8 +310,8 @@
310 return self._error310 return self._error
311 # this may have changed since we inited the appdetails311 # this may have changed since we inited the appdetails
312 elif self.pkg_state == PKG_STATE_NOT_FOUND:312 elif self.pkg_state == PKG_STATE_NOT_FOUND:
313 self._error = _("Not Found")313 self._error = _("Not found")
314 self._error_not_found = _("There isn't a software package called \"%s\" in your current software sources.") % self.pkgname.capitalize()314 self._error_not_found = _(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.") % self.pkgname
315 return self._error_not_found315 return self._error_not_found
316316
317 @property317 @property
@@ -441,8 +441,8 @@
441 if self._unavailable_channel():441 if self._unavailable_channel():
442 return PKG_STATE_NEEDS_SOURCE442 return PKG_STATE_NEEDS_SOURCE
443 else:443 else:
444 self._error = _("Not Found")444 self._error = _("Not found")
445 self._error_not_found = _("There isn't a software package called \"%s\" in your current software sources.") % self.pkgname.capitalize()445 self._error_not_found = _(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.") % self.pkgname
446 return PKG_STATE_NOT_FOUND446 return PKG_STATE_NOT_FOUND
447 else:447 else:
448 if self.price:448 if self.price:
@@ -455,8 +455,8 @@
455 for component in components:455 for component in components:
456 if component and self._unavailable_component(component_to_check=component):456 if component and self._unavailable_component(component_to_check=component):
457 return PKG_STATE_NEEDS_SOURCE457 return PKG_STATE_NEEDS_SOURCE
458 self._error = _("Not Found")458 self._error = _("Not found")
459 self._error_not_found = _("There isn't a software package called \"%s\" in your current software sources.") % self.pkgname.capitalize()459 self._error_not_found = _(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.") % self.pkgname
460 return PKG_STATE_NOT_FOUND460 return PKG_STATE_NOT_FOUND
461 return PKG_STATE_UNKNOWN461 return PKG_STATE_UNKNOWN
462462
@@ -621,17 +621,17 @@
621 self._deb = None621 self._deb = None
622 self._pkg = None622 self._pkg = None
623 if not os.path.exists(self._app.request):623 if not os.path.exists(self._app.request):
624 self._error = _("Not Found")624 self._error = _("Not found")
625 self._error_not_found = _("The file \"%s\" does not exist.") % self._app.request625 self._error_not_found = _(u"The file \u201c%s\u201d does not exist.") % self._app.request
626 else:626 else:
627 mimetype = guess_type(self._app.request)627 mimetype = guess_type(self._app.request)
628 if mimetype[0] != "application/x-debian-package":628 if mimetype[0] != "application/x-debian-package":
629 self._error = _("Not Found")629 self._error = _("Not found")
630 self._error_not_found = _("The file \"%s\" is not a software package.") % self._app.request630 self._error_not_found = _(u"The file \u201c%s\u201d is not a software package.") % self._app.request
631 else:631 else:
632 # hm, deb files from launchpad get this error..632 # hm, deb files from launchpad get this error..
633 self._error = _("Internal Error")633 self._error = _("Internal Error")
634 self._error_not_found = _("The file \"%s\" could not be opened.") % self._app.request634 self._error_not_found = _(u"The file \u201c%s\u201d could not be opened.") % self._app.request
635 return635 return
636636
637 if self.pkgname and self.pkgname != self._app.pkgname:637 if self.pkgname and self.pkgname != self._app.pkgname:
638638
=== modified file 'softwarecenter/version.py'
--- softwarecenter/version.py 2011-03-31 14:05:16 +0000
+++ softwarecenter/version.py 2011-04-12 21:39:34 +0000
@@ -1,5 +1,5 @@
11
2VERSION='3.1.25'2VERSION='3.1.25.1'
3CODENAME='UNRELEASED'3CODENAME='UNRELEASED'
4DISTRO='Ubuntu'4DISTRO='Ubuntu'
5RELEASE='11.04'5RELEASE='11.04'