openstack/cloudkitty-dashboard
Code Issues Proposed changes

Merge "Remove unicode prefix from code"

Browse Source
This commit is contained in:
Zuul
2025-08-07 10:09:55 +00:00
committed by Gerrit Code Review
parent 19b634dbde 76884efeed
commit 605481c524
10 changed files with 38 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cloudkittydashboard/api/cloudkitty.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2015 Objectif Libre # Copyright 2015 Objectif Libre
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may

48
cloudkittydashboard/dashboards/admin/hashmap/tables.py
View File

@@ -41,16 +41,16 @@ class DeleteService(tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ngettext_lazy( return ngettext_lazy(
u"Delete Service", "Delete Service",
u"Delete Services", "Delete Services",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ngettext_lazy( return ngettext_lazy(
u"Deleted Service", "Deleted Service",
u"Deleted Services", "Deleted Services",
count count
) )
@@ -103,16 +103,16 @@ class DeleteGroup(tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ngettext_lazy( return ngettext_lazy(
u"Delete Group", "Delete Group",
u"Delete Groups", "Delete Groups",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ngettext_lazy( return ngettext_lazy(
u"Deleted Group", "Deleted Group",
u"Deleted Groups", "Deleted Groups",
count count
) )
@@ -190,16 +190,16 @@ class DeleteServiceThreshold(tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ngettext_lazy( return ngettext_lazy(
u"Delete Service Threshold", "Delete Service Threshold",
u"Delete Service Thresholds", "Delete Service Thresholds",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ngettext_lazy( return ngettext_lazy(
u"Deleted Service Threshold", "Deleted Service Threshold",
u"Deleted Service Thresholds", "Deleted Service Thresholds",
count count
) )
@@ -217,16 +217,16 @@ class DeleteFieldThreshold(tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ngettext_lazy( return ngettext_lazy(
u"Delete Field Threshold", "Delete Field Threshold",
u"Delete Field Thresholds", "Delete Field Thresholds",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ngettext_lazy( return ngettext_lazy(
u"Deleted Field Threshold", "Deleted Field Threshold",
u"Deleted Field Thresholds", "Deleted Field Thresholds",
count count
) )
@@ -357,16 +357,16 @@ class DeleteField(tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ngettext_lazy( return ngettext_lazy(
u"Delete Field", "Delete Field",
u"Delete Fields", "Delete Fields",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ngettext_lazy( return ngettext_lazy(
u"Deleted Field", "Deleted Field",
u"Deleted Fields", "Deleted Fields",
count count
) )
@@ -429,16 +429,16 @@ class DeleteMapping(tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ngettext_lazy( return ngettext_lazy(
u"Delete Mapping", "Delete Mapping",
u"Delete Mappings", "Delete Mappings",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ngettext_lazy( return ngettext_lazy(
u"Deleted Mapping", "Deleted Mapping",
u"Deleted Mappings", "Deleted Mappings",
count count
) )

16
cloudkittydashboard/dashboards/admin/modules/tables.py
View File

@@ -47,13 +47,13 @@ class ToggleEnabledModule(tables.BatchAction):
def action_present(count): def action_present(count):
return ( return (
ngettext_lazy( ngettext_lazy(
u"Enable Module", "Enable Module",
u"Enable Modules", "Enable Modules",
count count
), ),
ngettext_lazy( ngettext_lazy(
u"Disable Module", "Disable Module",
u"Disable Modules", "Disable Modules",
count count
), ),
) )
@@ -62,13 +62,13 @@ class ToggleEnabledModule(tables.BatchAction):
def action_past(count): def action_past(count):
return ( return (
ngettext_lazy( ngettext_lazy(
u"Enabled Module", "Enabled Module",
u"Enabled Modules", "Enabled Modules",
count count
), ),
ngettext_lazy( ngettext_lazy(
u"Disabled Module", "Disabled Module",
u"Disabled Modules", "Disabled Modules",
count count
), ),
) )

8
cloudkittydashboard/dashboards/admin/pyscripts/tables.py
View File

@@ -56,16 +56,16 @@ class DeletePyScript(tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ngettext_lazy( return ngettext_lazy(
u"Delete PyScript", "Delete PyScript",
u"Delete PyScripts", "Delete PyScripts",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ngettext_lazy( return ngettext_lazy(
u"Deleted PyScript", "Deleted PyScript",
u"Deleted PyScripts", "Deleted PyScripts",
count count
) )

2
cloudkittydashboard/tests/base.py
View File

@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2010-2011 OpenStack Foundation # Copyright 2010-2011 OpenStack Foundation
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
# #

3
cloudkittydashboard/tests/test_cloudkittydashboard.py
View File

@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2015 Objectif Libre # Copyright 2015 Objectif Libre
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain # not use this file except in compliance with the License. You may obtain
# a copy of the License at # a copy of the License at

1
cloudkittydashboard/utils.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2018 Objectif Libre # Copyright 2018 Objectif Libre
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may

1
doc/source/conf.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at

2
doc/source/installation.rst
View File

@@ -72,5 +72,5 @@ Some symbols (Such as Non-ASCII) might require to use unicode value directly.
.. code-block:: python .. code-block:: python
# British Pound # British Pound
OPENSTACK_CLOUDKITTY_RATE_PREFIX = u'\xA3' OPENSTACK_CLOUDKITTY_RATE_PREFIX = '\xA3'
OPENSTACK_CLOUDKITTY_RATE_POSTFIX = 'GBP' OPENSTACK_CLOUDKITTY_RATE_POSTFIX = 'GBP'

2
releasenotes/source/conf.py
View File

@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
#
# Cloudkitty Release Notes documentation build configuration file. # Cloudkitty Release Notes documentation build configuration file.
# #
# This file is execfile()d with the current directory set to its # This file is execfile()d with the current directory set to its