Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Sun Mar 30 22:00:14 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Thu Apr 03 23:05:31 2014 +0200
@@ -33,14 +33,14 @@
         Public method to generate the action objects.
         """
         self.hgPurgeAct = E5Action(
-            self.trUtf8('Purge Files'),
+            self.tr('Purge Files'),
             UI.PixmapCache.getIcon("fileDelete.png"),
-            self.trUtf8('Purge Files'),
+            self.tr('Purge Files'),
             0, 0, self, 'mercurial_purge')
-        self.hgPurgeAct.setStatusTip(self.trUtf8(
+        self.hgPurgeAct.setStatusTip(self.tr(
             'Delete files and directories not known to Mercurial'
         ))
-        self.hgPurgeAct.setWhatsThis(self.trUtf8(
+        self.hgPurgeAct.setWhatsThis(self.tr(
             """<b>Purge Files</b>"""
             """<p>This deletes files and directories not known to Mercurial."""
             """ That means that purge will delete:<ul>"""
@@ -49,18 +49,18 @@
             """<li>empty directories</li>"""
             """</ul>Note that ignored files will be left untouched.</p>"""
         ))
-        self.hgPurgeAct.triggered[()].connect(self.__hgPurge)
+        self.hgPurgeAct.triggered.connect(self.__hgPurge)
         self.actions.append(self.hgPurgeAct)
         
         self.hgPurgeAllAct = E5Action(
-            self.trUtf8('Purge All Files'),
-            self.trUtf8('Purge All Files'),
+            self.tr('Purge All Files'),
+            self.tr('Purge All Files'),
             0, 0, self, 'mercurial_purge_all')
-        self.hgPurgeAllAct.setStatusTip(self.trUtf8(
+        self.hgPurgeAllAct.setStatusTip(self.tr(
             'Delete files and directories not known to Mercurial including'
             ' ignored ones'
         ))
-        self.hgPurgeAllAct.setWhatsThis(self.trUtf8(
+        self.hgPurgeAllAct.setWhatsThis(self.tr(
             """<b>Purge All Files</b>"""
             """<p>This deletes files and directories not known to Mercurial."""
             """ That means that purge will delete:<ul>"""
@@ -70,40 +70,40 @@
             """<li>ignored files and directories</li>"""
             """</ul></p>"""
         ))
-        self.hgPurgeAllAct.triggered[()].connect(self.__hgPurgeAll)
+        self.hgPurgeAllAct.triggered.connect(self.__hgPurgeAll)
         self.actions.append(self.hgPurgeAllAct)
         
         self.hgPurgeListAct = E5Action(
-            self.trUtf8('List Files to be Purged'),
+            self.tr('List Files to be Purged'),
             UI.PixmapCache.getIcon("fileDeleteList.png"),
-            self.trUtf8('List Files to be Purged...'),
+            self.tr('List Files to be Purged...'),
             0, 0, self, 'mercurial_purge_list')
-        self.hgPurgeListAct.setStatusTip(self.trUtf8(
+        self.hgPurgeListAct.setStatusTip(self.tr(
             'List files and directories not known to Mercurial'
         ))
-        self.hgPurgeListAct.setWhatsThis(self.trUtf8(
+        self.hgPurgeListAct.setWhatsThis(self.tr(
             """<b>List Files to be Purged</b>"""
             """<p>This lists files and directories not known to Mercurial."""
             """ These would be deleted by the "Purge Files" menu entry.</p>"""
         ))
-        self.hgPurgeListAct.triggered[()].connect(self.__hgPurgeList)
+        self.hgPurgeListAct.triggered.connect(self.__hgPurgeList)
         self.actions.append(self.hgPurgeListAct)
         
         self.hgPurgeAllListAct = E5Action(
-            self.trUtf8('List All Files to be Purged'),
-            self.trUtf8('List All Files to be Purged...'),
+            self.tr('List All Files to be Purged'),
+            self.tr('List All Files to be Purged...'),
             0, 0, self, 'mercurial_purge_all_list')
-        self.hgPurgeAllListAct.setStatusTip(self.trUtf8(
+        self.hgPurgeAllListAct.setStatusTip(self.tr(
             'List files and directories not known to Mercurial including'
             ' ignored ones'
         ))
-        self.hgPurgeAllListAct.setWhatsThis(self.trUtf8(
+        self.hgPurgeAllListAct.setWhatsThis(self.tr(
             """<b>List All Files to be Purged</b>"""
             """<p>This lists files and directories not known to Mercurial"""
             """ including ignored ones. These would be deleted by the"""
             """ "Purge All Files" menu entry.</p>"""
         ))
-        self.hgPurgeAllListAct.triggered[()].connect(self.__hgPurgeAllList)
+        self.hgPurgeAllListAct.triggered.connect(self.__hgPurgeAllList)
         self.actions.append(self.hgPurgeAllListAct)
     
     def initMenu(self, mainMenu):
@@ -131,7 +131,7 @@
         
         @return title of the menu (string)
         """
-        return self.trUtf8("Purge")
+        return self.tr("Purge")
     
     def __hgPurge(self):
         """