Changeset 108:3ebb3c906fd1

Timestamp:

04/25/12 17:51:10 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The connection failure dialogs are now internationalized

Location:

src/mlx

Files:

• gui/gui.py (modified) (6 diffs)
• i18n.py (modified) (2 diffs)

src/mlx/gui/gui.py

@@ -78 +78 @@
         label = gtk.Label(xstr("tab_flight"))
         label.set_use_underline(True)
-        label.set_tooltip_text("Flight wizard")
+        label.set_tooltip_text(xstr("tab_flight_tooltip"))
         self._notebook.append_page(self._wizard, label)
 
@@ -84 +84 @@
         label = gtk.Label(xstr("tab_flight_info"))
         label.set_use_underline(True)
-        label.set_tooltip_text("Flight information")
+        label.set_tooltip_text(xstr("tab_flight_info_tooltip"))
         self._notebook.append_page(self._flightInfo, label)
         self._flightInfo.disable()
@@ -91 +91 @@
         label = gtk.Label(xstr("tab_log"))
         label.set_use_underline(True)
-        label.set_tooltip_text("The log of your flight that will be sent to the MAVA website")
+        label.set_tooltip_text(xstr("tab_log_tooltip"))
         self._notebook.append_page(logWidget, label)
 
@@ -294 +294 @@
         dialog = gtk.MessageDialog(parent = self._mainWindow,
                                    type = MESSAGETYPE_ERROR,
-                                   message_format =
-                                   "Cannot connect to the simulator.")
+                                   message_format = xstr("conn_failed"))
+    
         dialog.set_title(WINDOW_TITLE_BASE)
-        dialog.format_secondary_markup("Rectify the situation, and press <b>Try again</b> "
-                                       "to try the connection again, " 
-                                       "or <b>Cancel</b> to cancel the flight.")
-        
-        dialog.add_button("_Cancel", 0)
-        dialog.add_button("_Try again", 1)
+        dialog.format_secondary_markup(xstr("conn_failed_sec"))
+        
+        dialog.add_button(xstr("button_cancel"), 0)
+        dialog.add_button(xstr("button_tryagain"), 1)
         dialog.set_default_response(1)
         
@@ -325 +323 @@
 
         dialog = gtk.MessageDialog(type = MESSAGETYPE_ERROR,
-                                   message_format =
-                                   "The connection to the simulator failed unexpectedly.",
+                                   message_format = xstr("conn_broken"),
                                    parent = self._mainWindow)
         dialog.set_title(WINDOW_TITLE_BASE)
-        dialog.format_secondary_markup("If the simulator has crashed, restart it "
-                                       "and restore your flight as much as possible "
-                                       "to the state it was in before the crash. "
-                                       "Then press <b>Reconnect</b> to reconnect.\n\n"
-                                       "If you want to cancel the flight, press <b>Cancel</b>.")
-
-        dialog.add_button("_Cancel", 0)
-        dialog.add_button("_Reconnect", 1)
+        dialog.format_secondary_markup(xstr("conn_broken_sec"))
+
+        dialog.add_button(xstr("button_cancel"), 0)
+        dialog.add_button(xstr("button_reconnect"), 1)
         dialog.set_default_response(1)
 
@@ -342 +335 @@
         dialog.hide()
         if result == 1:
-            self.beginBusy("Connecting to the simulator.")
+            self.beginBusy(xstr("connect_busy"))
             self._reconnecting = True
             self._simulator.reconnect()

src/mlx/i18n.py

@@ -125 +125 @@
         """Initialize the strings."""
         self.add("tab_flight", "_Flight")
+        self.add("tab_flight_tooltip", "Flight wizard")
         self.add("tab_flight_info", "Flight _info")
+        self.add("tab_flight_info_tooltip", "Further information regarding the flight")
         self.add("tab_log", "_Log")
+        self.add("tab_log_tooltip",
+                 "The log of your flight that will be sent to the MAVA website")
         self.add("tab_debug_log", "_Debug log")
         self.add("tab_help", "_Help")
         self.add("tab_gates", "_Gates")
+
+        self.add("conn_failed", "Cannot connect to the simulator.")
+        self.add("conn_failed_sec",
+                 "Rectify the situation, and press <b>Try again</b> "
+                 "to try the connection again, " 
+                 "or <b>Cancel</b> to cancel the flight.")
+        self.add("conn_broken",
+                 "The connection to the simulator failed unexpectedly.")
+        self.add("conn_broken_sec",
+                 "If the simulator has crashed, restart it "
+                 "and restore your flight as much as possible "
+                 "to the state it was in before the crash. "
+                 "Then press <b>Reconnect</b> to reconnect.\n\n"
+                 "If you want to cancel the flight, press <b>Cancel</b>.")
+        self.add("button_cancel", "_Cancel")
+        self.add("button_tryagain", "_Try again")
+        self.add("button_reconnect", "_Reconnect")
         
         self.add("login", "Login")
@@ -384 +405 @@
         """Initialize the strings."""
         self.add("tab_flight", "_Járat")
+        self.add("tab_flight_tooltip", "Járat varázsló")
         self.add("tab_flight_info", "Járat _info")
+        self.add("tab_flight_info_tooltip", "Egyéb információk a járat teljesítésével kapcsolatban")
         self.add("tab_log", "_Napló")
+        self.add("tab_log_tooltip",
+                 "A járat naplója, amit majd el lehet küldeni a MAVA szerverére")
         self.add("tab_debug_log", "_Debug napló")
         self.add("tab_help", "_Segítség")
         self.add("tab_gates", "_Kapuk")        
 
+        self.add("conn_failed", "Nem tudtam kapcsolódni a szimulátorhoz.")
+        self.add("conn_failed_sec",
+                 "Korrigáld a problémát, majd nyomd meg az "
+                 "<b>Próbáld újra</b> gombot a újrakapcsolódáshoz, "
+                 "vagy a <b>Mégse</b> gombot a járat megszakításához.")
+        self.add("conn_broken",
+                 "A szimulátorral való kapcsolat váratlanul megszakadt.")
+        self.add("conn_broken_sec",
+                 "Ha a szimulátor elszállt, indítsd újra "
+                 "és állítsd vissza a repülésed elszállás előtti "
+                 "állapotát amennyire csak lehet. "
+                 "Ezután nyomd meg az <b>Újrakapcsolódás</b> gombot "
+                 "a kapcsolat ismételt felvételéhez.\n\n"
+                 "Ha meg akarod szakítani a repülést, nyomd meg a "
+                 "<b>Mégse</b> gombot.")
+        self.add("button_cancel", "_Mégse")
+        self.add("button_tryagain", "_Próbáld újra")
+        self.add("button_reconnect", "Újra_kapcsolódás")
+        
         self.add("login", "Bejelentkezés")
         self.add("loginHelp",