Client + Python: Pass language to Register

4 files changed, 10 insertions, 3 deletions

diff --git a/client.go b/client.go
index 506d319..033a1dc 100644
--- a/client.go
+++ b/client.go
@@ -53,6 +53,7 @@ type Client struct {
 func (client *Client) Register(
 	name string,
 	directory string,
+	language string,
 	stateCallback func(FSMStateID, FSMStateID, interface{}),
 	debug bool,
 ) error {
@@ -65,7 +66,9 @@ func (client *Client) Register(
 	}
 	// Initialize the logger
 	logLevel := log.LOG_WARNING
-	client.Language = "en"
+
+	// TODO: Verify language setting?
+	client.Language = language
 
 	if debug {
 		logLevel = log.LOG_INFO
diff --git a/exports/exports.go b/exports/exports.go
index fdf3d94..5b0a619 100644
--- a/exports/exports.go
+++ b/exports/exports.go
@@ -88,6 +88,7 @@ func GetVPNState(name string) (*eduvpn.Client, error) {
 func Register(
 	name *C.char,
 	config_directory *C.char,
+	language *C.char,
 	stateCallback C.PythonCB,
 	debug C.int,
 ) *C.error {
@@ -107,6 +108,7 @@ func Register(
 	registerErr := state.Register(
 		nameStr,
 		C.GoString(config_directory),
+		C.GoString(language),
 		func(old eduvpn.FSMStateID, new eduvpn.FSMStateID, data interface{}) {
 			StateCallback(state, nameStr, old, new, data)
 		},
diff --git a/wrappers/python/eduvpn_common/loader.py b/wrappers/python/eduvpn_common/loader.py
index 99f5eb6..0192815 100644
--- a/wrappers/python/eduvpn_common/loader.py
+++ b/wrappers/python/eduvpn_common/loader.py
@@ -83,6 +83,7 @@ def initialize_functions(lib):
     lib.Register.argtypes, lib.Register.restype = [
         c_char_p,
         c_char_p,
+        c_char_p,
         VPNStateChange,
         c_int,
     ], c_void_p
diff --git a/wrappers/python/eduvpn_common/main.py b/wrappers/python/eduvpn_common/main.py
index 9d63c4d..03e1045 100644
--- a/wrappers/python/eduvpn_common/main.py
+++ b/wrappers/python/eduvpn_common/main.py
@@ -32,9 +32,10 @@ def state_callback(name, old_state, new_state, data):
 
 
 class EduVPN(object):
-    def __init__(self, name: str, config_directory: str):
+    def __init__(self, name: str, config_directory: str, language: str):
         self.name = name
         self.config_directory = config_directory
+        self.language = language
 
         # Load the library
         self.lib = load_lib()
@@ -86,7 +87,7 @@ class EduVPN(object):
             raise Exception("Already registered")
 
         register_err = self.go_function(
-            self.lib.Register, self.config_directory, state_callback, debug
+            self.lib.Register, self.config_directory, self.language, state_callback, debug
         )
 
         if register_err: