Mercurial Repositories > eric / file diff

--- a/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py	Fri Jan 10 19:30:21 2014 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sat Jan 11 11:55:33 2014 +0100
@@ -88,7 +88,7 @@
         """
         if not os.path.exists(self.__fileName):
             self._error = True
-            self._errorString = self.trUtf8("File '{0}' does not exist.")\
+            self._errorString = self.tr("File '{0}' does not exist.")\
                 .format(self.__fileName)
             return False
         
@@ -96,7 +96,7 @@
             self.__db = sqlite3.connect(self.__fileName)
         except sqlite3.DatabaseError as err:
             self._error = True
-            self._errorString = self.trUtf8(
+            self._errorString = self.tr(
                 "Unable to open database.\nReason: {0}").format(str(err))
             return False
         
@@ -131,7 +131,7 @@
                 folders[id_] = folder
         except sqlite3.DatabaseError as err:
             self._error = True
-            self._errorString = self.trUtf8(
+            self._errorString = self.tr(
                 "Unable to open database.\nReason: {0}").format(str(err))
             return None
         
@@ -166,14 +166,14 @@
                     bookmark.title = title.replace("&", "&&")
         except sqlite3.DatabaseError as err:
             self._error = True
-            self._errorString = self.trUtf8(
+            self._errorString = self.tr(
                 "Unable to open database.\nReason: {0}").format(str(err))
             return None
         
         importRootNode.setType(BookmarkNode.Folder)
         if self._id == "firefox":
-            importRootNode.title = self.trUtf8("Mozilla Firefox Import")
+            importRootNode.title = self.tr("Mozilla Firefox Import")
         else:
-            importRootNode.title = self.trUtf8("Imported {0}")\
+            importRootNode.title = self.tr("Imported {0}")\
                 .format(QDate.currentDate().toString(Qt.SystemLocaleShortDate))
         return importRootNode