From 76bffd36529321235f2de7c2917e24e628ef7bd8 Mon Sep 17 00:00:00 2001 From: Carlos Giraldo Date: Tue, 26 May 2026 07:48:22 +0200 Subject: [PATCH 1/5] fix quote json: put resource description inside "metadata" field Change-Id: I81ae21f9aaa2b44eedf54a82f0110a1bc7816719 Signed-off-by: Carlos Giraldo --- .../static/cloudkitty/js/cloudkitty.controller.js | 2 +- cloudkittydashboard/static/cloudkitty/js/pricing.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudkittydashboard/static/cloudkitty/js/cloudkitty.controller.js b/cloudkittydashboard/static/cloudkitty/js/cloudkitty.controller.js index fb71ed0..5f7ad83 100644 --- a/cloudkittydashboard/static/cloudkitty/js/cloudkitty.controller.js +++ b/cloudkittydashboard/static/cloudkitty/js/cloudkitty.controller.js @@ -34,7 +34,7 @@ 'image_id': $scope.model.newInstanceSpec.source[0].id, } - var form_data = [{"desc": desc_form, "volume": $scope.model.newInstanceSpec.instance_count}]; + var form_data = [{"desc": {"metadata": desc_form }, "volume": $scope.model.newInstanceSpec.instance_count}]; $http.post($window.WEBROOT + 'project/rating/quote', form_data).then(function(res, status) { $scope.price = res.data; diff --git a/cloudkittydashboard/static/cloudkitty/js/pricing.js b/cloudkittydashboard/static/cloudkitty/js/pricing.js index 01972bd..ab216b4 100644 --- a/cloudkittydashboard/static/cloudkitty/js/pricing.js +++ b/cloudkittydashboard/static/cloudkitty/js/pricing.js @@ -78,7 +78,7 @@ pricing = { if (_image != undefined) { desc_form['image_id'] = _image.id } - var form_data = [{"desc": desc_form, "volume": instance_count}]; + var form_data = [{"desc": {"metadata": desc_form }, "volume": instance_count}]; // send the JSON by a POST request var url_data = [ From 4f0ef250e4046ab339e6f30d195ef1dd34924c90 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 8 Jun 2026 13:18:53 +0200 Subject: [PATCH 2/5] Fix error in installation docs The command added in a previous change [1] was incorrect. [1] https://review.opendev.org/c/openstack/cloudkitty-dashboard/+/987809 Change-Id: Ie45075631fce55fd19c8356f1f6e7600eb8885ac Signed-off-by: Pierre Riteau --- doc/source/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 0aaaa0e..879607f 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -15,7 +15,7 @@ Retrieve and install CloudKitty dashboard: git clone https://opendev.org/openstack/cloudkitty-dashboard cd cloudkitty-dashboard - pip install -c https://opendev.org/openstack/requirements/raw/branch/stable//upper-constraints.txt. + pip install -c https://opendev.org/openstack/requirements/raw/branch/stable//upper-constraints.txt . Find where the python packages are installed: From 558863b16810f120bfe5185174887c23c612ccc7 Mon Sep 17 00:00:00 2001 From: Ivan Anfimov Date: Mon, 8 Jun 2026 14:49:24 +0000 Subject: [PATCH 3/5] Fix for issue with translations Using tool.setuptools.packages.find caused get-modulename.py to resolve "find" as directory, breaking locale uploads to Zanata. https://translate.openstack.org/iteration/view/cloudkitty-dashboard/master/languages/ru?dswid=3092 Change-Id: Icd2e5a9a00a56f3c5007502c6d31a44d58992239 Signed-off-by: Ivan Anfimov --- pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2da5c61..086d772 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,5 +31,7 @@ classifiers = [ Homepage = "https://docs.openstack.org/cloudkitty-dashboard/latest/" Repository = "https://opendev.org/openstack/cloudkitty-dashboard" -[tool.setuptools.packages.find] -include = ["cloudkittydashboard*"] +[tool.setuptools] +packages = [ + "cloudkittydashboard" +] From 43484f3cea457dd182f2b57c210759db5bccd3fe Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 9 Jun 2026 04:15:53 +0000 Subject: [PATCH 4/5] Imported Translations from Zanata For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I70d53e7157536cd75ef77933a30f5f564041578e Signed-off-by: OpenStack Proposal Bot Generated-By: openstack/openstack-zuul-jobs:roles/prepare-zanata-client/files/common_translation_update.sh --- .../source/locale/ru/LC_MESSAGES/releasenotes.po | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/releasenotes/source/locale/ru/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/ru/LC_MESSAGES/releasenotes.po index a0c4d2d..d67cad9 100644 --- a/releasenotes/source/locale/ru/LC_MESSAGES/releasenotes.po +++ b/releasenotes/source/locale/ru/LC_MESSAGES/releasenotes.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: Cloudkitty Dashboard Release Notes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-05-11 08:55+0000\n" +"POT-Creation-Date: 2026-06-08 14:48+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2026-05-11 05:29+0000\n" +"PO-Revision-Date: 2026-06-08 02:49+0000\n" "Last-Translator: Ivan Anfimov \n" "Language-Team: Russian\n" "Language: ru\n" @@ -69,8 +69,8 @@ msgstr "21.0.0" msgid "22.0.0" msgstr "22.0.0" -msgid "22.0.0-11" -msgstr "22.0.0-11" +msgid "22.0.0-17" +msgstr "22.0.0-17" msgid "8.1.0" msgstr "8.1.0" @@ -81,6 +81,9 @@ msgstr ":ref:`genindex`" msgid ":ref:`search`" msgstr ":ref:`search`" +msgid "Added support for Python 3.14." +msgstr "Добавлена поддержка Python 3.14." + msgid "" "Adds optional Horizon settings variable OPENSTACK_CLOUDKITTY_RATE_PREFIX and " "OPENSTACK_CLOUDKITTY_RATE_POSTFIX. These allow users to attach pre/postfix " @@ -162,6 +165,9 @@ msgstr "Примечания к выпуску Rocky" msgid "Stein Series Release Notes" msgstr "Примечания к выпуску Stein" +msgid "Support for Python 3.10 has been dropped." +msgstr "Поддержка Python 3.10 была прекращена." + msgid "Support for Python 3.8 and 3.9 has been dropped." msgstr "Поддержка Python 3.8 и 3.9 была прекращена." From b8577a52d55f8b0bf2660f2eb812fb672021b545 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 16 Jun 2026 04:08:46 +0000 Subject: [PATCH 5/5] Imported Translations from Zanata For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I079c2416a0a9607f9da75fe36832890b2821ae28 Signed-off-by: OpenStack Proposal Bot Generated-By: openstack/openstack-zuul-jobs:roles/prepare-zanata-client/files/common_translation_update.sh --- cloudkittydashboard/locale/ru/LC_MESSAGES/django.po | 9 +++++---- .../source/locale/ru/LC_MESSAGES/releasenotes.po | 11 +++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cloudkittydashboard/locale/ru/LC_MESSAGES/django.po b/cloudkittydashboard/locale/ru/LC_MESSAGES/django.po index 7b1fd86..332249f 100644 --- a/cloudkittydashboard/locale/ru/LC_MESSAGES/django.po +++ b/cloudkittydashboard/locale/ru/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # Dmitriy Chubinidze , 2025. #zanata # Ivan Anfimov , 2025. #zanata # Dmitriy Chubinidze , 2026. #zanata +# Ivan Anfimov , 2026. #zanata msgid "" msgstr "" "Project-Id-Version: cloudkitty-dashboard VERSION\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" -"POT-Creation-Date: 2026-05-04 09:41+0000\n" +"POT-Creation-Date: 2026-06-15 13:50+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2026-05-04 09:51+0000\n" -"Last-Translator: Dmitriy Chubinidze \n" +"PO-Revision-Date: 2026-06-15 09:55+0000\n" +"Last-Translator: Ivan Anfimov \n" "Language-Team: Russian\n" "Language: ru\n" "X-Generator: Zanata 4.3.3\n" @@ -286,7 +287,7 @@ msgstr "Изменить приоритет модуля" #, python-format msgid "Edit the priority for the %(module_id)s module." -msgstr "Изменить приоритет для модуля %(module_id)s" +msgstr "Изменить приоритет для модуля %(module_id)s." msgid "Enable Module" msgid_plural "Enable Modules" diff --git a/releasenotes/source/locale/ru/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/ru/LC_MESSAGES/releasenotes.po index d67cad9..774a1d9 100644 --- a/releasenotes/source/locale/ru/LC_MESSAGES/releasenotes.po +++ b/releasenotes/source/locale/ru/LC_MESSAGES/releasenotes.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: Cloudkitty Dashboard Release Notes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-08 14:48+0000\n" +"POT-Creation-Date: 2026-06-15 13:50+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2026-06-08 02:49+0000\n" +"PO-Revision-Date: 2026-06-15 09:32+0000\n" "Last-Translator: Ivan Anfimov \n" "Language-Team: Russian\n" "Language: ru\n" @@ -69,8 +69,11 @@ msgstr "21.0.0" msgid "22.0.0" msgstr "22.0.0" -msgid "22.0.0-17" -msgstr "22.0.0-17" +msgid "22.0.0-19" +msgstr "22.0.0-19" + +msgid "22.0.0-6" +msgstr "22.0.0-6" msgid "8.1.0" msgstr "8.1.0"