tehfink committed 1dc9761 Merge

salvator's bugfixes. thanks!

Comments (0)

Files changed (1)


         page = None
         if obj:
             page =
-        plugins = plugin_pool.get_text_enabled_plugins(self.placeholder, page)
+        plugins = plugin_pool.get_text_enabled_plugins(self.placeholder)
         form = self.get_form_class(request, plugins)
         kwargs['form'] = form # override standard form
         return super(CMSFaqEntryPlugin, self).get_form(request, obj, **kwargs)
     def render(self, context, instance, placeholder):
-        #get all FaqEntryPlugin on this page
-        plugins ='CMSFaqEntryPlugin')
+        #get all FaqEntryPlugin on this page and this language
+        language = context.get('lang', settings.LANGUAGE_CODE)
+        plugins ='CMSFaqEntryPlugin', language=language)
         faqentry_plugins = []
         return context
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.