changed to pure english text

lang support

diff --git a/Ui_Qt.py b/Ui_Qt.py
index 9a72318..191e4b3 100644 (file)
--- a/Ui_Qt.py
+++ b/Ui_Qt.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'pyWienerLinien.ui'
 #
-# Created: Sun Mar  6 01:25:56 2011
+# Created: Tue Mar  8 22:48:01 2011
 #      by: PyQt4 UI code generator 4.7.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -106,13 +106,13 @@ class Ui_MainWindow(object):
     def retranslateUi(self, MainWindow):
         MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "pyWienerLinien", None, QtGui.QApplication.UnicodeUTF8))
         self.btnSearch.setText(QtGui.QApplication.translate("MainWindow", "Search", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboDestination.setItemText(0, QtGui.QApplication.translate("MainWindow", "Haltestelle", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboDestination.setItemText(1, QtGui.QApplication.translate("MainWindow", "Adresse", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboDestination.setItemText(0, QtGui.QApplication.translate("MainWindow", "Stop", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboDestination.setItemText(1, QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8))
         self.comboDestination.setItemText(2, QtGui.QApplication.translate("MainWindow", "POI", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("MainWindow", "Start", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("MainWindow", "Ziel", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboOrigin.setItemText(0, QtGui.QApplication.translate("MainWindow", "Haltestelle", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboOrigin.setItemText(1, QtGui.QApplication.translate("MainWindow", "Adresse", None, QtGui.QApplication.UnicodeUTF8))
+        self.label.setText(QtGui.QApplication.translate("MainWindow", "Origin", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_2.setText(QtGui.QApplication.translate("MainWindow", "Destination", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboOrigin.setItemText(0, QtGui.QApplication.translate("MainWindow", "Stop", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboOrigin.setItemText(1, QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8))
         self.comboOrigin.setItemText(2, QtGui.QApplication.translate("MainWindow", "POI", None, QtGui.QApplication.UnicodeUTF8))
         self.menuHelp.setTitle(QtGui.QApplication.translate("MainWindow", "&Help", None, QtGui.QApplication.UnicodeUTF8))
         self.menuEdit.setTitle(QtGui.QApplication.translate("MainWindow", "&Edit", None, QtGui.QApplication.UnicodeUTF8))

diff --git a/pyWienerLinien.py b/pyWienerLinien.py
index e08fe73..19b1576 100644 (file)
--- a/pyWienerLinien.py
+++ b/pyWienerLinien.py
@@ -3,7 +3,7 @@
 import sys
 import os.path
 import webbrowser
-from PySide.QtCore import SIGNAL
+from PySide.QtCore import SIGNAL, QTranslator, QObject
 from PySide.QtGui import QApplication, QMainWindow
 from Ui_Qt import Ui_MainWindow
 from wlSearch import Search
@@ -35,6 +35,10 @@ class WienerLinienQt(QMainWindow, Ui_MainWindow):
         origin = self.editOrigin.currentText()
         destination = self.editDestination.currentText()
 
+        if not (origin and destination):
+            self.btnSearch.setText(self.btnSearch.tr("Search - Missing input"))
+            return False
+
         self.history.insert(0, origin)
         self.history.insert(0, destination)
 
@@ -46,15 +50,11 @@ class WienerLinienQt(QMainWindow, Ui_MainWindow):
             self.editOrigin.insertItems(0, destination)
             self.editDestination.insertItems(0, destination)
 
-        if not origin and destination:
-            self.btnSearch.setText("Search - Missing input")
-            return False
-        else:
-            self._s = Search(origin, destination, \
-                       origin_type=self.types[self.comboOrigin.currentIndex()], \
-                       destination_type=self.types[self.comboDestination.currentIndex()])
-            self._s.open_qml()
-            return True
+        self._s = Search(origin, destination, \
+                   origin_type=self.types[self.comboOrigin.currentIndex()], \
+                   destination_type=self.types[self.comboDestination.currentIndex()])
+        self._s.open_qml()
+        return True
 
     def toggle(self):
         eo = self.editOrigin.currentText()
@@ -69,6 +69,9 @@ class WienerLinienQt(QMainWindow, Ui_MainWindow):
 
 if __name__ == "__main__":
     app = QApplication(sys.argv)
+    t = QTranslator()
+    t.load('', directory='lang', suffix='po')
+    app.installTranslator(t)
     w = WienerLinienQt()
     w.show()
     sys.exit(app.exec_())

diff --git a/pyWienerLinien.ui b/pyWienerLinien.ui
index 83d9c67..8f1e0bd 100644 (file)
--- a/pyWienerLinien.ui
+++ b/pyWienerLinien.ui
@@ -38,12 +38,12 @@
      <widget class="QComboBox" name="comboDestination">
       <item>
        <property name="text">
-        <string>Haltestelle</string>
+        <string>Stop</string>
        </property>
       </item>
       <item>
        <property name="text">
-        <string>Adresse</string>
+        <string>Address</string>
        </property>
       </item>
       <item>
@@ -62,7 +62,7 @@
        </sizepolicy>
       </property>
       <property name="text">
-       <string>Start</string>
+       <string>Origin</string>
       </property>
      </widget>
     </item>
@@ -75,7 +75,7 @@
        </sizepolicy>
       </property>
       <property name="text">
-       <string>Ziel</string>
+       <string>Destination</string>
       </property>
      </widget>
     </item>
@@ -115,12 +115,12 @@
      <widget class="QComboBox" name="comboOrigin">
       <item>
        <property name="text">
-        <string>Haltestelle</string>
+        <string>Stop</string>
        </property>
       </item>
       <item>
        <property name="text">
-        <string>Adresse</string>
+        <string>Address</string>
        </property>
       </item>
       <item>