Author: bklaas
Date: Mon Oct 18 14:15:08 2010
New Revision: 9190
URL: http://svn.slimdevices.com/jive?rev=9190&view=rev
Log:
r40...@daddymac (orig r9183): mherger | 2010-10-14 08:16:56 -0500
Bug: n/a
Description: send actual language in slimproto HELO message
Modified:
7.6/trunk/ (props changed)
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Oct 18 14:15:08 2010
@@ -13,7 +13,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-skin:4552
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9172
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9183
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=9190&r1=9189&r2=9190&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua Mon Oct
18 14:15:08 2010
@@ -30,6 +30,8 @@
local Framework = require("jive.ui.Framework")
local Task = require("jive.ui.Task")
local Timer = require("jive.ui.Timer")
+
+local locale = require("jive.utils.locale")
local DNS = require("jive.net.DNS")
local SocketTcp = require("jive.net.SocketTcp")
@@ -143,7 +145,7 @@
packNumber(wlanList, 2),
packNumber(data.bytesReceivedH or 0, 4),
packNumber(data.bytesReceivedL or 0, 4),
- "EN", -- XXXX language
+ string.upper(locale.getLocale()),
capabilities
}
end,
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
