Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@sugarlabs.org>2012-08-16 16:29:58 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2012-08-16 16:29:58 (GMT)
commit5a49bbeb3453d46c0121d8d67f045f1aa0ee056e (patch)
treecacceb7704bce7e65e7aeed92cb54429404207de
parent6e73d57ce45f6651ae6134948cf80a41a6d20832 (diff)
Reuse default_lang() from ad
-rw-r--r--sugar_network/local/mountset.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/sugar_network/local/mountset.py b/sugar_network/local/mountset.py
index 721c217..175bf02 100644
--- a/sugar_network/local/mountset.py
+++ b/sugar_network/local/mountset.py
@@ -13,7 +13,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import locale
import socket
import logging
from os.path import join, exists
@@ -46,7 +45,7 @@ class Mountset(dict, ad.CommandsProcessor, SyncCommands):
self.opened = coroutine.Event()
self.home_volume = home_volume
self._subscriptions = {}
- self._locale = locale.getdefaultlocale()[0].replace('_', '-')
+ self._lang = ad.default_lang()
self._jobs = coroutine.Pool()
self._servers = coroutine.Pool()
@@ -96,7 +95,7 @@ class Mountset(dict, ad.CommandsProcessor, SyncCommands):
_logger.info('Checkin %r context', guid)
mount.call(
ad.Request(method='PUT', document='context', guid=guid,
- accept_language=[self._locale],
+ accept_language=[self._lang],
content={'keep_impl': 2, 'keep': False}),
ad.Response())
@@ -110,7 +109,7 @@ class Mountset(dict, ad.CommandsProcessor, SyncCommands):
_logger.info('Keep %r context', guid)
mount.call(
ad.Request(method='PUT', document='context', guid=guid,
- accept_language=[self._locale],
+ accept_language=[self._lang],
content={'keep': True}),
ad.Response())
@@ -125,7 +124,7 @@ class Mountset(dict, ad.CommandsProcessor, SyncCommands):
for guid in [context] if isinstance(context, basestring) else context:
feed = mount.call(
ad.Request(method='GET', document='context', guid=guid,
- prop='feed', accept_language=[self._locale]),
+ prop='feed', accept_language=[self._lang]),
ad.Response())
for impls in feed.values():
for impl in impls.values():
@@ -141,7 +140,7 @@ class Mountset(dict, ad.CommandsProcessor, SyncCommands):
def call(self, request, response=None):
if response is None:
response = ad.Response()
- request.accept_language = [self._locale]
+ request.accept_language = [self._lang]
mountpoint = request.get('mountpoint')
try: