Allow SSL modes to be translated [Hiroshi Saito]

diff --git a/dlg_wingui.c b/dlg_wingui.c
index 63de1884ec12870806b549c1753e5e81d0a4e522..68a411fdad9afc7acef05bf55723f7b54586a72b 100644 (file)
--- a/dlg_wingui.c
+++ b/dlg_wingui.c
@@ -45,6 +45,8 @@ static int    driver_options_update(HWND hdlg, ConnInfo *ci, const char *);
 void
 SetDlgStuff(HWND hdlg, const ConnInfo *ci)
 {
+   char buff[MEDIUM_REGISTRY_LEN+1]; 
+
    /*
     * If driver attribute NOT present, then set the datasource name and
     * description
@@ -60,17 +62,35 @@ SetDlgStuff(HWND hdlg, const ConnInfo *ci)
    SetDlgItemText(hdlg, IDC_USER, ci->username);
    SetDlgItemText(hdlg, IDC_PASSWORD, ci->password);
    SetDlgItemText(hdlg, IDC_PORT, ci->port);
-    SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (LPARAM) ((LPSTR) "prefer" ));
-    SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (LPARAM) ((LPSTR) "allow" ));
-    SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (LPARAM) ((LPSTR) "require" ));
-    SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (LPARAM) ((LPSTR) "disable" ));
-    SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_SELECTSTRING, -1, (LPARAM) ((LPSTR) ci->sslmode ));
+
+   LoadString(GetWindowInstance(hdlg),IDS_SSLREQUEST_PREFER, buff, MEDIUM_REGISTRY_LEN);
+   SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (WPARAM) buff);
+   LoadString(GetWindowInstance(hdlg),IDS_SSLREQUEST_ALLOW, buff, MEDIUM_REGISTRY_LEN);
+   SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (WPARAM) buff);
+   LoadString(GetWindowInstance(hdlg),IDS_SSLREQUEST_REQUIRE, buff, MEDIUM_REGISTRY_LEN);
+   SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (WPARAM) buff);
+   LoadString(GetWindowInstance(hdlg),IDS_SSLREQUEST_DISABLE, buff, MEDIUM_REGISTRY_LEN);
+   SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (WPARAM) buff);\r
+    
+   if (!strcmp(ci->sslmode, "allow"))
+       LoadString(GetWindowInstance(hdlg), IDS_SSLREQUEST_ALLOW, buff, MEDIUM_REGISTRY_LEN);
+   else if (!strcmp(ci->sslmode, "require"))
+        LoadString(GetWindowInstance(hdlg), IDS_SSLREQUEST_REQUIRE, buff, MEDIUM_REGISTRY_LEN);
+    else if (!strcmp(ci->sslmode, "disable"))
+       LoadString(GetWindowInstance(hdlg), IDS_SSLREQUEST_DISABLE, buff, MEDIUM_REGISTRY_LEN);
+    else
+       LoadString(GetWindowInstance(hdlg), IDS_SSLREQUEST_PREFER, buff, MEDIUM_REGISTRY_LEN);
+
+   SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_SELECTSTRING, -1, (WPARAM) ((LPSTR) buff));
+
 }
 
 
 void
 GetDlgStuff(HWND hdlg, ConnInfo *ci)
 {
+   int sslposition;
+
    GetDlgItemText(hdlg, IDC_DESC, ci->desc, sizeof(ci->desc));
 
    GetDlgItemText(hdlg, IDC_DATABASE, ci->database, sizeof(ci->database));
@@ -78,7 +98,18 @@ GetDlgStuff(HWND hdlg, ConnInfo *ci)
    GetDlgItemText(hdlg, IDC_USER, ci->username, sizeof(ci->username));
    GetDlgItemText(hdlg, IDC_PASSWORD, ci->password, sizeof(ci->password));
    GetDlgItemText(hdlg, IDC_PORT, ci->port, sizeof(ci->port));
-    GetDlgItemText(hdlg, IDC_SSLMODE, ci->sslmode, sizeof(ci->sslmode));
+   sslposition = (int)(DWORD)SendMessage(GetDlgItem(hdlg, IDC_SSLMODE), CB_GETCURSEL, 0L, 0L);
+   switch(sslposition)
+   {
+       case 1: strcpy(ci->sslmode, "allow");
+               break;
+       case 2: strcpy(ci->sslmode, "require");
+               break;
+       case 3: strcpy(ci->sslmode, "disable");
+               break;
+       default: strcpy(ci->sslmode, "prefer");
+   }
+
 }
 
 

diff --git a/psqlodbc.rc b/psqlodbc.rc
index 79008dd75e437399a126e2ea42b4710598be7bba..fd917dbd561eeb2df033aa6a97053ce3d6679ad0 100644 (file)
--- a/psqlodbc.rc
+++ b/psqlodbc.rc
@@ -356,6 +356,10 @@ BEGIN
     IDS_ADVANCE_OPTION_DSN2 "\8d\82\93x\82È\90Ý\92è (%s \90Ý\92è2)"
     IDS_ADVANCE_OPTION_CON2 "\8d\82\93x\82È\90Ý\92è (\83R\83l\83N\83V\83\87\83\93\90Ý\92è2)"
     IDS_ADVANCE_CONNECTION  "\83R\83l\83N\83V\83\87\83\93"
+    IDS_SSLREQUEST_PREFER   "\97D\90æ"
+    IDS_SSLREQUEST_ALLOW    "\8dl\97¶"
+    IDS_SSLREQUEST_REQUIRE  "\95K\97v"
+    IDS_SSLREQUEST_DISABLE  "\96³\8cø"
 END
 
 #endif    // Japanese resources
@@ -666,6 +670,10 @@ BEGIN
     IDS_ADVANCE_OPTION_DSN2 "Advanced Options (%s) 2/2"
     IDS_ADVANCE_OPTION_CON2 "Advanced Options (Connection 2/2)"
     IDS_ADVANCE_CONNECTION  "Connection"
+    IDS_SSLREQUEST_PREFER   "prefer"
+    IDS_SSLREQUEST_ALLOW    "allow"
+    IDS_SSLREQUEST_REQUIRE  "require"
+    IDS_SSLREQUEST_DISABLE  "disable"
 END
 
 #endif    // English (U.S.) resources

diff --git a/resource.h b/resource.h
index ed349a7dbba3c4382c0d6b299b2a2495798e672e..e7f56a97b1822ef0c638233013d04e818899844d 100644 (file)
--- a/resource.h
+++ b/resource.h
@@ -13,6 +13,10 @@
 #define IDS_ADVANCE_OPTION_DSN2         7
 #define IDS_ADVANCE_OPTION_CON2         8
 #define IDS_ADVANCE_CONNECTION          9
+#define IDS_SSLREQUEST_PREFER           10
+#define IDS_SSLREQUEST_ALLOW            11
+#define IDS_SSLREQUEST_REQUIRE          12
+#define IDS_SSLREQUEST_DISABLE          13
 #define DLG_OPTIONS_DRV                 102
 #define DLG_OPTIONS_DS                  103
 #define DLG_OPTIONS_GLOBAL              104