Synchronise master with upstream

cloudkittydashboard/api/cloudkitty.py

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

cloudkittydashboard/dashboards/admin/hashmap/tables.py

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

cloudkittydashboard/dashboards/admin/modules/tables.py

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

cloudkittydashboard/dashboards/admin/pyscripts/tables.py

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

cloudkittydashboard/dashboards/admin/summary/tables.py

@@ -42,4 +42,4 @@ class TenantSummaryTable(tables.DataTable):
 
     class Meta(object):
         name = "tenant_summary"
-        verbose_name = _("Tenant Summary")
+        verbose_name = _("Project Summary")

cloudkittydashboard/dashboards/admin/summary/templates/rating_summary/details.html

@@ -1,9 +1,9 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% block title %}{% trans "Tenant Details" %}{% endblock %}
+{% block title %}{% trans "Project Details" %}{% endblock %}
 
 {% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Tenant Details") %}
+  {% include "horizon/common/_page_header.html" with title=_("Project Details") %}
 {% endblock page_header %}
 
 {% block main %}

cloudkittydashboard/locale/en_GB/LC_MESSAGES/django.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cloudkitty-dashboard VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2022-08-08 15:59+0000\n"
+"POT-Creation-Date: 2025-08-07 10:33+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -454,12 +454,6 @@ msgstr "Successfully updated script"
 msgid "Summary"
 msgstr "Summary"
 
-msgid "Tenant Details"
-msgstr "Tenant Details"
-
-msgid "Tenant Summary"
-msgstr "Tenant Summary"
-
 #, python-format
 msgid "There was a problem parsing the %(prefix)s: %(error)s"
 msgstr "There was a problem parsing the %(prefix)s: %(error)s"

cloudkittydashboard/tests/base.py

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

cloudkittydashboard/tests/test_cloudkittydashboard.py

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Objectif Libre
-
+#
 # 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
 # a copy of the License at

cloudkittydashboard/utils.py

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

doc/source/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # 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 a copy of the License at

doc/source/installation.rst

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

releasenotes/source/conf.py

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

releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po

@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cloudkitty Dashboard Release Notes\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-25 13:48+0000\n"
+"POT-Creation-Date: 2025-08-07 10:32+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2024-07-01 11:17+0000\n"
+"PO-Revision-Date: 2024-04-18 12:35+0000\n"
 "Last-Translator: Andi Chandler <[email protected]>\n"
 "Language-Team: English (United Kingdom)\n"
 "Language: en_GB\n"
@@ -29,9 +29,6 @@ msgstr "11.0.1"
 msgid "12.0.0"
 msgstr "12.0.0"
 
-msgid "12.0.0-3"
-msgstr "12.0.0-3"
-
 msgid "13.0.0"
 msgstr "13.0.0"
 
@@ -41,9 +38,6 @@ msgstr "14.0.1"
 msgid "15.0.0"
 msgstr "15.0.0"
 
-msgid "18.0.0-8"
-msgstr "18.0.0-8"
-
 msgid "2023.1 Series Release Notes"
 msgstr "2023.1 Series Release Notes"