From b28f1a75b7ad3ff1b79ead66f3a12e2368d16dc5 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 29 Jan 2016 09:34:46 +0100 Subject: [PATCH] Update translation setup Follow new infra setup for translations, see spec http://specs.openstack.org/openstack-infra/infra-specs/specs/translation_setup.html for full details. This basically renames ironic-inspector/locale/ironic-inspector.pot to ironic_inspector/locale/ironic_inspector.pot. For this we need to update setup.cfg. Also fix some errors for translation setup in setup.cfg Update also domain name in i18n.py. The project has no translations currently, let's remove the outdated pot file, the updated scripts work without them. So, we can just delete the file and once there are translations, an updated pot file together with translations can be imported automatically. Change-Id: I1f9e3777a68d09406eeee836d03f15cbfe568470 --- .../locale/ironic-inspector-log-critical.pot | 39 ---- .../locale/ironic-inspector-log-error.pot | 55 ----- .../locale/ironic-inspector-log-info.pot | 86 ------- .../locale/ironic-inspector-log-warning.pot | 91 -------- ironic-inspector/locale/ironic-inspector.pot | 220 ------------------ ironic_inspector/common/i18n.py | 2 +- setup.cfg | 10 +- 7 files changed, 6 insertions(+), 497 deletions(-) delete mode 100644 ironic-inspector/locale/ironic-inspector-log-critical.pot delete mode 100644 ironic-inspector/locale/ironic-inspector-log-error.pot delete mode 100644 ironic-inspector/locale/ironic-inspector-log-info.pot delete mode 100644 ironic-inspector/locale/ironic-inspector-log-warning.pot delete mode 100644 ironic-inspector/locale/ironic-inspector.pot diff --git a/ironic-inspector/locale/ironic-inspector-log-critical.pot b/ironic-inspector/locale/ironic-inspector-log-critical.pot deleted file mode 100644 index d88d6f43b..000000000 --- a/ironic-inspector/locale/ironic-inspector-log-critical.pot +++ /dev/null @@ -1,39 +0,0 @@ -# Translations template for ironic-inspector. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the ironic-inspector -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ironic-inspector 2.0.0.dev155.g419d353\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-06-22 14:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" - -#: ironic_inspector/main.py:136 -#, python-format -msgid "Hook %s failed to load or was not found" -msgstr "" - -#: ironic_inspector/node_cache.py:193 -msgid "Configuration option inspector.database should be set" -msgstr "" - -#: ironic_inspector/plugins/standard.py:68 -#, python-format -msgid "Accepted values for [processing]add_ports are %(valid)s, got %(actual)s" -msgstr "" - -#: ironic_inspector/plugins/standard.py:75 -#, python-format -msgid "Accepted values for [processing]keep_ports are %(valid)s, got %(actual)s" -msgstr "" - diff --git a/ironic-inspector/locale/ironic-inspector-log-error.pot b/ironic-inspector/locale/ironic-inspector-log-error.pot deleted file mode 100644 index 6201a5ba7..000000000 --- a/ironic-inspector/locale/ironic-inspector-log-error.pot +++ /dev/null @@ -1,55 +0,0 @@ -# Translations template for ironic-inspector. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the ironic-inspector -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ironic-inspector 2.0.0.dev155.g419d353\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-06-22 14:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" - -#: ironic_inspector/firewall.py:44 -#, python-format -msgid "" -"iptables %(iptables)s failed:\n" -"%(exc)s" -msgstr "" - -#: ironic_inspector/main.py:108 -msgid "Periodic update failed" -msgstr "" - -#: ironic_inspector/main.py:119 -msgid "Periodic clean up of node cache failed" -msgstr "" - -#: ironic_inspector/node_cache.py:122 -#, python-format -msgid "Database integrity error %s during adding attributes" -msgstr "" - -#: ironic_inspector/node_cache.py:344 -#, python-format -msgid "Introspection for nodes %s has timed out" -msgstr "" - -#: ironic_inspector/process.py:72 ironic_inspector/process.py:78 -#, python-format -msgid "Hook %(hook)s failed, delaying error report until node look up: %(error)s" -msgstr "" - -#: ironic_inspector/utils.py:122 -#, python-format -msgid "Role \"admin\" not in user role list %s" -msgstr "" - diff --git a/ironic-inspector/locale/ironic-inspector-log-info.pot b/ironic-inspector/locale/ironic-inspector-log-info.pot deleted file mode 100644 index 458f2757c..000000000 --- a/ironic-inspector/locale/ironic-inspector-log-info.pot +++ /dev/null @@ -1,86 +0,0 @@ -# Translations template for ironic-inspector. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the ironic-inspector -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ironic-inspector 2.0.0.dev155.g419d353\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-06-22 14:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" - -#: ironic_inspector/introspect.py:119 -#, python-format -msgid "Whitelisting MAC's %(macs)s for node %(node)s on the firewall" -msgstr "" - -#: ironic_inspector/introspect.py:142 -#, python-format -msgid "" -"Introspection environment is ready for node %(node)s, manual power on is " -"required within %(timeout)d seconds" -msgstr "" - -#: ironic_inspector/main.py:139 -#, python-format -msgid "Enabled processing hooks: %s" -msgstr "" - -#: ironic_inspector/process.py:192 -#, python-format -msgid "" -"Waiting for credentials update on node %(node)s, attempt %(attempt)d " -"current error is %(exc)s" -msgstr "" - -#: ironic_inspector/process.py:220 -#, python-format -msgid "Introspection finished successfully for node %s" -msgstr "" - -#: ironic_inspector/utils.py:172 -#, python-format -msgid "Node %s is in maintenance mode, skipping provision states check" -msgstr "" - -#: ironic_inspector/plugins/root_device_hint.py:50 -msgid "No volume is found on the node. Adding a fake value for \"local_gb\"" -msgstr "" - -#: ironic_inspector/plugins/root_device_hint.py:63 -msgid "Root device is already known for the node" -msgstr "" - -#: ironic_inspector/plugins/standard.py:48 -#, python-format -msgid "" -"Discovered data: CPUs: %(cpus)s %(cpu_arch)s, memory %(memory_mb)s MiB, " -"disk %(local_gb)s GiB" -msgstr "" - -#: ironic_inspector/plugins/standard.py:95 -#, python-format -msgid "PXE boot interface was %s" -msgstr "" - -#: ironic_inspector/plugins/standard.py:125 -#, python-format -msgid "Eligible interfaces are %s" -msgstr "" - -#: ironic_inspector/plugins/standard.py:148 -#, python-format -msgid "" -"Deleting port %(port)s as its MAC %(mac)s is not in expected MAC list " -"%(expected)s for node %(node)s" -msgstr "" - diff --git a/ironic-inspector/locale/ironic-inspector-log-warning.pot b/ironic-inspector/locale/ironic-inspector-log-warning.pot deleted file mode 100644 index e124d8981..000000000 --- a/ironic-inspector/locale/ironic-inspector-log-warning.pot +++ /dev/null @@ -1,91 +0,0 @@ -# Translations template for ironic-inspector. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the ironic-inspector -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ironic-inspector 2.0.0.dev155.g419d353\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-06-22 14:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" - -#: ironic_inspector/introspect.py:129 -#, python-format -msgid "Failed to set boot device to PXE for node %(node)s: %(exc)s" -msgstr "" - -#: ironic_inspector/main.py:127 -msgid "Starting unauthenticated, please check configuration" -msgstr "" - -#: ironic_inspector/main.py:150 -msgid "Timeout is disabled in configuration" -msgstr "" - -#: ironic_inspector/main.py:160 -msgid "" -"Unable to use SSL in this version of Python: %{current}, please ensure " -"your version of Python is greater than %{min} to enable this feature." -msgstr "" - -#: ironic_inspector/main.py:172 -msgid "" -"Failed to load certificate or key from defined locations: %{cert} and " -"%{key}, will continue to run with the default settings: %{exc}" -msgstr "" - -#: ironic_inspector/main.py:178 -#, python-format -msgid "" -"There was a problem with the loaded certificate and key, will continue to" -" run with the default settings: %s" -msgstr "" - -#: ironic_inspector/node_cache.py:158 ironic_inspector/node_cache.py:178 -#, python-format -msgid "Port %(mac)s already exists for node %(uuid)s, skipping" -msgstr "" - -#: ironic_inspector/utils.py:152 -#, python-format -msgid "Conflict on calling %(call)s: %(exc)s, retry attempt %(count)d" -msgstr "" - -#: ironic_inspector/plugins/extra_hardware.py:55 -msgid "No extra hardware information was received from the ramdisk" -msgstr "" - -#: ironic_inspector/plugins/root_device_hint.py:57 -msgid "No block device was received from ramdisk" -msgstr "" - -#: ironic_inspector/plugins/root_device_hint.py:74 -msgid "Root device cannot be identified because multiple new devices were found" -msgstr "" - -#: ironic_inspector/plugins/root_device_hint.py:78 -msgid "No new devices were found" -msgstr "" - -#: ironic_inspector/plugins/standard.py:120 -#, python-format -msgid "" -"The following interfaces were invalid or not eligible in introspection " -"data for node with BMC %(ipmi_address)s and were excluded: %(invalid)s" -msgstr "" - -#: ironic_inspector/plugins/standard.py:175 -msgid "" -"Failed to store logs received from the ramdisk because ramdisk_logs_dir " -"configuration option is not set" -msgstr "" - diff --git a/ironic-inspector/locale/ironic-inspector.pot b/ironic-inspector/locale/ironic-inspector.pot deleted file mode 100644 index 492367cf0..000000000 --- a/ironic-inspector/locale/ironic-inspector.pot +++ /dev/null @@ -1,220 +0,0 @@ -# Translations template for ironic-inspector. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the ironic-inspector -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ironic-inspector 2.0.0.dev179\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-08 21:42+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" - -#: ironic_inspector/introspect.py:38 -msgid "IPMI credentials setup is disabled in configuration" -msgstr "" - -#: ironic_inspector/introspect.py:42 -msgid "Node should be in maintenance mode to set IPMI credentials on it" -msgstr "" - -#: ironic_inspector/introspect.py:49 -#, python-format -msgid "" -"Setting IPMI credentials requested for node %s, but neither new user name" -" nor driver_info[ipmi_username] are provided" -msgstr "" - -#: ironic_inspector/introspect.py:56 -#, python-format -msgid "" -"Forbidden characters encountered in new IPMI password for node %(node)s: " -"\"%(chars)s\"; use only letters and numbers" -msgstr "" - -#: ironic_inspector/introspect.py:61 -#, python-format -msgid "IPMI password length should be > 0 and <= %d" -msgstr "" - -#: ironic_inspector/introspect.py:79 -#, python-format -msgid "Cannot find node %s" -msgstr "" - -#: ironic_inspector/introspect.py:81 -#, python-format -msgid "Cannot get node %(node)s: %(exc)s" -msgstr "" - -#: ironic_inspector/introspect.py:92 -#, python-format -msgid "Failed validation of power interface for node %(node)s, reason: %(reason)s" -msgstr "" - -#: ironic_inspector/introspect.py:107 -msgid "Unexpected exception in background introspection thread" -msgstr "" - -#: ironic_inspector/introspect.py:137 -#, python-format -msgid "" -"Failed to power on node %(node)s, check it's power management " -"configuration:\n" -"%(exc)s" -msgstr "" - -#: ironic_inspector/main.py:79 -msgid "Invalid UUID value" -msgstr "" - -#: ironic_inspector/node_cache.py:115 -#, python-format -msgid "Some or all of %(name)s's %(value)s are already on introspection" -msgstr "" - -#: ironic_inspector/node_cache.py:269 -#, python-format -msgid "Could not find node %s in cache" -msgstr "" - -#: ironic_inspector/node_cache.py:304 -#, python-format -msgid "Could not find a node for attributes %s" -msgstr "" - -#: ironic_inspector/node_cache.py:307 -#, python-format -msgid "Multiple matching nodes found for attributes %(attr)s: %(found)s" -msgstr "" - -#: ironic_inspector/node_cache.py:317 -#, python-format -msgid "" -"Could not find node %s in introspection cache, probably it's not on " -"introspection now" -msgstr "" - -#: ironic_inspector/node_cache.py:322 -#, python-format -msgid "Introspection for node %(node)s already finished on %(finish)s" -msgstr "" - -#: ironic_inspector/process.py:42 ironic_inspector/process.py:56 -#, python-format -msgid "Look up error: %s" -msgstr "" - -#: ironic_inspector/process.py:52 -msgid "Node not found hook returned nothing" -msgstr "" - -#: ironic_inspector/process.py:54 -#, python-format -msgid "Node not found hook failed: %s" -msgstr "" - -#: ironic_inspector/process.py:81 -#, python-format -msgid "Unexpected exception during preprocessing in hook %s" -msgstr "" - -#: ironic_inspector/process.py:87 -#, python-format -msgid "" -"The following failures happened during running pre-processing hooks for " -"node %(uuid)s:\n" -"%(failures)s" -msgstr "" - -#: ironic_inspector/process.py:92 -msgid "Data pre-processing failed" -msgstr "" - -#: ironic_inspector/process.py:95 -#, python-format -msgid "" -"The following failures happened during running pre-processing hooks for " -"unknown node:\n" -"%(failures)s" -msgstr "" - -#: ironic_inspector/process.py:105 -#, python-format -msgid "Node UUID %s was found in cache, but is not found in Ironic" -msgstr "" - -#: ironic_inspector/process.py:116 -msgid "Unexpected exception during processing" -msgstr "" - -#: ironic_inspector/process.py:201 -#, python-format -msgid "" -"Failed to validate updated IPMI credentials for node %s, node might " -"require maintenance" -msgstr "" - -#: ironic_inspector/process.py:213 -#, python-format -msgid "" -"Failed to power off node %(node)s, check it's power management " -"configuration: %(exc)s" -msgstr "" - -#: ironic_inspector/utils.py:119 -msgid "Authentication required" -msgstr "" - -#: ironic_inspector/utils.py:123 -msgid "Access denied" -msgstr "" - -#: ironic_inspector/utils.py:174 -#, python-format -msgid "" -"Refusing to introspect node %(node)s with provision state \"%(state)s\" " -"and maintenance mode off" -msgstr "" - -#: ironic_inspector/common/swift.py:110 -#, python-format -msgid "Swift failed to create container %(container)s. Error was: %(error)s" -msgstr "" - -#: ironic_inspector/common/swift.py:125 -#, python-format -msgid "" -"Swift failed to create object %(object)s in container %(container)s. " -"Error was: %(error)s" -msgstr "" - -#: ironic_inspector/plugins/standard.py:45 -#, python-format -msgid "The following required parameters are missing: %s" -msgstr "" - -#: ironic_inspector/plugins/standard.py:85 -msgid "No interfaces supplied by the ramdisk" -msgstr "" - -#: ironic_inspector/plugins/standard.py:112 -#, python-format -msgid "" -"No valid interfaces found for node with BMC %(ipmi_address)s, got " -"%(interfaces)s" -msgstr "" - -#: ironic_inspector/plugins/standard.py:171 -#, python-format -msgid "Ramdisk reported error: %s" -msgstr "" - diff --git a/ironic_inspector/common/i18n.py b/ironic_inspector/common/i18n.py index 03fb17f3c..64bab03a0 100644 --- a/ironic_inspector/common/i18n.py +++ b/ironic_inspector/common/i18n.py @@ -15,7 +15,7 @@ import oslo_i18n -_translators = oslo_i18n.TranslatorFactory(domain='ironic-inspector') +_translators = oslo_i18n.TranslatorFactory(domain='ironic_inspector') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/setup.cfg b/setup.cfg index 26cf1ad7d..4dccd94e6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,18 +54,18 @@ oslo.config.opts = ironic_inspector.common.swift = ironic_inspector.common.swift:list_opts [compile_catalog] -directory = locale -domain = ironic-inspector +directory = ironic_inspector/locale +domain = ironic_inspector [update_catalog] domain = ironic-inspector -output_dir = locale -input_file = ironic-inspector/locale/ironic-inspector.pot +output_dir = ironic_inspector/locale +input_file = ironic_inspector/locale/ironic_inspector.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = ironic-inspector/locale/ironic-inspector.pot +output_file = ironic_inspector/locale/ironic_inspector.pot [build_sphinx] all_files = 1