gnome-games r8387 - trunk/glchess/src/lib/ggz

[rancell svn gnome org]

Author: rancell
Date: Sun Dec 28 01:46:27 2008
New Revision: 8387
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8387&view=rev

Log:
Change GGZ language from hardcoded en_NZ.UTF-8 to use environment variable LANG (Robert Ancell, Bug #565402)

Modified:
   trunk/glchess/src/lib/ggz/client.py

Modified: trunk/glchess/src/lib/ggz/client.py
==============================================================================
--- trunk/glchess/src/lib/ggz/client.py	(original)
+++ trunk/glchess/src/lib/ggz/client.py	Sun Dec 28 01:46:27 2008
@@ -187,9 +187,15 @@
         assert(self.client.state is self.client.STATE_DISCONNECTED)
         self.client.feedback.onConnected()
         self.client.setState(self.client.STATE_START_SESSION)
+        
+        try:
+            language = os.environ['LANG']
+        except KeyError:
+            language = 'C'
+
         self.send("<?xml version='1.0' encoding='UTF-8'?>\n")
         self.send("<SESSION>\n")
-        self.send("<LANGUAGE>en_NZ.UTF-8</LANGUAGE>\n")
+        self.send("<LANGUAGE>%s</LANGUAGE>\n" % xml.sax.saxutils.escape(language))
         (self.client.username, self.client.password) = self.client.feedback.getLogin()
         if self.client.password is None:
             self.client._loginGuest(self.client.username)
@@ -443,13 +449,13 @@
             # player remove event before we get the player list.
             return
             
-        player.room.nPlayers -= 1
         player.lastRoom = player.room
         player.room = room
         if player.room is not None:
             player.room.nPlayers += 1
             self.client.feedback.roomUpdated(player.room)
         if player.lastRoom is not None:
+            player.lastRoom.nPlayers -= 1
             self.client.feedback.roomUpdated(player.lastRoom)
         self.client.feedback.playerRemoved(player)