Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Fri Jan 10 19:30:21 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sat Jan 11 11:55:33 2014 +0100
@@ -80,7 +80,7 @@
         self.__server.start('hg', self.__serverArgs)
         serverStarted = self.__server.waitForStarted(5000)
         if not serverStarted:
-            return False, self.trUtf8(
+            return False, self.tr(
                 'The process {0} could not be started. '
                 'Ensure, that it is in the search path.'
             ).format('hg')
@@ -127,33 +127,33 @@
         """
         ch, msg = self.__readChannel()
         if not ch:
-            return False, self.trUtf8("Did not receive the 'hello' message.")
+            return False, self.tr("Did not receive the 'hello' message.")
         elif ch != "o":
-            return False, self.trUtf8("Received data on unexpected channel.")
+            return False, self.tr("Received data on unexpected channel.")
         
         msg = msg.split("\n")
         
         if not msg[0].startswith("capabilities: "):
-            return False, self.trUtf8(
+            return False, self.tr(
                 "Bad 'hello' message, expected 'capabilities: '"
                 " but got '{0}'.").format(msg[0])
         self.__capabilities = msg[0][len('capabilities: '):]
         if not self.__capabilities:
-            return False, self.trUtf8("'capabilities' message did not contain"
-                                      " any capability.")
+            return False, self.tr("'capabilities' message did not contain"
+                                  " any capability.")
         
         self.__capabilities = set(self.__capabilities.split())
         if "runcommand" not in self.__capabilities:
             return False, "'capabilities' did not contain 'runcommand'."
         
         if not msg[1].startswith("encoding: "):
-            return False, self.trUtf8(
+            return False, self.tr(
                 "Bad 'hello' message, expected 'encoding: '"
                 " but got '{0}'.").format(msg[1])
         encoding = msg[1][len('encoding: '):]
         if not encoding:
-            return False, self.trUtf8("'encoding' message did not contain"
-                                      " any encoding.")
+            return False, self.tr("'encoding' message did not contain"
+                                  " any encoding.")
         self.__encoding = encoding
         
         return True, ""
@@ -333,7 +333,7 @@
         else:
             def myprompt(size):
                 if outputBuffer is None:
-                    msg = self.trUtf8("For message see output dialog.")
+                    msg = self.tr("For message see output dialog.")
                 else:
                     msg = outputBuffer.getvalue()
                 reply = self.__prompt(size, msg)