feat: translate strings, append number of items on tab captions

Refs #1155

Author: ansgarbecker

source/usermanager.dfm

@@ -587,7 +587,7 @@ object UserManagerForm: TUserManagerForm
             'Roll=off')
           TabOrder = 0
           TitleCaptions.Strings = (
-            'Role'
+            'Role name'
             'Assigned')
           OnGetPickList = ValueListEditorRolesGetPickList
           OnSelectCell = ValueListEditorRolesSelectCell

source/usermanager.pas

@@ -37,16 +37,16 @@   TUser = class(TObject)
     Problem: TUserProblem;
     IsRole: Boolean;
     Roles: TStringList;
-    const
-      RoleNo: String = 'no';
-      RoleYes: String = 'yes';
-      RoleYesAdmin: String = 'yes, with admin';
     public
+      class var RoleNo: String;
+      class var RoleYes: String;
+      class var RoleYesAdmin: String;
       constructor Create;
-      destructor Destroy;
+      destructor Destroy; override;
       function HostRequiresNameResolve: Boolean;
       procedure ParseSettings(GrantOrCreate: String; Priv: TPrivObj);
       function IsUser: Boolean;
+      function AssignedRolesCount: Integer;
   end;
   PUser = ^TUser;
   TUserList = class(TObjectList<TUser>)
@@ -614,6 +614,8 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
   editCipher.Clear;
   editIssuer.Clear;
   editSubject.Clear;
+  tabPrivileges.Caption := _('Privileges');
+  tabRoles.Caption := _('Roles');
 
   if UserSelected then begin
     User := Sender.GetNodeData(Node);
@@ -819,6 +821,8 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
     editCipher.Text := User.Cipher;
     editIssuer.Text := User.Issuer;
     editSubject.Text := User.Subject;
+    tabPrivileges.Caption := _('Privileges') + ' (' + FPrivObjects.Count.ToString + ')';
+    tabRoles.Caption := _('Roles') + ' (' + User.AssignedRolesCount.ToString + ')';
 
 
     // Generate grant code for column privs by hand
@@ -1197,7 +1201,7 @@ procedure TUserManagerForm.menuItemRoleClick(Sender: TObject);
 
   // Add role
   RoleName := '';
-  if not InputQuery('Create role', 'Role name', RoleName) then
+  if not InputQuery(_('Create role'), _('Role name'), RoleName) then
     Exit;
 
   try
@@ -1726,6 +1730,7 @@ constructor TUser.Create;
 destructor TUser.Destroy;
 begin
   Roles.Free;
+  inherited;
 end;
 
 function TUser.HostRequiresNameResolve: Boolean;
@@ -1804,6 +1809,20 @@ function TUser.IsUser: Boolean;
 end;
 
 
+function TUser.AssignedRolesCount: Integer;
+var
+  i: Integer;
+  Val: String;
+begin
+  Result := 0;
+  for i:=0 to Roles.Count-1 do begin
+    Val := Roles.ValueFromIndex[i];
+    if (Val = RoleYes) or (Val = RoleYesAdmin) then
+      Inc(Result);
+  end;
+end;
+
+
 { TUserList }
 
 function TUserList.GetRoleNames: TStringList;
@@ -1872,4 +1891,10 @@ function TPrivComparer.Compare(const Left, Right: TPrivObj): Integer;
 end;
 
 
+initialization
+
+TUser.RoleNo := _('No');
+TUser.RoleYes := _('Yes');
+TUser.RoleYesAdmin := _('Yes, with admin option');
+
 end.