[Moin-devel] CVS: MoinMoin/i18n __init__.py,1.21,1.22 de.py,1.70,1.71

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin/i18n
In directory usw-pr-cvs1:/tmp/cvs-serv7840/MoinMoin/i18n

Modified Files:
	__init__.py de.py 
Log Message:
"Preferred language" setting


Index: __init__.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/i18n/__init__.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** __init__.py	7 Mar 2002 11:17:23 -0000	1.21
--- __init__.py	14 Mar 2002 20:12:44 -0000	1.22
***************
*** 103,107 ****
  
  def getLang():
!     """Get a user's language (from CGI environment)"""
      global _text_lang
      if _text_lang: return _text_lang
--- 103,110 ----
  
  def getLang():
!     """Get a user's language (from preferences or CGI environment)"""
!     from MoinMoin import user
!     if user.current.language: return user.current.language
! 
      global _text_lang
      if _text_lang: return _text_lang
***************
*** 137,144 ****
  
  
! def getText(str):
!     """Load a text in the user's language"""
      # quick handling for english texts
-     lang = getLang()
      if lang == "en": return str
  
--- 140,148 ----
  
  
! def getText(str, lang=None):
!     """Load a text in the user's language, or the given one"""
!     if not lang: lang = getLang()
! 
      # quick handling for english texts
      if lang == "en": return str
  

Index: de.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/i18n/de.py,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** de.py	12 Mar 2002 04:09:00 -0000	1.70
--- de.py	14 Mar 2002 20:12:44 -0000	1.71
***************
*** 520,523 ****
--- 520,526 ----
  'Zum Löschen von Seiten bitte nur die vorgesehenen Webseiten benutzen!',
  
+ 'Preferred language':
+ 'Bevorzugte Sprache',
+ 
  'Preview':
  'Vorschau anzeigen',