summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will@willthompson.co.uk>2019-10-18 09:23:20 +0000
committerWill Thompson <will@willthompson.co.uk>2019-10-18 09:23:20 +0000
commit89a488ae0cab406469d061dd36078e7d1815da75 (patch)
tree7177ac6785d560d794a4e80a4778fec3f0c3a70c
parent4c371ddb80218d049e5232d6573c83749541bed3 (diff)
parent6781afab661a95a1f210e91360e81d4f43d1e819 (diff)
Merge branch 'no-hgettext' into 'master'
Setup.hs: Don’t import Gettext.hs without hgettext See merge request bustle/bustle!14
-rw-r--r--Bustle/UI.hs3
-rw-r--r--Setup.hs13
-rw-r--r--bustle.cabal2
3 files changed, 16 insertions, 2 deletions
diff --git a/Bustle/UI.hs b/Bustle/UI.hs
index 28ede19..6666c72 100644
--- a/Bustle/UI.hs
+++ b/Bustle/UI.hs
@@ -487,7 +487,8 @@ emptyWindow = do
subtitle <- getW castToLabel "headerSubtitle"
spinner <- getW castToSpinner "headerSpinner"
- [openItem, openTwoItem] <- mapM (getW castToMenuItem) ["open", "openTwo"]
+ openItem <- getW castToMenuItem "open"
+ openTwoItem <- getW castToMenuItem "openTwo"
recordSessionItem <- getW castToMenuItem "recordSession"
recordSystemItem <- getW castToMenuItem "recordSystem"
recordAddressItem <- getW castToMenuItem "recordAddress"
diff --git a/Setup.hs b/Setup.hs
index dd86bba..50e7b54 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,4 +1,8 @@
+{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -Wall #-}
+
+#if defined(VERSION_hgettext)
+
import System.FilePath ( (</>), (<.>) )
import Distribution.PackageDescription
@@ -92,3 +96,12 @@ generateModule pkg lbi =
tar = GetText.targetDataDir lbi
-- Cargo-culted from hgettext
+
+#else
+
+import Distribution.Simple
+
+main :: IO ()
+main = defaultMain
+
+#endif
diff --git a/bustle.cabal b/bustle.cabal
index a2ebf77..e791803 100644
--- a/bustle.cabal
+++ b/bustle.cabal
@@ -69,7 +69,7 @@ Source-Repository head
Flag hgettext
Description: Enable translations. Since there are no translations this is currently rather pointless.
- Default: True
+ Default: False
Flag InteractiveTests
Description: Build interactive test programs