]> git.lyx.org Git - features.git/commitdiff
strip the translation hints also in the dummy variant
authorGeorg Baum <Georg.Baum@post.rwth-aachen.de>
Sun, 12 Nov 2006 11:06:02 +0000 (11:06 +0000)
committerGeorg Baum <Georg.Baum@post.rwth-aachen.de>
Sun, 12 Nov 2006 11:06:02 +0000 (11:06 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15877 a592a061-630c-0410-9148-cb99ea01b6c8

src/messages.C

index 2ff381bb9cadb5827ce42e2113154c5e3e7dc381..90a345470cbaaac57c0cb2aa09bbb14cdfa914c7 100644 (file)
@@ -32,6 +32,10 @@ using support::setEnv;
 using std::string;
 using std::endl;
 
+
+static boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$");
+
+
 #ifdef ENABLE_NLS
 
 
@@ -188,7 +192,6 @@ public:
                        // string, otherwise the user sees bogus messages.
                        // If we are unable to honour the request we just
                        // return what we got in.
-                       static boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$");
                        boost::smatch sub;
                        if (regex_match(m, sub, reg))
                                translated = from_ascii(sub.str(1));
@@ -221,7 +224,12 @@ public:
 
        docstring const get(string const & m) const
        {
-               return from_ascii(m);
+               // See comment above
+               boost::smatch sub;
+               if (regex_match(m, sub, reg))
+                       return from_ascii(sub.str(1));
+               else
+                       return from_ascii(m);
        }
 };
 #endif