From caad2dfe02799affb593a712a746b298a6c4f105 Mon Sep 17 00:00:00 2001 From: krasimir Date: Thu, 21 Feb 2008 15:58:19 +0000 Subject: [PATCH] For Windows change the Console Code Page to the default ANSI code page. This fixes the problem with cyrilic. --- src/GF.hs | 12 ++++++++++++ src/GF/Shell/HelpFile.hs | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/GF.hs b/src/GF.hs index 006d5f0df..1d2651767 100644 --- a/src/GF.hs +++ b/src/GF.hs @@ -1,3 +1,4 @@ +{-# OPTIONS -cpp #-} ---------------------------------------------------------------------- -- | -- Module : Main @@ -37,10 +38,21 @@ import System (getArgs,system,getEnv) import Control.Monad (foldM,liftM) import Data.List (nub) +#ifdef mingw32_HOST_OS +import System.Win32.Console +import System.Win32.NLS +#endif + -- AR 19/4/2000 -- 21/3/2006 main :: IO () main = do +#ifdef mingw32_HOST_OS + codepage <- getACP + setConsoleCP codepage + setConsoleOutputCP codepage +#endif + xs <- getArgs let (os,fs) = getOptions "-" xs diff --git a/src/GF/Shell/HelpFile.hs b/src/GF/Shell/HelpFile.hs index 06528204b..43fae7c42 100644 --- a/src/GF/Shell/HelpFile.hs +++ b/src/GF/Shell/HelpFile.hs @@ -717,7 +717,7 @@ txtHelpFile = "\n-coding, Some grammars are in UTF-8, some in isolatin-1." ++ "\n If the letters \228 (a-umlaut) and \246 (o-umlaut) look strange, either" ++ "\n change your terminal to isolatin-1, or rewrite the grammar with" ++ - "\n 'pg -utf8'." ++ + "\n 'pg -utf8'. For Windows you also may have to change your font to TrueType." ++ "\n" ++ "\n-- *: Commands and options marked with * are not currently implemented." ++ []