Admin UI: Use l10n translations everywhere

AdminUi/apps/admin_ui/lib/core/modals/add_quota_dialog.dart

@@ -103,7 +103,7 @@ class _AddQuotaDialogState extends State<_AddQuotaDialog> {
                 enabled: !_saving,
                 decoration: InputDecoration(
                   border: const OutlineInputBorder(),
-                  labelText: '${context.l10n.maxEntities('Amount')}*',
+                  labelText: '${context.l10n.maxEntities(context.l10n.amount)}*',
                   helperText: context.l10n.max_amount_message,
                 ),
                 inputFormatters: <TextInputFormatter>[FilteringTextInputFormatter.digitsOnly],

AdminUi/apps/admin_ui/lib/core/widgets/identities_data_table/identities_data_table.dart

@@ -37,7 +37,7 @@ class _IdentitiesDataTableState extends State<IdentitiesDataTable> {
       isVerticalScrollBarVisible: true,
       renderEmptyRowsInTheEnd: false,
       availableRowsPerPage: const [5, 10, 25, 50, 100],
-      empty: Text(context.l10n.noEntitiesFound('identities')),
+      empty: Text(context.l10n.noEntitiesFound(context.l10n.identities)),
       errorBuilder: (error) => Center(
         child: Column(
           mainAxisSize: MainAxisSize.min,
@@ -52,11 +52,11 @@ class _IdentitiesDataTableState extends State<IdentitiesDataTable> {
         DataColumn2(label: Text(context.l10n.address), size: ColumnSize.L, onSort: _sort),
         if (!widget.hideTierColumn) DataColumn2(label: Text(context.l10n.tier), size: ColumnSize.S),
         DataColumn2(label: Text(context.l10n.created_with_client), onSort: _sort),
-        DataColumn2(label: Text(context.l10n.numberOfEntities('Devices')), onSort: _sort),
+        DataColumn2(label: Text(context.l10n.numberOfEntities(context.l10n.devices)), onSort: _sort),
         DataColumn2(label: Text(context.l10n.createdAt), size: ColumnSize.S, onSort: _sort),
         DataColumn2(label: Text(context.l10n.last_login_at), size: ColumnSize.S, onSort: _sort),
-        DataColumn2(label: Text(context.l10n.entityVersion('Datawallet')), onSort: _sort),
-        DataColumn2(label: Text(context.l10n.entityVersion('Identity')), onSort: _sort),
+        DataColumn2(label: Text(context.l10n.entityVersion(context.l10n.datawallet)), onSort: _sort),
+        DataColumn2(label: Text(context.l10n.entityVersion(context.l10n.identity)), onSort: _sort),
       ],
     );
   }

AdminUi/apps/admin_ui/lib/core/widgets/identities_data_table/identities_filter.dart

@@ -71,7 +71,7 @@ class _IdentitiesFilterState extends State<IdentitiesFilter> {
               Gaps.w16,
               MultiSelectFilter(
                 label: context.l10n.tiers,
-                searchLabel: context.l10n.searchEntities('Tiers'),
+                searchLabel: context.l10n.searchEntities(context.l10n.tiers),
                 controller: _tierController,
                 onOptionSelected: (List<ValueItem<String>> selectedOptions) {
                   final selectedTiers = selectedOptions.map((item) => item.value!).toList();
@@ -83,7 +83,7 @@ class _IdentitiesFilterState extends State<IdentitiesFilter> {
             Gaps.w16,
             MultiSelectFilter(
               label: context.l10n.clients,
-              searchLabel: context.l10n.searchEntities('Clients'),
+              searchLabel: context.l10n.searchEntities(context.l10n.clients),
               controller: _clientController,
               onOptionSelected: (List<ValueItem<String>> selectedOptions) {
                 final selectedClients = selectedOptions.map((item) => item.value!).toList();
@@ -93,7 +93,7 @@ class _IdentitiesFilterState extends State<IdentitiesFilter> {
             ),
             Gaps.w16,
             NumberFilter(
-              label: context.l10n.numberOfEntities('Devices'),
+              label: context.l10n.numberOfEntities(context.l10n.devices),
               onNumberSelected: (FilterOperator operator, String enteredValue) {
                 final numberOfDevices = FilterOperatorValue(operator, enteredValue);
                 _filter = _filter.copyWith(numberOfDevices: numberOfDevices.value.isEmpty ? const Optional.absent() : Optional(numberOfDevices));
@@ -120,7 +120,7 @@ class _IdentitiesFilterState extends State<IdentitiesFilter> {
             ),
             Gaps.w16,
             NumberFilter(
-              label: context.l10n.entityVersion('Datawallet'),
+              label: context.l10n.entityVersion(context.l10n.datawallet),
               onNumberSelected: (FilterOperator operator, String enteredValue) {
                 final datawalletVersion = FilterOperatorValue(operator, enteredValue);
                 _filter =
@@ -130,7 +130,7 @@ class _IdentitiesFilterState extends State<IdentitiesFilter> {
             ),
             Gaps.w16,
             NumberFilter(
-              label: context.l10n.entityVersion('Identity'),
+              label: context.l10n.entityVersion(context.l10n.identity),
               onNumberSelected: (FilterOperator operator, String enteredValue) {
                 final identityVersion = FilterOperatorValue(operator, enteredValue);
                 _filter = _filter.copyWith(identityVersion: identityVersion.value.isEmpty ? const Optional.absent() : Optional(identityVersion));

AdminUi/apps/admin_ui/lib/core/widgets/quotas_button_group.dart

@@ -63,7 +63,7 @@ class _QuotasButtonGroupState extends State<QuotasButtonGroup> {
   Future<void> _removeSelectedQuotas() async {
     final confirmed = await showConfirmationDialog(
       context: context,
-      title: context.l10n.removeEntities('Quotas'),
+      title: context.l10n.removeEntities(context.l10n.quotas),
       message:
           '${context.l10n.deletion_of_quota_message} ${widget.identityAddress != null ? '${context.l10n.theIdentity} "${widget.identityAddress}"' : '${context.l10n.the_tier} "${widget.tierId}"'}?',
     );
@@ -75,7 +75,7 @@ class _QuotasButtonGroupState extends State<QuotasButtonGroup> {
       if (result.hasError && mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(context.l10n.errorOccurredWhileDeletingEntities('quota(s)')),
+            content: Text('${context.l10n.errorOccurredWhileDeletingEntities(context.l10n.quota_lc)}(s)'),
             showCloseIcon: true,
           ),
         );
@@ -89,7 +89,7 @@ class _QuotasButtonGroupState extends State<QuotasButtonGroup> {
     if (mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text(context.l10n.selectedEntityWasRemoved('quota(s)')),
+          content: Text('${context.l10n.selectedEntityWasRemoved(context.l10n.quota_lc)}(s)'),
           showCloseIcon: true,
         ),
       );

AdminUi/apps/admin_ui/lib/home/clients_overview/clients_filter.dart

@@ -142,7 +142,7 @@ class _ClientsFilterRowState extends State<ClientsFilterRow> {
             Gaps.w16,
             MultiSelectFilter(
               label: context.l10n.default_tier,
-              searchLabel: context.l10n.searchEntities('Tiers'),
+              searchLabel: context.l10n.searchEntities(context.l10n.tiers),
               controller: _tierController,
               onOptionSelected: (List<ValueItem<dynamic>> selectedOptions) {
                 filter = filter.copyWith(
@@ -154,7 +154,7 @@ class _ClientsFilterRowState extends State<ClientsFilterRow> {
             ),
             Gaps.w16,
             NumberFilter(
-              label: context.l10n.numberOfEntities('Identities'),
+              label: context.l10n.numberOfEntities(context.l10n.identities),
               onNumberSelected: (FilterOperator operator, String enteredValue) {
                 filter = filter.copyWith(
                   numberOfIdentities: enteredValue.isEmpty ? const Optional.absent() : Optional((operator, int.parse(enteredValue))),

AdminUi/apps/admin_ui/lib/home/clients_overview/clients_overview.dart

@@ -33,7 +33,7 @@ class _ClientsOverviewState extends State<ClientsOverview> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text(context.l10n.listOfExistingEntities('Clients'))),
+      appBar: AppBar(title: Text(context.l10n.listOfExistingEntities(context.l10n.clients))),
       body: Card(
         child: Padding(
           padding: const EdgeInsets.all(8),
@@ -68,7 +68,7 @@ class _ClientsOverviewState extends State<ClientsOverview> {
               Expanded(
                 child: DataTable2(
                   isVerticalScrollBarVisible: true,
-                  empty: Text(context.l10n.noEntitiesFound('clients')),
+                  empty: Text(context.l10n.noEntitiesFound(context.l10n.clients_lc)),
                   onSelectAll: (selected) {
                     if (selected == null) return;
 
@@ -84,7 +84,7 @@ class _ClientsOverviewState extends State<ClientsOverview> {
                     DataColumn2(label: Text(context.l10n.client_ID), size: ColumnSize.L),
                     DataColumn2(label: Text(context.l10n.display_name), size: ColumnSize.L),
                     DataColumn2(label: Text(context.l10n.default_tier)),
-                    DataColumn2(label: Text(context.l10n.numberOfEntities('Identities')), size: ColumnSize.L),
+                    DataColumn2(label: Text(context.l10n.numberOfEntities(context.l10n.identities)), size: ColumnSize.L),
                     DataColumn2(label: Text(context.l10n.createdAt)),
                     const DataColumn2(label: Text(''), size: ColumnSize.L),
                   ],
@@ -153,7 +153,7 @@ class _ClientsOverviewState extends State<ClientsOverview> {
   Future<void> _removeSelectedClients() async {
     final confirmed = await showConfirmationDialog(
       context: context,
-      title: context.l10n.removeEntities('Clients'),
+      title: context.l10n.removeEntities(context.l10n.clients),
       message: context.l10n.remove_clients_message,
     );
 
@@ -164,7 +164,7 @@ class _ClientsOverviewState extends State<ClientsOverview> {
       if (result.hasError && mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(context.l10n.errorOccurredWhileDeletingEntities('client(s)')),
+            content: Text('${context.l10n.errorOccurredWhileDeletingEntities(context.l10n.client_lc)}(s)'),
             showCloseIcon: true,
           ),
         );
@@ -179,7 +179,7 @@ class _ClientsOverviewState extends State<ClientsOverview> {
     if (mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text(context.l10n.selectedEntityWasRemoved('clients')),
+          content: Text(context.l10n.selectedEntityWasRemoved(context.l10n.clients_lc)),
           showCloseIcon: true,
         ),
       );

AdminUi/apps/admin_ui/lib/home/clients_overview/modals/create_client_dialog.dart

@@ -63,7 +63,7 @@ class _CreateClientDialogState extends State<_CreateClientDialog> {
     return PopScope(
       canPop: !_saving,
       child: AlertDialog(
-        title: Text(context.l10n.createEntity('Client'), textAlign: TextAlign.center),
+        title: Text(context.l10n.createEntity(context.l10n.client), textAlign: TextAlign.center),
         content: SizedBox(
           width: 500,
           child: Column(
@@ -130,7 +130,7 @@ class _CreateClientDialogState extends State<_CreateClientDialog> {
                 readOnly: _saveSucceeded,
                 decoration: InputDecoration(
                   border: const OutlineInputBorder(),
-                  labelText: context.l10n.maxEntities('Identities'),
+                  labelText: context.l10n.maxEntities(context.l10n.identities),
                   helperText: '${context.l10n.max_identities_message}'
                       '\n${context.l10n.no_identity_limit_message}',
                 ),

AdminUi/apps/admin_ui/lib/home/identities_overview/identities_overview.dart

@@ -35,7 +35,7 @@ class _IdentitiesOverviewState extends State<IdentitiesOverview> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text(context.l10n.listOfExistingEntities('Identities'))),
+      appBar: AppBar(title: Text(context.l10n.listOfExistingEntities(context.l10n.identities))),
       body: Card(
         child: Padding(
           padding: const EdgeInsets.all(8),

AdminUi/apps/admin_ui/lib/home/identity_details/identity_quotas_table/identity_quotas_table.dart

@@ -27,7 +27,7 @@ class IdentityQuotaListState extends State<IdentityQuotaList> {
       data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
       child: ExpansionTile(
         title: Text(context.l10n.quotas),
-        subtitle: Text(context.l10n.viewAndAssignQuotasForEntity('identity')),
+        subtitle: Text(context.l10n.viewAndAssignQuotasForEntity(context.l10n.identity)),
         children: [
           Card(
             child: Column(
@@ -45,7 +45,7 @@ class IdentityQuotaListState extends State<IdentityQuotaList> {
                     columns: [
                       DataColumn2(label: Text(context.l10n.metric)),
                       DataColumn2(label: Text(context.l10n.source), size: ColumnSize.S),
-                      DataColumn2(label: Text(context.l10n.usage), size: ColumnSize.L),
+                      DataColumn2(label: Text('${context.l10n.usage} (${context.l10n.used}/${context.l10n.max})'), size: ColumnSize.L),
                       DataColumn2(label: Text(context.l10n.period), size: ColumnSize.S),
                       const DataColumn2(label: Text(''), size: ColumnSize.S),
                     ],

AdminUi/apps/admin_ui/lib/home/tier_detail/tier_detail.dart

@@ -126,7 +126,9 @@ class _QuotaListState extends State<_QuotaList> {
       data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
       child: ExpansionTile(
         title: Text(context.l10n.quotas),
-        subtitle: isQueuedForDeletionTier ? Text(context.l10n.view_quotas_for_the_tier) : Text(context.l10n.viewAndAssignQuotasForEntity('tier')),
+        subtitle: isQueuedForDeletionTier
+            ? Text(context.l10n.view_quotas_for_the_tier)
+            : Text(context.l10n.viewAndAssignQuotasForEntity(context.l10n.tier_lc)),
         children: [
           Card(
             child: Column(

AdminUi/apps/admin_ui/lib/home/tiers_overview/modals/show_create_tier_dialog.dart

@@ -44,7 +44,7 @@ class _CreateTierDialogState extends State<_CreateTierDialog> {
     return PopScope(
       canPop: !_isLoading,
       child: AlertDialog(
-        title: Text(context.l10n.createEntity('Tier')),
+        title: Text(context.l10n.createEntity(context.l10n.tier)),
         content: _isLoading
             ? const Padding(
                 padding: EdgeInsets.all(16),
@@ -118,13 +118,13 @@ class _CreateTierDialogState extends State<_CreateTierDialog> {
       });
 
   void _showSuccessSnackbar() {
-    const snackBar = SnackBar(
+    final snackBar = SnackBar(
       content: Text(
-        'Tier was created successfully.',
-        style: TextStyle(color: Colors.white),
+        context.l10n.tier_created_successfully_message,
+        style: const TextStyle(color: Colors.white),
       ),
       backgroundColor: Colors.green,
-      duration: Duration(seconds: 3),
+      duration: const Duration(seconds: 3),
       showCloseIcon: true,
     );
     ScaffoldMessenger.of(context).showSnackBar(snackBar);

AdminUi/apps/admin_ui/lib/home/tiers_overview/tiers_overview.dart

@@ -55,7 +55,7 @@ class _TiersOverviewState extends State<TiersOverview> {
                     style: TextStyle(color: Theme.of(context).colorScheme.onPrimary, fontSize: 30),
                   ),
                   Text(
-                    context.l10n.listOfExistingEntities('Tiers'),
+                    context.l10n.listOfExistingEntities(context.l10n.tiers),
                     style: TextStyle(color: Theme.of(context).colorScheme.onPrimary, fontSize: 13),
                   ),
                 ],
@@ -88,10 +88,10 @@ class _TiersOverviewState extends State<TiersOverview> {
                   child: DataTable2(
                     isVerticalScrollBarVisible: true,
                     showCheckboxColumn: false,
-                    empty: Text(context.l10n.noEntitiesFound('tiers')),
+                    empty: Text(context.l10n.noEntitiesFound(context.l10n.tiers)),
                     columns: [
                       DataColumn2(label: Text(context.l10n.name), size: ColumnSize.L),
-                      DataColumn2(label: Text(context.l10n.numberOfEntities('Identities')), size: ColumnSize.L),
+                      DataColumn2(label: Text(context.l10n.numberOfEntities(context.l10n.identities)), size: ColumnSize.L),
                     ],
                     rows: _tiers!
                         .map(

AdminUi/apps/admin_ui/lib/l10n/app_en.arb

@@ -3,12 +3,16 @@
   "add": "Add",
   "addQuota": "Add Quota",
   "address": "Address",
+  "amount": "Amount",
   "cancel": "Cancel",
   "changeClientSecret": "Change Client Secret",
   "changeTier": "Change Tier",
   "client_ID": "Client ID",
   "client_secret": "Client Secret",
+  "client": "Client",
   "clients": "Clients",
+  "clients_lc": "clients",
+  "client_lc": "client",
   "close": "Close",
   "confirm": "Confirm",
   "copy_public_key": "Copy public key",
@@ -18,11 +22,14 @@
   "created_with_client": "Created with Client",
   "dark": "Dark",
   "day": "Day",
+  "datawallet": "Datawallet",
   "default_tier": "Default Tier",
+  "devices": "Devices",
   "display_name": "Display Name",
   "hour": "Hour",
   "id": "ID",
   "identities": "Identities",
+  "identity": "Identity",
   "individual": "Individual",
   "last_login_at": "Last Login at",
   "light": "Light",
@@ -42,8 +49,13 @@
   "the_tier": "the tier",
   "theme": "Theme",
   "tier": "Tier",
+  "tier_lc": "tier",
   "tiers": "Tiers",
-  "usage": "Usage (Used/Max)",
+  "tiers_lc": "tiers",
+  "usage": "Usage",
+  "used": "Used",
+  "quotas": "Quotas",
+  "quota_lc": "quota",
   "week": "Week",
   "year": "Year",
   "yes": "Yes",