openstack/manila-ui
Code Issues Proposed changes

Merge "Remove unicode prefix from code"

Browse Source
This commit is contained in:
Zuul
2025-08-04 20:18:48 +00:00
committed by Gerrit Code Review
parent 08ac2184c2 e150e2aafd
commit 9b8407a30a
17 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manila_ui/dashboards/admin/security_services/tables.py
View File

@@ -23,16 +23,16 @@ class DeleteSecurityService(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Security Service",
u"Delete Security Services",
"Delete Security Service",
"Delete Security Services",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Security Service",
u"Deleted Security Services",
"Deleted Security Service",
"Deleted Security Services",
count
)

16
manila_ui/dashboards/admin/share_group_snapshots/tables.py
View File

@@ -35,16 +35,16 @@ class DeleteShareGroupSnapshot(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Group Snapshot",
u"Delete Share Group Snapshots",
"Delete Share Group Snapshot",
"Delete Share Group Snapshots",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Group Snapshot",
u"Deleted Share Group Snapshots",
"Deleted Share Group Snapshot",
"Deleted Share Group Snapshots",
count
)
@@ -94,9 +94,9 @@ class ShareGroupSnapshotsTable(tables.DataTable):
)
STATUS_DISPLAY_CHOICES = (
("available",
pgettext_lazy("Current status of snapshot", u"Available")),
("creating", pgettext_lazy("Current status of snapshot", u"Creating")),
("error", pgettext_lazy("Current status of snapshot", u"Error")),
pgettext_lazy("Current status of snapshot", "Available")),
("creating", pgettext_lazy("Current status of snapshot", "Creating")),
("error", pgettext_lazy("Current status of snapshot", "Error")),
)
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
@@ -107,7 +107,7 @@ class ShareGroupSnapshotsTable(tables.DataTable):
truncate=40)
created_at = tables.Column(
"created_at",
verbose_name=_("Created at"),
verbose_name=_("Created At"),
filters=(
filters.parse_isotime,
))

8
manila_ui/dashboards/admin/share_group_types/tables.py
View File

@@ -32,16 +32,16 @@ class DeleteShareGroupType(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Group Type",
u"Delete Share Group Types",
"Delete Share Group Type",
"Delete Share Group Types",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Group Type",
u"Deleted Share Group Types",
"Deleted Share Group Type",
"Deleted Share Group Types",
count
)

18
manila_ui/dashboards/admin/share_groups/tables.py
View File

@@ -26,16 +26,16 @@ class DeleteShareGroup(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Group",
u"Delete Share Groups",
"Delete Share Group",
"Delete Share Groups",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Group",
u"Deleted Share Groups",
"Deleted Share Group",
"Deleted Share Groups",
count
)
@@ -76,11 +76,11 @@ class ShareGroupsTable(tables.DataTable):
("error_deleting", False),
)
STATUS_DISPLAY_CHOICES = (
("available", u"Available"),
("creating", u"Creating"),
("deleting", u"Deleting"),
("error", u"Error"),
("error_deleting", u"Error deleting"),
("available", "Available"),
("creating", "Creating"),
("deleting", "Deleting"),
("error", "Error"),
("error_deleting", "Error deleting"),
)
name = tables.Column(
"name",

12
manila_ui/dashboards/admin/share_instances/tables.py
View File

@@ -24,11 +24,11 @@ class ShareInstancesTable(tables.DataTable):
("error_deleting", False),
)
STATUS_DISPLAY_CHOICES = (
("available", u"Available"),
("creating", u"Creating"),
("deleting", u"Deleting"),
("error", u"Error"),
("error_deleting", u"Error deleting"),
("available", "Available"),
("creating", "Creating"),
("deleting", "Deleting"),
("error", "Error"),
("error_deleting", "Error deleting"),
)
uuid = tables.Column(
"id", verbose_name=_("ID"),
@@ -78,7 +78,7 @@ class ShareInstancesTable(tables.DataTable):
link=get_share_network_link)
share_server_id = tables.Column(
"share_server_id",
verbose_name=_("Share Server Id"),
verbose_name=_("Share Server ID"),
link=get_share_server_link)
share_id = tables.Column(
"share_id",

16
manila_ui/dashboards/admin/share_servers/tables.py
View File

@@ -26,16 +26,16 @@ class DeleteShareServer(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Server",
u"Delete Share Server",
"Delete Share Server",
"Delete Share Server",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Server",
u"Deleted Share Server",
"Deleted Share Server",
"Deleted Share Server",
count
)
@@ -69,12 +69,12 @@ class ShareServersTable(tables.DataTable):
("error", False),
)
STATUS_DISPLAY_CHOICES = (
("in-use", pgettext_lazy("Current status of share server", u"In-use")),
("active", pgettext_lazy("Current status of share server", u"Active")),
("in-use", pgettext_lazy("Current status of share server", "In-use")),
("active", pgettext_lazy("Current status of share server", "Active")),
("creating", pgettext_lazy("Current status of share server",
u"Creating")),
"Creating")),
("error", pgettext_lazy("Current status of share server",
u"Error")),
"Error")),
)
uid = tables.Column(
"id", verbose_name=_("Id"),

16
manila_ui/dashboards/admin/share_snapshots/tables.py
View File

@@ -38,16 +38,16 @@ class DeleteShareSnapshot(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Snapshot",
u"Delete Snapshots",
"Delete Snapshot",
"Delete Snapshots",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Snapshot",
u"Deleted Snapshots",
"Deleted Snapshot",
"Deleted Snapshots",
count
)
@@ -82,11 +82,11 @@ class ShareSnapshotsTable(tables.DataTable):
("error", False),
)
STATUS_DISPLAY_CHOICES = (
("in-use", pgettext_lazy("Current status of snapshot", u"In-use")),
("in-use", pgettext_lazy("Current status of snapshot", "In-use")),
("available",
pgettext_lazy("Current status of snapshot", u"Available")),
("creating", pgettext_lazy("Current status of snapshot", u"Creating")),
("error", pgettext_lazy("Current status of snapshot", u"Error")),
pgettext_lazy("Current status of snapshot", "Available")),
("creating", pgettext_lazy("Current status of snapshot", "Creating")),
("error", pgettext_lazy("Current status of snapshot", "Error")),
)
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),

8
manila_ui/dashboards/admin/share_types/tables.py
View File

@@ -33,16 +33,16 @@ class DeleteShareType(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Type",
u"Delete Share Types",
"Delete Share Type",
"Delete Share Types",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Type",
u"Deleted Share Types",
"Deleted Share Type",
"Deleted Share Types",
count
)

8
manila_ui/dashboards/admin/shares/replicas/tables.py
View File

@@ -93,16 +93,16 @@ class DeleteReplica(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Replica",
u"Delete Replicas",
"Delete Replica",
"Delete Replicas",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Replica",
u"Deleted Replicas",
"Deleted Replica",
"Deleted Replicas",
count
)

8
manila_ui/dashboards/project/security_services/tables.py
View File

@@ -34,16 +34,16 @@ class Delete(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Security Service",
u"Delete Security Services",
"Delete Security Service",
"Delete Security Services",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Security Service",
u"Deleted Security Services",
"Deleted Security Service",
"Deleted Security Services",
count
)

14
manila_ui/dashboards/project/share_group_snapshots/tables.py
View File

@@ -75,16 +75,16 @@ class DeleteShareGroupSnapshot(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Group Snapshot",
u"Delete Share Group Snapshots",
"Delete Share Group Snapshot",
"Delete Share Group Snapshots",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Group Snapshot",
u"Deleted Share Group Snapshots",
"Deleted Share Group Snapshot",
"Deleted Share Group Snapshots",
count
)
@@ -124,9 +124,9 @@ class ShareGroupSnapshotsTable(tables.DataTable):
)
STATUS_DISPLAY_CHOICES = (
("available",
pgettext_lazy("Current status of snapshot", u"Available")),
("creating", pgettext_lazy("Current status of snapshot", u"Creating")),
("error", pgettext_lazy("Current status of snapshot", u"Error")),
pgettext_lazy("Current status of snapshot", "Available")),
("creating", pgettext_lazy("Current status of snapshot", "Creating")),
("error", pgettext_lazy("Current status of snapshot", "Error")),
)
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),

18
manila_ui/dashboards/project/share_groups/tables.py
View File

@@ -37,16 +37,16 @@ class DeleteShareGroup(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Group",
u"Delete Share Groups",
"Delete Share Group",
"Delete Share Groups",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Group",
u"Deleted Share Groups",
"Deleted Share Group",
"Deleted Share Groups",
count
)
@@ -109,11 +109,11 @@ class ShareGroupsTable(tables.DataTable):
("error_deleting", False),
)
STATUS_DISPLAY_CHOICES = (
("available", u"Available"),
("creating", u"Creating"),
("deleting", u"Deleting"),
("error", u"Error"),
("error_deleting", u"Error deleting"),
("available", "Available"),
("creating", "Creating"),
("deleting", "Deleting"),
("error", "Error"),
("error_deleting", "Error deleting"),
)
name = tables.Column(
"name",

14
manila_ui/dashboards/project/share_networks/tables.py
View File

@@ -42,16 +42,16 @@ class Delete(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Network",
u"Delete Share Networks",
"Delete Share Network",
"Delete Share Networks",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Network",
u"Deleted Share Networks",
"Deleted Share Network",
"Deleted Share Networks",
count
)
@@ -110,10 +110,10 @@ class ShareNetworksTable(tables.DataTable):
)
STATUS_DISPLAY_CHOICES = (
("ACTIVE", pgettext_lazy("Current status of share network",
u"Active")),
"Active")),
("INACTIVE", pgettext_lazy("Current status of share network",
u"Inactive")),
("ERROR", pgettext_lazy("Current status of share network", u"Error")),
"Inactive")),
("ERROR", pgettext_lazy("Current status of share network", "Error")),
)
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),

24
manila_ui/dashboards/project/share_snapshots/tables.py
View File

@@ -91,16 +91,16 @@ class DeleteShareSnapshot(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Snapshot",
u"Delete Share Snapshots",
"Delete Share Snapshot",
"Delete Share Snapshots",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Snapshot",
u"Deleted Share Snapshots",
"Deleted Share Snapshot",
"Deleted Share Snapshots",
count
)
@@ -191,16 +191,16 @@ class DeleteShareSnapshotRule(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share Snapshot Rule",
u"Delete Share Snapshot Rules",
"Delete Share Snapshot Rule",
"Delete Share Snapshot Rules",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share Snapshot Rule",
u"Deleted Share Snapshot Rules",
"Deleted Share Snapshot Rule",
"Deleted Share Snapshot Rules",
count
)
@@ -256,11 +256,11 @@ class ShareSnapshotsTable(tables.DataTable):
("error", False),
)
STATUS_DISPLAY_CHOICES = (
("in-use", pgettext_lazy("Current status of snapshot", u"In-use")),
("in-use", pgettext_lazy("Current status of snapshot", "In-use")),
("available",
pgettext_lazy("Current status of snapshot", u"Available")),
("creating", pgettext_lazy("Current status of snapshot", u"Creating")),
("error", pgettext_lazy("Current status of snapshot", u"Error")),
pgettext_lazy("Current status of snapshot", "Available")),
("creating", pgettext_lazy("Current status of snapshot", "Creating")),
("error", pgettext_lazy("Current status of snapshot", "Error")),
)
name = tables.Column(
"name",

18
manila_ui/dashboards/project/shares/replicas/tables.py
View File

@@ -80,16 +80,16 @@ class DeleteReplica(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Replica",
u"Delete Replicas",
"Delete Replica",
"Delete Replicas",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Replica",
u"Deleted Replicas",
"Deleted Replica",
"Deleted Replicas",
count
)
@@ -140,10 +140,10 @@ class ReplicasTable(tables.DataTable):
)
STATUS_DISPLAY_CHOICES = (
("available",
pgettext_lazy("Current status of replica", u"Available")),
("creating", pgettext_lazy("Current status of replica", u"Creating")),
("deleting", pgettext_lazy("Current status of replica", u"Deleting")),
("error", pgettext_lazy("Current status of replica", u"Error")),
pgettext_lazy("Current status of replica", "Available")),
("creating", pgettext_lazy("Current status of replica", "Creating")),
("deleting", pgettext_lazy("Current status of replica", "Deleting")),
("error", pgettext_lazy("Current status of replica", "Error")),
)
id = tables.Column(
"id",
@@ -152,7 +152,7 @@ class ReplicasTable(tables.DataTable):
)
availability_zone = tables.Column(
"availability_zone", verbose_name=_("Availability zone"))
"availability_zone", verbose_name=_("Availability Zone"))
status = tables.Column(
"status",

52
manila_ui/dashboards/project/shares/tables.py
View File

@@ -41,16 +41,16 @@ class DeleteShare(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Share",
u"Delete Shares",
"Delete Share",
"Delete Shares",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Share",
u"Deleted Shares",
"Deleted Share",
"Deleted Shares",
count
)
@@ -218,33 +218,33 @@ class SharesTableBase(tables.DataTable):
("reverting_error", False),
)
STATUS_DISPLAY_CHOICES = (
("available", pgettext_lazy("Current status of share", u"Available")),
("AVAILABLE", pgettext_lazy("Current status of share", u"Available")),
("creating", pgettext_lazy("Current status of share", u"Creating")),
("CREATING", pgettext_lazy("Current status of share", u"Creating")),
("deleting", pgettext_lazy("Current status of share", u"Deleting")),
("DELETING", pgettext_lazy("Current status of share", u"Deleting")),
("migrating", pgettext_lazy("Current status of share", u"Migrating")),
("available", pgettext_lazy("Current status of share", "Available")),
("AVAILABLE", pgettext_lazy("Current status of share", "Available")),
("creating", pgettext_lazy("Current status of share", "Creating")),
("CREATING", pgettext_lazy("Current status of share", "Creating")),
("deleting", pgettext_lazy("Current status of share", "Deleting")),
("DELETING", pgettext_lazy("Current status of share", "Deleting")),
("migrating", pgettext_lazy("Current status of share", "Migrating")),
("migrating_to", pgettext_lazy("Current status of share",
u"Migrating to")),
("error", pgettext_lazy("Current status of share", u"Error")),
("ERROR", pgettext_lazy("Current status of share", u"Error")),
"Migrating to")),
("error", pgettext_lazy("Current status of share", "Error")),
("ERROR", pgettext_lazy("Current status of share", "Error")),
("error_deleting", pgettext_lazy("Current status of share",
u"Deleting")),
"Deleting")),
("ERROR_DELETING", pgettext_lazy("Current status of share",
u"Deleting")),
"Deleting")),
("MANAGE_ERROR", pgettext_lazy("Current status of share",
u"Manage Error")),
"Manage Error")),
("UNMANAGE_ERROR", pgettext_lazy("Current status of share",
u"Unmanage Error")),
"Unmanage Error")),
("extending_error", pgettext_lazy("Current status of share",
u"Extending Error")),
"Extending Error")),
("shrinking_error", pgettext_lazy("Current status of share",
u"Shrinking Error")),
"Shrinking Error")),
("shrinking_possible_data_loss_error", pgettext_lazy(
"Current status of share", u"Shrinking Error")),
"Current status of share", "Shrinking Error")),
("reverting_error", pgettext_lazy("Current status of share",
u"Reverting Error")),
"Reverting Error")),
)
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
@@ -326,16 +326,16 @@ class DeleteRule(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete Rule",
u"Delete Rules",
"Delete Rule",
"Delete Rules",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted Rule",
u"Deleted Rules",
"Deleted Rule",
"Deleted Rules",
count
)

8
manila_ui/dashboards/project/user_messages/tables.py
View File

@@ -32,16 +32,16 @@ class DeleteUserMessage(tables.DeleteAction):
@staticmethod
def action_present(count):
return ngettext_lazy(
u"Delete User Message",
u"Delete User Messages",
"Delete User Message",
"Delete User Messages",
count
)
@staticmethod
def action_past(count):
return ngettext_lazy(
u"Deleted User Message",
u"Deleted User Messages",
"Deleted User Message",
"Deleted User Messages",
count
)