add support Ukrainian and Russian languages

Author: yur4al

setup/DirectPrintServer.iss

@@ -1,4 +1,4 @@
-; Script generated by the Inno Setup Script Wizard.
+; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Direct Print Server"
@@ -25,24 +25,54 @@ OutputDir=Output
 OutputBaseFilename=DirectPrintServerSetup
 Compression=lzma
 SolidCompression=yes
+DisableWelcomePage=no
 
 [Languages]
 Name: "en"; MessagesFile: "compiler:Default.isl"
 Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"
 Name: "uk"; MessagesFile: "compiler:Languages\Ukrainian.isl"
 
 [CustomMessages]
-en.ServiceAccountInformation=Log on Service as:
-ru.ServiceAccountInformation=Çàïóñêàòü ñåðâèñ îò èìåíè: 
-uk.ServiceAccountInformation=Log on Service as:
+en.InstallingService=Installing service "Direct Print Service"
+en.UninstallingService=Uninstalling service "Direct Print Service"
+en.ServiceAccountInformation=Log on "Direct Print Service" as:
+en.EnterAccountInformation=Please enter account information
+en.LocalSystemAccount=Local system account (shared printers not available)
+en.User=User
+en.Password=Password
+en.ConfirmPassword=Confirm password
+en.PleaseEnterUser=Please enter User
+en.PasswordNotMatch=Password does not match the confirm password
+
+ru.InstallingService=Установка службы "Direct Print Service"
+ru.UninstallingService=Удаление службы "Direct Print Service"
+ru.ServiceAccountInformation=Запускать сервис "Direct Print Service" от имени:
+ru.EnterAccountInformation=Пожалуйста, введите данные учетной записи
+ru.LocalSystemAccount=С системной учетной записью (общие принтеры не доступны)
+ru.User=Пользователь
+ru.Password=Пароль
+ru.ConfirmPassword=Подтвердите пароль
+ru.PleaseEnterUser=Введите имя пользователя
+ru.PasswordNotMatch=Несовпадение паролей
+
+uk.InstallingService=Встановлення служби "Direct Print Service"
+uk.UninstallingService=Видалення служби "Direct Print Service"
+uk.ServiceAccountInformation=Запускати сервіс "Direct Print Service" від імені:
+uk.EnterAccountInformation=Будь ласка, введіть дані облікового запису
+uk.LocalSystemAccount=З системним обліковим записом (загальні принтери не доступні)
+uk.User=Користувач
+uk.Password=Пароль
+uk.ConfirmPassword=Підтвердіть пароль
+uk.PleaseEnterUser=Введіть ім'я користувача
+uk.PasswordNotMatch=Неспівпадіння паролів
 
 [Files]
 Source: "Files\prunsrv.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Files\gsdll32.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Files\gswin32c.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "Files\install.cmd"; DestDir: "{app}"; Flags: ignoreversion   
+Source: "Files\install.cmd"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Files\install_ex.cmd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "Files\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion  
+Source: "Files\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Files\PrintServer.jar"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Files\prunmgr.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Files\prunsrv.exe"; DestDir: "{app}"; Flags: ignoreversion
@@ -53,22 +83,21 @@ Source: "Files\uninstall.cmd"; DestDir: "{app}"; Flags: ignoreversion
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 
 [Run]
-Filename: "{app}\install.cmd"; Parameters: "{code:GetUserName} {code:GetPassword}"; WorkingDir: "{app}"; Flags: runhidden; StatusMsg: "Installing service"
+Filename: "{app}\install.cmd"; Parameters: "{code:GetUserName} {code:GetPassword}"; WorkingDir: "{app}"; Flags: runhidden; StatusMsg: "{cm:InstallingService}"
 
-[UninstallRun]     
-Filename: "{app}\uninstall.cmd"; WorkingDir: "{app}"; Flags: runhidden; StatusMsg: "Uninstalling service"
+[UninstallRun]
+Filename: "{app}\uninstall.cmd"; WorkingDir: "{app}"; Flags: runhidden; StatusMsg: "{cm:UninstallingService}"
 
 [Code]
 var
   Page: TInputQueryWizardPage;
   LocalSystemAccountCheckBox: TNewCheckBox;
-  LabelFolder: TLabel;  
-//  MainPage: TWizardPage;  
-  UserEdit: TNewEdit;      
-  PassEdit: TNewEdit;      
-  ConfPassEdit: TNewEdit; 
-  UserStaticText: TNewStaticText;        
-  PassStaticText: TNewStaticText;      
+  LabelFolder: TLabel;
+  UserEdit: TNewEdit;
+  PassEdit: TNewEdit;
+  ConfPassEdit: TNewEdit;
+  UserStaticText: TNewStaticText;
+  PassStaticText: TNewStaticText;
   ConfPassStaticText: TNewStaticText;
 
 procedure LocalSystemAccountCheckBoxOnClick(Sender: TObject);
@@ -93,34 +122,33 @@ end;
 
 procedure InitializeWizard;
 begin
-  Page := CreateInputQueryPage(wpWelcome, //wpSelectComponents,
-    CustomMessage('ServiceAccountInformation'), 'Please enter account information',
-    '');
+   Page := CreateInputQueryPage(wpSelectComponents, //,wpWelcome
+   CustomMessage('ServiceAccountInformation'), CustomMessage('EnterAccountInformation'), '');
 
   LocalSystemAccountCheckBox := TNewCheckBox.Create(Page);
   LocalSystemAccountCheckBox.Parent := Page.Surface;
-  LocalSystemAccountCheckBox.Width := ScaleX(200);
-  LocalSystemAccountCheckBox.Caption := 'Local system account'; 
+  LocalSystemAccountCheckBox.Width := Page.SurfaceWidth - ScaleX(8);
+  LocalSystemAccountCheckBox.Caption := CustomMessage('LocalSystemAccount');
   LocalSystemAccountCheckBox.Checked := true;
   LocalSystemAccountCheckBox.OnClick := @LocalSystemAccountCheckBoxOnClick;
-  
+
   UserStaticText := TNewStaticText.Create(Page);
   UserStaticText.Top := LocalSystemAccountCheckBox.Top + LocalSystemAccountCheckBox.Height + ScaleY(12);
-  UserStaticText.Caption := 'User';
+  UserStaticText.Caption := CustomMessage('User');
   UserStaticText.AutoSize := True;
-  UserStaticText.Parent := Page.Surface; 
+  UserStaticText.Parent := Page.Surface;
   UserStaticText.Enabled := false;
 
   UserEdit := TNewEdit.Create(Page);
   UserEdit.Parent := Page.Surface;
   UserEdit.Top := LocalSystemAccountCheckBox.Top + LocalSystemAccountCheckBox.Height + ScaleY(8);
-  UserEdit.Left := ScaleX(100);
-  UserEdit.Width := ScaleX(150);
+  UserEdit.Left := ScaleX(130);
+  UserEdit.Width := ScaleX(200);
   UserEdit.Enabled := false;
 
   PassStaticText := TNewStaticText.Create(Page);
   PassStaticText.Top := UserEdit.Top + UserEdit.Height + ScaleY(12);
-  PassStaticText.Caption := 'Password';
+  PassStaticText.Caption := CustomMessage('Password');
   PassStaticText.AutoSize := True;
   PassStaticText.Parent := Page.Surface;
   PassStaticText.Enabled := false;
@@ -129,13 +157,13 @@ begin
   PassEdit.Parent := Page.Surface;
   PassEdit.Top := UserEdit.Top + UserEdit.Height + ScaleY(8);
   PassEdit.Left := UserEdit.Left;
-  PassEdit.Width := UserEdit.Width; 
+  PassEdit.Width := UserEdit.Width;
   PassEdit.PasswordChar := '*';
   PassEdit.Enabled := false;
 
   ConfPassStaticText := TNewStaticText.Create(Page);
   ConfPassStaticText.Top := PassEdit.Top + PassEdit.Height + ScaleY(12);
-  ConfPassStaticText.Caption := 'Confirm password';
+  ConfPassStaticText.Caption := CustomMessage('ConfirmPassword');
   ConfPassStaticText.AutoSize := True;
   ConfPassStaticText.Parent := Page.Surface;
   ConfPassStaticText.Enabled := false;
@@ -144,38 +172,41 @@ begin
   ConfPassEdit.Parent := Page.Surface;
   ConfPassEdit.Top := PassEdit.Top + PassEdit.Height + ScaleY(8);
   ConfPassEdit.Left := UserEdit.Left;
-  ConfPassEdit.Width := UserEdit.Width; 
+  ConfPassEdit.Width := UserEdit.Width;
   ConfPassEdit.PasswordChar := '*';
   ConfPassEdit.Enabled := false;
 end;
 
 function NextButtonClick(CurPageID: Integer): Boolean;
 var
   ResultCode: Integer;
-begin                         
+begin 
   Result := true;
-  Log('NextButtonClick(' + IntToStr(CurPageID) + ') called');
+//  Log('NextButtonClick(' + IntToStr(CurPageID) + ') called');
   case CurPageID of
     Page.ID: begin
       if not LocalSystemAccountCheckBox.Checked then begin
-        if UserEdit.Text = '' then begin          
+        if UserEdit.Text = '' then begin
           Result := false;
-          MsgBox('Pleas enter User', mbInformation, MB_OK);
-          exit; 
+          MsgBox(CustomMessage('PleaseEnterUser'), mbInformation, MB_OK);
+          exit;
         end;
         if not (ConfPassEdit.Text = PassEdit.Text) then begin
-          Result := false; 
-          MsgBox('Password does not match the confirm password', mbInformation, MB_OK);
-          exit; 
+          Result := false;
+          MsgBox(CustomMessage('PasswordNotMatch'), mbInformation, MB_OK);
+          exit;
         end;
-      end; 
+      end;
     end;
   end;
 end;
 
 function GetUserName(Param: String): string;
 begin
-  result := '.\' + UserEdit.Text;
+  if not (UserEdit.Text = '') then
+    result := '.\' + UserEdit.Text
+  else
+    result := '';
 end;
 
 function GetPassword(Param: String): string;
@@ -194,6 +225,6 @@ begin
 //        mres := MsgBox('Do you want to delete saved files?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2)
 //        if mres = IDYES then
         DelTree(ExpandConstant('{userappdata}\DirectPrintServiceLogs'), True, True, True);
-      end;  
+      end;
   end;
 end;