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

[Robert Roth]

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

[Michael Vogt (mvo)]

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.

[lp:~evfool/software-center/fix739272]

1676. By Robert Roth on 2011-04-12

Fix unicode characters

[Robert Roth (evfool)]

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

Unmerged revisions

=== 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:37:39 +0000
@@ -210,8 +210,8 @@
                     not debfile_matches and 
                     not channel_matches and 
                     not section_matches):
-                    self._error = _("Not Found")
-                    self._error_not_found = _("There isn't a software package called \"%s\" in your current software sources.") % self.pkgname.capitalize()
+                    self._error = _("Not found")
+                    self._error_not_found = _(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.") % self.pkgname
 
     def same_app(self, other):
         return self.pkgname == other.pkgname
@@ -310,8 +310,8 @@
             return self._error
         # this may have changed since we inited the appdetails
         elif self.pkg_state == PKG_STATE_NOT_FOUND:
-            self._error =  _("Not Found")
-            self._error_not_found = _("There isn't a software package called \"%s\" in your current software sources.") % self.pkgname.capitalize()
+            self._error =  _("Not found")
+            self._error_not_found = _(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.") % self.pkgname
             return self._error_not_found
 
     @property
@@ -441,8 +441,8 @@
                 if self._unavailable_channel():
                     return PKG_STATE_NEEDS_SOURCE
                 else:
-                    self._error =  _("Not Found")
-                    self._error_not_found = _("There isn't a software package called \"%s\" in your current software sources.") % self.pkgname.capitalize()
+                    self._error =  _("Not found")
+                    self._error_not_found = _(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.") % self.pkgname
                     return PKG_STATE_NOT_FOUND
             else:
                 if self.price:
@@ -455,8 +455,8 @@
                     for component in components:
                         if component and self._unavailable_component(component_to_check=component):
                             return PKG_STATE_NEEDS_SOURCE
-                self._error =  _("Not Found")
-                self._error_not_found = _("There isn't a software package called \"%s\" in your current software sources.") % self.pkgname.capitalize()
+                self._error =  _("Not found")
+                self._error_not_found = _(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.") % self.pkgname
                 return PKG_STATE_NOT_FOUND
         return PKG_STATE_UNKNOWN
 
@@ -621,17 +621,17 @@
             self._deb = None
             self._pkg = None
             if not os.path.exists(self._app.request):
-                self._error = _("Not Found")
-                self._error_not_found = _("The file \"%s\" does not exist.") % self._app.request
+                self._error = _("Not found")
+                self._error_not_found = _(u"The file \u201c%s\u201d does not exist.") % self._app.request
             else:
                 mimetype = guess_type(self._app.request)
                 if mimetype[0] != "application/x-debian-package":
-                    self._error =  _("Not Found")
-                    self._error_not_found = _("The file \"%s\" is not a software package.") % self._app.request
+                    self._error =  _("Not found")
+                    self._error_not_found = _(u"The file \u201c%s\u201d is not a software package.") % self._app.request
                 else:
                     # hm, deb files from launchpad get this error..
                     self._error =  _("Internal Error")
-                    self._error_not_found = _("The file \"%s\" could not be opened.") % self._app.request
+                    self._error_not_found = _(u"The file \u201c%s\u201d could not be opened.") % self._app.request
             return
 
         if self.pkgname and self.pkgname != self._app.pkgname:
 
=== modified file 'softwarecenter/version.py'
--- softwarecenter/version.py	2011-03-31 14:05:16 +0000
+++ softwarecenter/version.py	2011-04-12 21:37:39 +0000
@@ -1,5 +1,5 @@
 
-VERSION='3.1.25'
+VERSION='3.1.25.1'
 CODENAME='UNRELEASED'
 DISTRO='Ubuntu'
 RELEASE='11.04'