many: use snapcore/snapd/i18n instead of i18n/dumbi18n-for-real

We have fully working i18n so we should probably use it. 

14 files changed, 12 insertions, 37 deletions

diff --git a/daemon/api.go b/daemon/api.go
index 6d7cb7a0bc..81de8defcf 100644
--- a/daemon/api.go
+++ b/daemon/api.go
@@ -44,7 +44,7 @@ import (
	"github.com/snapcore/snapd/asserts/snapasserts"
	"github.com/snapcore/snapd/client"
	"github.com/snapcore/snapd/dirs"
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/interfaces"
	"github.com/snapcore/snapd/jsonutil"
	"github.com/snapcore/snapd/logger"
diff --git a/daemon/daemon.go b/daemon/daemon.go
index 4d61a77ebf..9e45b40aba 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -39,7 +39,7 @@ import (
	"github.com/snapcore/snapd/client"
	"github.com/snapcore/snapd/dirs"
	"github.com/snapcore/snapd/httputil"
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/logger"
	"github.com/snapcore/snapd/osutil"
	"github.com/snapcore/snapd/overlord"
diff --git a/i18n/dumb/dumb.go b/i18n/dumb/dumb.go
deleted file mode 100644
index 11b6b99962..0000000000
--- a/i18n/dumb/dumb.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- Mode: Go; indent-tabs-mode: t -*-
-
-/*
- * Copyright (C) 2016 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package i18n // import "github.com/snapcore/snapd/i18n/dumb"
-
-func G(s string) string {
-	return s
-}
diff --git a/overlord/configstate/configstate.go b/overlord/configstate/configstate.go
index 5ebaecf555..ad2379dee7 100644
--- a/overlord/configstate/configstate.go
+++ b/overlord/configstate/configstate.go
@@ -26,7 +26,7 @@ import (
	"os"
	"time"
 
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/overlord/hookstate"
	"github.com/snapcore/snapd/overlord/snapstate"
	"github.com/snapcore/snapd/overlord/state"
diff --git a/overlord/devicestate/devicemgr.go b/overlord/devicestate/devicemgr.go
index bd84576a61..92eb68626a 100644
--- a/overlord/devicestate/devicemgr.go
+++ b/overlord/devicestate/devicemgr.go
@@ -28,7 +28,7 @@ import (
	"github.com/snapcore/snapd/asserts"
	"github.com/snapcore/snapd/asserts/sysdb"
	"github.com/snapcore/snapd/dirs"
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/overlord/assertstate"
	"github.com/snapcore/snapd/overlord/auth"
	"github.com/snapcore/snapd/overlord/hookstate"
diff --git a/overlord/devicestate/firstboot.go b/overlord/devicestate/firstboot.go
index d62bde43a0..5d1b25b40c 100644
--- a/overlord/devicestate/firstboot.go
+++ b/overlord/devicestate/firstboot.go
@@ -29,7 +29,7 @@ import (
	"github.com/snapcore/snapd/asserts"
	"github.com/snapcore/snapd/asserts/snapasserts"
	"github.com/snapcore/snapd/dirs"
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/osutil"
	"github.com/snapcore/snapd/overlord/assertstate"
	"github.com/snapcore/snapd/overlord/auth"
diff --git a/overlord/hookstate/ctlcmd/get.go b/overlord/hookstate/ctlcmd/get.go
index d320d5b70c..918bad05ae 100644
--- a/overlord/hookstate/ctlcmd/get.go
+++ b/overlord/hookstate/ctlcmd/get.go
@@ -24,7 +24,7 @@ import (
	"fmt"
	"strings"
 
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/interfaces"
	"github.com/snapcore/snapd/overlord/configstate"
	"github.com/snapcore/snapd/overlord/configstate/config"
diff --git a/overlord/hookstate/ctlcmd/set.go b/overlord/hookstate/ctlcmd/set.go
index 5bedac64a1..aee0396a91 100644
--- a/overlord/hookstate/ctlcmd/set.go
+++ b/overlord/hookstate/ctlcmd/set.go
@@ -23,7 +23,7 @@ import (
	"fmt"
	"strings"
 
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/jsonutil"
	"github.com/snapcore/snapd/overlord/configstate"
	"github.com/snapcore/snapd/overlord/hookstate"
diff --git a/overlord/hookstate/hooks.go b/overlord/hookstate/hooks.go
index 7a13e261f8..b94ea219dc 100644
--- a/overlord/hookstate/hooks.go
+++ b/overlord/hookstate/hooks.go
@@ -21,7 +21,7 @@ import (
	"fmt"
	"regexp"
 
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/overlord/snapstate"
	"github.com/snapcore/snapd/overlord/state"
 )
diff --git a/overlord/ifacestate/ifacestate.go b/overlord/ifacestate/ifacestate.go
index 97208e4864..8bb54fa31e 100644
--- a/overlord/ifacestate/ifacestate.go
+++ b/overlord/ifacestate/ifacestate.go
@@ -25,7 +25,7 @@ import (
	"fmt"
	"sync"
 
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/interfaces"
	"github.com/snapcore/snapd/interfaces/policy"
	"github.com/snapcore/snapd/overlord/assertstate"
diff --git a/overlord/patch/patch3.go b/overlord/patch/patch3.go
index 5b494814bb..ddbc2b5f97 100644
--- a/overlord/patch/patch3.go
+++ b/overlord/patch/patch3.go
@@ -22,7 +22,7 @@ package patch
 import (
	"fmt"
 
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/overlord/state"
 )
 
diff --git a/overlord/snapstate/aliasesv2.go b/overlord/snapstate/aliasesv2.go
index 674764b269..1e0bfb87b4 100644
--- a/overlord/snapstate/aliasesv2.go
+++ b/overlord/snapstate/aliasesv2.go
@@ -24,7 +24,7 @@ import (
	"fmt"
	"strings"
 
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/logger"
	"github.com/snapcore/snapd/overlord/snapstate/backend"
	"github.com/snapcore/snapd/overlord/state"
diff --git a/overlord/snapstate/snapstate.go b/overlord/snapstate/snapstate.go
index d07c74f811..a87c3da6b4 100644
--- a/overlord/snapstate/snapstate.go
+++ b/overlord/snapstate/snapstate.go
@@ -28,7 +28,7 @@ import (
 
	"github.com/snapcore/snapd/boot"
	"github.com/snapcore/snapd/dirs"
-	"github.com/snapcore/snapd/i18n/dumb"
+	"github.com/snapcore/snapd/i18n"
	"github.com/snapcore/snapd/interfaces"
	"github.com/snapcore/snapd/logger"
	"github.com/snapcore/snapd/overlord/auth"
diff --git a/packaging/fedora/snapd.spec b/packaging/fedora/snapd.spec
index b4984edb19..22b861f29d 100644
--- a/packaging/fedora/snapd.spec
+++ b/packaging/fedora/snapd.spec
@@ -230,7 +230,6 @@ Provides: golang(%{import_path}/dirs) = %{version}-%{release}
 Provides: golang(%{import_path}/errtracker) = %{version}-%{release}
 Provides: golang(%{import_path}/httputil) = %{version}-%{release}
 Provides: golang(%{import_path}/i18n) = %{version}-%{release}
-Provides: golang(%{import_path}/i18n/dumb) = %{version}-%{release}
 Provides: golang(%{import_path}/image) = %{version}-%{release}
 Provides: golang(%{import_path}/interfaces) = %{version}-%{release}
 Provides: golang(%{import_path}/interfaces/apparmor) = %{version}-%{release}