diff MoinMoin/macro/__init__.py @ 688:15c55ecd7ccb

fix some i18n bugs
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 23 May 2006 09:57:24 +0200
parents 9fb4124ea499
children e3c44dc8f488
line wrap: on
line diff
--- a/MoinMoin/macro/__init__.py	Mon May 22 00:55:40 2006 +0200
+++ b/MoinMoin/macro/__init__.py	Tue May 23 09:57:24 2006 +0200
@@ -43,7 +43,7 @@
         return cfg.macro_names
     else:
         lnames = names[:]
-        lnames.extend(i18n.languages.keys())
+        lnames.extend(i18n.wikiLanguages().keys())
         lnames.extend(wikiutil.getPlugins('macro', cfg))
         cfg.macro_names = lnames # remember it
         return lnames
@@ -93,7 +93,7 @@
 
     # we need the lang macros to execute when html is generated,
     # to have correct dir and lang html attributes
-    for lang in i18n.languages.keys():
+    for lang in i18n.wikiLanguages().keys():
         Dependencies[lang] = []
     
 
@@ -122,7 +122,7 @@
                 builtins = self.__class__
                 execute = getattr(builtins, '_macro_' + macro_name)
             except AttributeError:
-                if macro_name in i18n.languages:
+                if macro_name in i18n.wikiLanguages():
                     execute = builtins._m_lang
                 else:
                     raise ImportError("Cannot load macro %s" % macro_name)