i18n: move the code file into internal (#91)

05sec · Nov 27, 2020 · 21854fb · 21854fb
1 parent 7041f3d
commit 21854fb
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 22 deletions.
diff --git a/conf/config.go b/conf/config.go
@@ -4,11 +4,11 @@ import (
 	"os"
 	"time"
 
+	"github.com/vidar-team/Cardinal/internal/locales"
 	log "unknwon.dev/clog/v2"
 
 	"github.com/BurntSushi/toml"
 	"github.com/thanhpk/randstr"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 var conf *config

diff --git a/internal/asteroid/handler.go b/internal/asteroid/handler.go
@@ -2,8 +2,8 @@ package asteroid
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 func GetAsteroidStatus(c *gin.Context) (int, interface{}) {

diff --git a/internal/auth/manager/manager.go b/internal/auth/manager/manager.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jinzhu/gorm"
 	"github.com/thanhpk/randstr"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // ManagerLogin is manager login handler.

diff --git a/internal/auth/middleware.go b/internal/auth/middleware.go
@@ -3,8 +3,8 @@ package auth
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // TeamAuthRequired is the team permission check middleware.

diff --git a/internal/auth/team/team.go b/internal/auth/team/team.go
@@ -1,14 +1,15 @@
 package team
 
 import (
+	"strconv"
+
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	"github.com/thanhpk/randstr"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
-	"strconv"
 )
 
 // TeamLogin is the team login handler.

diff --git a/internal/bulletin/bulletin.go b/internal/bulletin/bulletin.go
@@ -6,8 +6,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // GetAllBulletins returns all bulletins from the database.

diff --git a/internal/db/mysql.go b/internal/db/mysql.go
@@ -6,7 +6,7 @@ import (
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/mysql"
 	"github.com/vidar-team/Cardinal/conf"
-	"github.com/vidar-team/Cardinal/locales"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	log "unknwon.dev/clog/v2"
 )
 

diff --git a/internal/dynamic_config/dynamic_config.go b/internal/dynamic_config/dynamic_config.go
@@ -3,8 +3,8 @@ package dynamic_config
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 func Init() {

diff --git a/internal/game/challenge.go b/internal/game/challenge.go
@@ -7,9 +7,9 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // SetVisible is setting challenge visible status handler.

diff --git a/internal/game/check.go b/internal/game/check.go
@@ -6,10 +6,10 @@ import (
 	"github.com/vidar-team/Cardinal/internal/asteroid"
 	"github.com/vidar-team/Cardinal/internal/db"
 	"github.com/vidar-team/Cardinal/internal/livelog"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/misc/webhook"
 	"github.com/vidar-team/Cardinal/internal/timer"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // CheckDown is the gamebox check down handler for bots.

diff --git a/internal/game/flag.go b/internal/game/flag.go
@@ -14,11 +14,11 @@ import (
 	"github.com/vidar-team/Cardinal/internal/db"
 	"github.com/vidar-team/Cardinal/internal/dynamic_config"
 	"github.com/vidar-team/Cardinal/internal/livelog"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/misc/webhook"
 	"github.com/vidar-team/Cardinal/internal/timer"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // SubmitFlag is submit flag handler for teams.

diff --git a/internal/game/gamebox.go b/internal/game/gamebox.go
@@ -8,10 +8,10 @@ import (
 	"github.com/jinzhu/gorm"
 	"github.com/vidar-team/Cardinal/internal/db"
 	"github.com/vidar-team/Cardinal/internal/dynamic_config"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/timer"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // GetSelfGameBoxes returns the gameboxes which belong to the team.

diff --git a/internal/game/rank.go b/internal/game/rank.go
@@ -4,9 +4,9 @@ import (
 	"github.com/patrickmn/go-cache"
 	"github.com/vidar-team/Cardinal/conf"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/store"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // RankItem is used to create the ranking list.

diff --git a/internal/game/score.go b/internal/game/score.go
@@ -8,8 +8,8 @@ import (
 	"github.com/vidar-team/Cardinal/conf"
 	"github.com/vidar-team/Cardinal/internal/db"
 	"github.com/vidar-team/Cardinal/internal/healthy"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // CalculateRoundScore will calculate the score of the given round.

diff --git a/internal/healthy/healthy.go b/internal/healthy/healthy.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/vidar-team/Cardinal/conf"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/timer"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 // HealthyCheck will be used to check whether Cardinal runs normally.

diff --git a/internal/install/install.go b/internal/install/install.go
@@ -15,9 +15,9 @@ import (
 	"github.com/thanhpk/randstr"
 	"github.com/vidar-team/Cardinal/conf"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 	log "unknwon.dev/clog/v2"
 )
 

diff --git a/locales/i18n.go → internal/locales/i18n.go b/locales/i18n.go → internal/locales/i18n.go
diff --git a/internal/misc/version.go b/internal/misc/version.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/vidar-team/Cardinal/internal/db"
 	"github.com/vidar-team/Cardinal/internal/dynamic_config"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	log "unknwon.dev/clog/v2"
 
 	"github.com/gin-gonic/gin"
 	"github.com/parnurzeal/gorequest"
 	"github.com/vidar-team/Cardinal/conf"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 const GITHUB_RELEASE_API = "https://api.github.com/repos/vidar-team/Cardinal/releases/latest"

diff --git a/internal/misc/webhook/webhook.go b/internal/misc/webhook/webhook.go
@@ -11,10 +11,10 @@ import (
 	"github.com/patrickmn/go-cache"
 	"github.com/thanhpk/randstr"
 	"github.com/vidar-team/Cardinal/internal/db"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/store"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 const (

diff --git a/internal/route/router.go b/internal/route/router.go
@@ -17,12 +17,12 @@ import (
 	"github.com/vidar-team/Cardinal/internal/game"
 	"github.com/vidar-team/Cardinal/internal/healthy"
 	"github.com/vidar-team/Cardinal/internal/livelog"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/misc/webhook"
 	"github.com/vidar-team/Cardinal/internal/timer"
 	"github.com/vidar-team/Cardinal/internal/upload"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 func Init() *gin.Engine {

diff --git a/internal/timer/timer.go b/internal/timer/timer.go
@@ -7,10 +7,10 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/vidar-team/Cardinal/conf"
 	"github.com/vidar-team/Cardinal/internal/asteroid"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/logger"
 	"github.com/vidar-team/Cardinal/internal/misc/webhook"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 	log "unknwon.dev/clog/v2"
 )
 

diff --git a/internal/upload/file.go b/internal/upload/file.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/thanhpk/randstr"
+	"github.com/vidar-team/Cardinal/internal/locales"
 	"github.com/vidar-team/Cardinal/internal/utils"
-	"github.com/vidar-team/Cardinal/locales"
 )
 
 func GetDir(c *gin.Context) (int, interface{}) {