summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/context.cpp7
-rw-r--r--src/htmlhelp.cpp2
-rw-r--r--src/htmlhelp.h1
-rw-r--r--templates/html/htmljsmenudata.tpl4
4 files changed, 11 insertions, 3 deletions
diff --git a/src/context.cpp b/src/context.cpp
index 9973a59..f2f1419 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -35,6 +35,7 @@
#include "docparser.h"
#include "htmlgen.h"
#include "htmldocvisitor.h"
+#include "htmlhelp.h"
#include "latexgen.h"
#include "latexdocvisitor.h"
#include "dot.h"
@@ -1006,6 +1007,10 @@ class TranslateContext::Private
{
return theTranslator->trExamplesDescription();
}
+ TemplateVariant langString() const
+ {
+ return HtmlHelp::getLanguageString();
+ }
Private()
{
static bool init=FALSE;
@@ -1195,6 +1200,8 @@ class TranslateContext::Private
s_inst.addProperty("extendsClass", &Private::extendsClass);
//%% string examplesDescription
s_inst.addProperty("examplesDescription",&Private::examplesDescription);
+ //%% string langstring
+ s_inst.addProperty("langString", &Private::langString);
init=TRUE;
}
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index fbfece0..ad56de8 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -447,7 +447,7 @@ void HtmlHelp::initialize()
}
-static QCString getLanguageString()
+QCString HtmlHelp::getLanguageString()
{
if (!theTranslator->idLanguage().isEmpty())
{
diff --git a/src/htmlhelp.h b/src/htmlhelp.h
index 8191d03..9c3fa04 100644
--- a/src/htmlhelp.h
+++ b/src/htmlhelp.h
@@ -84,6 +84,7 @@ class HtmlHelp : public IndexIntf
void addIndexFile(const char *name);
void addImageFile(const char *);
void addStyleSheetFile(const char *) {}
+ static QCString getLanguageString();
private:
friend class HtmlHelpIndex;
diff --git a/templates/html/htmljsmenudata.tpl b/templates/html/htmljsmenudata.tpl
index 2cfbbb0..08d8773 100644
--- a/templates/html/htmljsmenudata.tpl
+++ b/templates/html/htmljsmenudata.tpl
@@ -36,9 +36,9 @@ var menudata={children:[
{% if fileList %}
,{text:'{{ tr.files }}',url:'files{{ config.HTML_FILE_EXTENSION }}',children[
{text:'{{ tr.fileList }}',url:'files{{ config.HTML_FILE_EXTENSION }}'}
-{% if fileMemberIndex.all %}
+{% if globalsIndex.all %}
,{text:'{{ tr.fileMembers }}',url'globals{{ config.HTML_FILE_EXTENSION }}',children:[
- {% with page=fileMembersIndex %}
+ {% with page=globalsIndex %}
{% include 'htmljsmenumembersdata.tpl' %}
{% endwith %}
]}