From 530452575522244006ddda6adecbc6f6d2672fcc Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 29 Jan 2016 11:43:28 +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 oslo.service/locale/oslo.service.pot to oslo_service/locale/oslo_service.pot. For this we need to update setup.cfg. Update also domain name in i18n.py. The project has no translations currently, let's remove the outdated pot files, the updated scripts work without them. So, we can just delete the files and once there are translations, an updated pot file together with translations can be imported automatically. Change-Id: I4bbe492faee1c04ede16b3a4e9da2a9521eecccd --- .../locale/oslo.service-log-critical.pot | 20 ---- .../locale/oslo.service-log-error.pot | 53 ----------- oslo.service/locale/oslo.service-log-info.pot | 91 ------------------- .../locale/oslo.service-log-warning.pot | 37 -------- oslo.service/locale/oslo.service.pot | 70 -------------- oslo_service/_i18n.py | 2 +- setup.cfg | 12 +-- 7 files changed, 7 insertions(+), 278 deletions(-) delete mode 100644 oslo.service/locale/oslo.service-log-critical.pot delete mode 100644 oslo.service/locale/oslo.service-log-error.pot delete mode 100644 oslo.service/locale/oslo.service-log-info.pot delete mode 100644 oslo.service/locale/oslo.service-log-warning.pot delete mode 100644 oslo.service/locale/oslo.service.pot diff --git a/oslo.service/locale/oslo.service-log-critical.pot b/oslo.service/locale/oslo.service-log-critical.pot deleted file mode 100644 index 14c3823c..00000000 --- a/oslo.service/locale/oslo.service-log-critical.pot +++ /dev/null @@ -1,20 +0,0 @@ -# Translations template for oslo.service. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the oslo.service -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: oslo.service 0.6.1.dev6\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-09 07:32+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" - diff --git a/oslo.service/locale/oslo.service-log-error.pot b/oslo.service/locale/oslo.service-log-error.pot deleted file mode 100644 index 18819962..00000000 --- a/oslo.service/locale/oslo.service-log-error.pot +++ /dev/null @@ -1,53 +0,0 @@ -# Translations template for oslo.service. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the oslo.service -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: oslo.service 0.6.1.dev6\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-09 07:32+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" - -#: oslo_service/loopingcall.py:56 oslo_service/loopingcall.py:124 -#, python-format -msgid "%(kind)s %(func_name)r failed" -msgstr "" - -#: oslo_service/loopingcall.py:237 -#, python-format -msgid "" -"Cannot retry upon suggested exception since retry count (%(retry_count)d)" -" reached max retry count (%(max_retry_count)d)." -msgstr "" - -#: oslo_service/periodic_task.py:222 -#, python-format -msgid "Error during %(full_task_name)s" -msgstr "" - -#: oslo_service/service.py:386 -msgid "Unhandled exception" -msgstr "" - -#: oslo_service/threadgroup.py:111 -msgid "Error stopping thread." -msgstr "" - -#: oslo_service/threadgroup.py:118 -msgid "Error stopping timer." -msgstr "" - -#: oslo_service/threadgroup.py:145 -msgid "Error waiting on ThreadGroup." -msgstr "" - diff --git a/oslo.service/locale/oslo.service-log-info.pot b/oslo.service/locale/oslo.service-log-info.pot deleted file mode 100644 index 2f13eb04..00000000 --- a/oslo.service/locale/oslo.service-log-info.pot +++ /dev/null @@ -1,91 +0,0 @@ -# Translations template for oslo.service. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the oslo.service -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: oslo.service 0.6.1.dev6\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-09 07:32+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" - -#: oslo_service/eventlet_backdoor.py:127 -#, python-format -msgid "Eventlet backdoor listening on %(port)s for process %(pid)d" -msgstr "" - -#: oslo_service/periodic_task.py:108 -#, python-format -msgid "Skipping periodic task %(task)s because its interval is negative" -msgstr "" - -#: oslo_service/periodic_task.py:113 -#, python-format -msgid "Skipping periodic task %(task)s because it is disabled" -msgstr "" - -#: oslo_service/service.py:262 -#, python-format -msgid "Caught %s, exiting" -msgstr "" - -#: oslo_service/service.py:336 -msgid "Caught SIGINT signal, instantaneous exiting" -msgstr "" - -#: oslo_service/service.py:344 -msgid "Parent process has died unexpectedly, exiting" -msgstr "" - -#: oslo_service/service.py:380 -#, python-format -msgid "Child caught %s, exiting" -msgstr "" - -#: oslo_service/service.py:417 -msgid "Forking too fast, sleeping" -msgstr "" - -#: oslo_service/service.py:438 -#, python-format -msgid "Started child %d" -msgstr "" - -#: oslo_service/service.py:456 -#, python-format -msgid "Starting %d workers" -msgstr "" - -#: oslo_service/service.py:473 -#, python-format -msgid "Child %(pid)d killed by signal %(sig)d" -msgstr "" - -#: oslo_service/service.py:477 -#, python-format -msgid "Child %(pid)s exited with status %(code)d" -msgstr "" - -#: oslo_service/service.py:517 -#, python-format -msgid "Caught %s, stopping children" -msgstr "" - -#: oslo_service/service.py:532 -msgid "Wait called after thread killed. Cleaning up." -msgstr "" - -#: oslo_service/service.py:555 -#, python-format -msgid "Waiting on %d children to exit" -msgstr "" - diff --git a/oslo.service/locale/oslo.service-log-warning.pot b/oslo.service/locale/oslo.service-log-warning.pot deleted file mode 100644 index 26fe0f5d..00000000 --- a/oslo.service/locale/oslo.service-log-warning.pot +++ /dev/null @@ -1,37 +0,0 @@ -# Translations template for oslo.service. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the oslo.service -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: oslo.service 0.6.1.dev6\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-09 07:32+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" - -#: oslo_service/loopingcall.py:147 -#, python-format -msgid "Function %(func_name)r run outlasted interval by %(delay).2f sec" -msgstr "" - -#: oslo_service/loopingcall.py:230 -#, python-format -msgid "" -"Exception which is in the suggested list of exceptions occurred while " -"invoking function: %s." -msgstr "" - -#: oslo_service/service.py:481 -#, python-format -msgid "pid %d not in child list" -msgstr "" - diff --git a/oslo.service/locale/oslo.service.pot b/oslo.service/locale/oslo.service.pot deleted file mode 100644 index 800aa819..00000000 --- a/oslo.service/locale/oslo.service.pot +++ /dev/null @@ -1,70 +0,0 @@ -# Translations template for oslo.service. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the oslo.service -# project. -# FIRST AUTHOR , 2015. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: oslo.service 0.6.1.dev6\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-09 07:32+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" - -#: oslo_service/loopingcall.py:65 -msgid "Unknown looping call" -msgstr "" - -#: oslo_service/loopingcall.py:67 -msgid "A looping call can only run one function at a time" -msgstr "" - -#: oslo_service/loopingcall.py:138 -msgid "A fixed interval looping call can only run one function at a time" -msgstr "" - -#: oslo_service/loopingcall.py:141 -msgid "Fixed interval looping call" -msgstr "" - -#: oslo_service/loopingcall.py:162 -msgid "A dynamic interval looping call can only run one function at a time" -msgstr "" - -#: oslo_service/loopingcall.py:165 -msgid "Dynamic interval looping call" -msgstr "" - -#: oslo_service/periodic_task.py:37 -#, python-format -msgid "Unexpected argument for periodic task creation: %(arg)s." -msgstr "" - -#: oslo_service/sslutils.py:39 -#, python-format -msgid "Unable to find cert_file : %s" -msgstr "" - -#: oslo_service/sslutils.py:42 -#, python-format -msgid "Unable to find ca_file : %s" -msgstr "" - -#: oslo_service/sslutils.py:45 -#, python-format -msgid "Unable to find key_file : %s" -msgstr "" - -#: oslo_service/sslutils.py:48 -msgid "" -"When running server in SSL mode, you must specify both a cert_file and " -"key_file option value in your configuration file" -msgstr "" - diff --git a/oslo_service/_i18n.py b/oslo_service/_i18n.py index 266f1f0d..289a771d 100644 --- a/oslo_service/_i18n.py +++ b/oslo_service/_i18n.py @@ -17,7 +17,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html . import oslo_i18n -DOMAIN = "oslo.service" +DOMAIN = "oslo_service" _translators = oslo_i18n.TranslatorFactory(domain=DOMAIN) diff --git a/setup.cfg b/setup.cfg index 6bb6f662..e82ef2ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,18 +42,18 @@ all_files = 1 upload-dir = doc/build/html [compile_catalog] -directory = oslo.service/locale -domain = oslo.service +directory = oslo_service/locale +domain = oslo_service [update_catalog] -domain = oslo.service -output_dir = oslo.service/locale -input_file = oslo.service/locale/oslo.service.pot +domain = oslo_service +output_dir = oslo_service/locale +input_file = oslo_service/locale/oslo_service.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = oslo.service/locale/oslo.service.pot +output_file = oslo_service/locale/oslo_service.pot [wheel] universal = true