From a673cbcead2435de236ad12aa7d784ef7211b2e0 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Fri, 6 Apr 2012 15:40:58 +0200
Subject: [PATCH] if language options specifies only one language always use
 this one independent of personal settings

---
 i18n/README.txt |  2 +-
 i18n/browser.py | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/i18n/README.txt b/i18n/README.txt
index 44b8b98..534ec0b 100644
--- a/i18n/README.txt
+++ b/i18n/README.txt
@@ -52,7 +52,7 @@ the default language using a LanguageInfo object that is similar to a view.
   >>> from loops.i18n.browser import LanguageInfo
   >>> langInfo = LanguageInfo(topic01, TestRequest())
   >>> langInfo.availableLanguages
-  []
+  <AutoElement 'languages'>
   >>> langInfo.language is None
   True
   >>> langInfo.defaultLanguage is None
diff --git a/i18n/browser.py b/i18n/browser.py
index 4f27b28..a064917 100644
--- a/i18n/browser.py
+++ b/i18n/browser.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2012 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,8 +18,6 @@
 
 """
 View extension for support of i18n content.
-
-$Id$
 """
 
 from zope import interface, component
@@ -29,6 +27,7 @@ from zope.cachedescriptors.property import Lazy
 from zope.i18n.interfaces import IUserPreferredLanguages
 from zope.i18n.negotiator import negotiator
 
+from cybertools.meta.interfaces import IOptions
 from loops.common import adapted
 
 
@@ -50,12 +49,7 @@ class LanguageInfo(object):
 
     @Lazy
     def availableLanguages(self):
-        for opt in self.loopsRoot.options:
-            if opt.startswith('languages:'):
-                return opt[len('languages:'):].split(',')
-        return []
-        # new implementation:
-        # return IOptions(self.context).i18n.languages
+        return IOptions(self.loopsRoot).languages
 
     @Lazy
     def defaultLanguage(self):
@@ -64,10 +58,12 @@ class LanguageInfo(object):
 
     @Lazy
     def language(self):
+        available = self.availableLanguages or ('en', 'de')
+        if len(available) == 1:
+            return available[0]
         lang = self.request.get('loops.language')
-        if lang is not None and lang in self.availableLanguages:
+        if lang is not None and lang in available:
             return lang
-        available = self.availableLanguages or ('en', 'de',)
         return (negotiator.getLanguage(available, self.request)
                 or self.defaultLanguage)
 
@@ -95,7 +91,7 @@ class I18NView(object):
 
     def checkLanguage(self):
         session = ISession(self.request)[packageId]
-        lang = session.get('language')
+        lang = session.get('language') or self.languageInfo.language
         if lang:
             self.setLanguage(lang)