diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Shell/Commands.hs | 7 | ||||
| -rw-r--r-- | src/Today.hs | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/GF/Shell/Commands.hs b/src/GF/Shell/Commands.hs index 32c496893..19148c1bc 100644 --- a/src/GF/Shell/Commands.hs +++ b/src/GF/Shell/Commands.hs @@ -409,7 +409,7 @@ displaySStateJavaX isNew env state = encodeUTF8 $ mkUnicode $ ] where (tree,msg,menu) = displaySState env state - menu' = [tagXML "show" [s] ++ tagXML "send" [c] | (s,c) <- menu] + menu' = [tagXML "show" [unicode s] ++ tagXML "send" [c] | (s,c) <- menu] (ls,grs) = unzip $ lgrs lgrs = allActiveStateGrammarsWithNames env lins = (langAbstract, exp) : linAll @@ -423,6 +423,11 @@ displaySStateJavaX isNew env state = encodeUTF8 $ mkUnicode $ gr = firstStateGrammar env mark = markOptXML -- markOptJava + unicode = case getOptVal opts menuDisplay of + Just lang -> optDecodeUTF8 (stateGrammarOfLang env (language lang)) + _ -> id + + langAbstract = language "Abstract" langXML = language "XML" diff --git a/src/Today.hs b/src/Today.hs index 281ea68a1..6184d8036 100644 --- a/src/Today.hs +++ b/src/Today.hs @@ -1 +1 @@ -module Today where today = "Wed Jan 28 14:24:20 CET 2004" +module Today where today = "Thu Jan 29 13:42:01 CET 2004" |