Add gettext capability to template and menu resources #239
@ -18,6 +18,7 @@ import (
 | 
				
			|||||||
	"git.defalsify.org/vise.git/engine"
 | 
						"git.defalsify.org/vise.git/engine"
 | 
				
			||||||
	"git.defalsify.org/vise.git/logging"
 | 
						"git.defalsify.org/vise.git/logging"
 | 
				
			||||||
	"git.defalsify.org/vise.git/resource"
 | 
						"git.defalsify.org/vise.git/resource"
 | 
				
			||||||
 | 
						"git.defalsify.org/vise.git/lang"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/common"
 | 
						"git.grassecon.net/urdt/ussd/common"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/config"
 | 
						"git.grassecon.net/urdt/ussd/config"
 | 
				
			||||||
@ -26,6 +27,7 @@ import (
 | 
				
			|||||||
	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 | 
						httpserver "git.grassecon.net/urdt/ussd/internal/http"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/internal/storage"
 | 
						"git.grassecon.net/urdt/ussd/internal/storage"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/remote"
 | 
						"git.grassecon.net/urdt/ussd/remote"
 | 
				
			||||||
 | 
						"git.grassecon.net/urdt/ussd/internal/args"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var (
 | 
					var (
 | 
				
			||||||
@ -114,6 +116,8 @@ func main() {
 | 
				
			|||||||
	var engineDebug bool
 | 
						var engineDebug bool
 | 
				
			||||||
	var host string
 | 
						var host string
 | 
				
			||||||
	var port uint
 | 
						var port uint
 | 
				
			||||||
 | 
						var gettextDir string
 | 
				
			||||||
 | 
						var langs args.LangVar
 | 
				
			||||||
	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 | 
						flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 | 
				
			||||||
	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
 | 
						flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
 | 
				
			||||||
	flag.StringVar(&database, "db", "gdbm", "database to be used")
 | 
						flag.StringVar(&database, "db", "gdbm", "database to be used")
 | 
				
			||||||
@ -121,12 +125,21 @@ func main() {
 | 
				
			|||||||
	flag.UintVar(&size, "s", 160, "max size of output")
 | 
						flag.UintVar(&size, "s", 160, "max size of output")
 | 
				
			||||||
	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
 | 
						flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
 | 
				
			||||||
	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 | 
						flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 | 
				
			||||||
 | 
						flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 | 
				
			||||||
 | 
						flag.Var(&langs, "language", "add symbol resolution for language")
 | 
				
			||||||
	flag.Parse()
 | 
						flag.Parse()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	logg.Infof("start command", "build", build, "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
 | 
						logg.Infof("start command", "build", build, "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ctx := context.Background()
 | 
						ctx := context.Background()
 | 
				
			||||||
	ctx = context.WithValue(ctx, "Database", database)
 | 
						ctx = context.WithValue(ctx, "Database", database)
 | 
				
			||||||
 | 
						ln, err := lang.LanguageFromCode(config.DefaultLanguage)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							fmt.Fprintf(os.Stderr, "default language set error: %v", err)
 | 
				
			||||||
 | 
							os.Exit(1)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						ctx = context.WithValue(ctx, "Language", ln)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pfp := path.Join(scriptDir, "pp.csv")
 | 
						pfp := path.Join(scriptDir, "pp.csv")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cfg := engine.Config{
 | 
						cfg := engine.Config{
 | 
				
			||||||
 | 
				
			|||||||
@ -12,12 +12,14 @@ import (
 | 
				
			|||||||
	"git.defalsify.org/vise.git/engine"
 | 
						"git.defalsify.org/vise.git/engine"
 | 
				
			||||||
	"git.defalsify.org/vise.git/logging"
 | 
						"git.defalsify.org/vise.git/logging"
 | 
				
			||||||
	"git.defalsify.org/vise.git/resource"
 | 
						"git.defalsify.org/vise.git/resource"
 | 
				
			||||||
 | 
						"git.defalsify.org/vise.git/lang"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/config"
 | 
						"git.grassecon.net/urdt/ussd/config"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/initializers"
 | 
						"git.grassecon.net/urdt/ussd/initializers"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/internal/handlers"
 | 
						"git.grassecon.net/urdt/ussd/internal/handlers"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/internal/storage"
 | 
						"git.grassecon.net/urdt/ussd/internal/storage"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/remote"
 | 
						"git.grassecon.net/urdt/ussd/remote"
 | 
				
			||||||
 | 
						"git.grassecon.net/urdt/ussd/internal/args"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var (
 | 
					var (
 | 
				
			||||||
@ -54,6 +56,8 @@ func main() {
 | 
				
			|||||||
	var engineDebug bool
 | 
						var engineDebug bool
 | 
				
			||||||
	var host string
 | 
						var host string
 | 
				
			||||||
	var port uint
 | 
						var port uint
 | 
				
			||||||
 | 
						var gettextDir string
 | 
				
			||||||
 | 
						var langs args.LangVar
 | 
				
			||||||
	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 | 
						flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 | 
				
			||||||
	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 | 
						flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 | 
				
			||||||
	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
 | 
						flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
 | 
				
			||||||
@ -62,12 +66,22 @@ func main() {
 | 
				
			|||||||
	flag.UintVar(&size, "s", 160, "max size of output")
 | 
						flag.UintVar(&size, "s", 160, "max size of output")
 | 
				
			||||||
	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
 | 
						flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
 | 
				
			||||||
	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 | 
						flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 | 
				
			||||||
 | 
						flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 | 
				
			||||||
 | 
						flag.Var(&langs, "language", "add symbol resolution for language")
 | 
				
			||||||
	flag.Parse()
 | 
						flag.Parse()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)
 | 
						logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ctx := context.Background()
 | 
						ctx := context.Background()
 | 
				
			||||||
	ctx = context.WithValue(ctx, "Database", database)
 | 
						ctx = context.WithValue(ctx, "Database", database)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ln, err := lang.LanguageFromCode(config.DefaultLanguage)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							fmt.Fprintf(os.Stderr, "default language set error: %v", err)
 | 
				
			||||||
 | 
							os.Exit(1)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						ctx = context.WithValue(ctx, "Language", ln)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pfp := path.Join(scriptDir, "pp.csv")
 | 
						pfp := path.Join(scriptDir, "pp.csv")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cfg := engine.Config{
 | 
						cfg := engine.Config{
 | 
				
			||||||
 | 
				
			|||||||
@ -14,6 +14,7 @@ import (
 | 
				
			|||||||
	"git.defalsify.org/vise.git/engine"
 | 
						"git.defalsify.org/vise.git/engine"
 | 
				
			||||||
	"git.defalsify.org/vise.git/logging"
 | 
						"git.defalsify.org/vise.git/logging"
 | 
				
			||||||
	"git.defalsify.org/vise.git/resource"
 | 
						"git.defalsify.org/vise.git/resource"
 | 
				
			||||||
 | 
						"git.defalsify.org/vise.git/lang"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/config"
 | 
						"git.grassecon.net/urdt/ussd/config"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/initializers"
 | 
						"git.grassecon.net/urdt/ussd/initializers"
 | 
				
			||||||
@ -21,6 +22,7 @@ import (
 | 
				
			|||||||
	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 | 
						httpserver "git.grassecon.net/urdt/ussd/internal/http"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/internal/storage"
 | 
						"git.grassecon.net/urdt/ussd/internal/storage"
 | 
				
			||||||
	"git.grassecon.net/urdt/ussd/remote"
 | 
						"git.grassecon.net/urdt/ussd/remote"
 | 
				
			||||||
 | 
						"git.grassecon.net/urdt/ussd/internal/args"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var (
 | 
					var (
 | 
				
			||||||
@ -43,6 +45,8 @@ func main() {
 | 
				
			|||||||
	var engineDebug bool
 | 
						var engineDebug bool
 | 
				
			||||||
	var host string
 | 
						var host string
 | 
				
			||||||
	var port uint
 | 
						var port uint
 | 
				
			||||||
 | 
						var gettextDir string
 | 
				
			||||||
 | 
						var langs args.LangVar
 | 
				
			||||||
	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 | 
						flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 | 
				
			||||||
	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
 | 
						flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
 | 
				
			||||||
	flag.StringVar(&database, "db", "gdbm", "database to be used")
 | 
						flag.StringVar(&database, "db", "gdbm", "database to be used")
 | 
				
			||||||
@ -50,12 +54,22 @@ func main() {
 | 
				
			|||||||
	flag.UintVar(&size, "s", 160, "max size of output")
 | 
						flag.UintVar(&size, "s", 160, "max size of output")
 | 
				
			||||||
	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
 | 
						flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
 | 
				
			||||||
	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 | 
						flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 | 
				
			||||||
 | 
						flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 | 
				
			||||||
 | 
						flag.Var(&langs, "language", "add symbol resolution for language")
 | 
				
			||||||
	flag.Parse()
 | 
						flag.Parse()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
 | 
						logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ctx := context.Background()
 | 
						ctx := context.Background()
 | 
				
			||||||
	ctx = context.WithValue(ctx, "Database", database)
 | 
						ctx = context.WithValue(ctx, "Database", database)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ln, err := lang.LanguageFromCode(config.DefaultLanguage)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							fmt.Fprintf(os.Stderr, "default language set error: %v", err)
 | 
				
			||||||
 | 
							os.Exit(1)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						ctx = context.WithValue(ctx, "Language", ln)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pfp := path.Join(scriptDir, "pp.csv")
 | 
						pfp := path.Join(scriptDir, "pp.csv")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cfg := engine.Config{
 | 
						cfg := engine.Config{
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user