From 63a45b6a9010de9dacb9656a4fe20c1bdef1768d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 24 Sep 2015 21:09:49 +0200 Subject: [PATCH 1/2] Cleanup of Translations In preparation for the release, do some cleanups for translations. Removes all po files that are partially translated. The translation team has decided to exclude files with less than 66 % of translated content. There is no content lost, all data is in the translation server, we just remove it from the repository. This updates also recreates pot (translation source files) to reflect the state of the repository in case there was no recent import for them. This change needs to be done manually since the automatic import does not handle some of these cases. Change-Id: I9616eb5e756f694b55cadb57b7b2aacf46833bb9 --- designate/locale/designate-log-critical.pot | 19 +- designate/locale/designate-log-info.pot | 42 +-- designate/locale/designate.pot | 17 +- .../LC_MESSAGES/designate-log-critical.po | 35 --- .../fr/LC_MESSAGES/designate-log-critical.po | 34 --- .../fr/LC_MESSAGES/designate-log-error.po | 50 ---- .../fr/LC_MESSAGES/designate-log-info.po | 249 ------------------ designate/locale/fr/LC_MESSAGES/designate.po | 54 ---- .../LC_MESSAGES/designate-log-critical.po | 34 --- .../LC_MESSAGES/designate-log-critical.po | 34 --- .../pt_BR/LC_MESSAGES/designate-log-error.po | 51 ---- 11 files changed, 40 insertions(+), 579 deletions(-) delete mode 100644 designate/locale/en_GB/LC_MESSAGES/designate-log-critical.po delete mode 100644 designate/locale/fr/LC_MESSAGES/designate-log-critical.po delete mode 100644 designate/locale/fr/LC_MESSAGES/designate-log-error.po delete mode 100644 designate/locale/fr/LC_MESSAGES/designate-log-info.po delete mode 100644 designate/locale/fr/LC_MESSAGES/designate.po delete mode 100644 designate/locale/ko_KR/LC_MESSAGES/designate-log-critical.po delete mode 100644 designate/locale/pt_BR/LC_MESSAGES/designate-log-critical.po delete mode 100644 designate/locale/pt_BR/LC_MESSAGES/designate-log-error.po diff --git a/designate/locale/designate-log-critical.pot b/designate/locale/designate-log-critical.pot index d76a7c699..d234bd40b 100644 --- a/designate/locale/designate-log-critical.pot +++ b/designate/locale/designate-log-critical.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: designate 1.0.0.0b2.dev193\n" +"Project-Id-Version: designate 1.0.0.0rc1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-29 06:34+0000\n" +"POT-Creation-Date: 2015-09-24 21:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,20 +17,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.0\n" -#: designate/api/middleware.py:171 +#: designate/api/middleware.py:181 msgid "Starting designate testcontext middleware" msgstr "" -#: designate/api/middleware.py:172 +#: designate/api/middleware.py:182 msgid "**** DO NOT USE IN PRODUCTION ****" msgstr "" -#: designate/backend/impl_powerdns/__init__.py:152 +#: designate/backend/impl_powerdns/__init__.py:158 #, python-format msgid "Attempted to delete a domain which is not present in the backend. ID: %s" msgstr "" -#: designate/central/service.py:842 +#: designate/central/service.py:464 +#, python-format +msgid "" +"Blacklist regex (%(pattern)s) took too long to evaluate against zone name" +" (%(zone_name)s" +msgstr "" + +#: designate/central/service.py:888 msgid "No nameservers configured. Please create at least one nameserver" msgstr "" diff --git a/designate/locale/designate-log-info.pot b/designate/locale/designate-log-info.pot index fe540d3a0..98bb7134a 100644 --- a/designate/locale/designate-log-info.pot +++ b/designate/locale/designate-log-info.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: designate 1.0.0.0b4.dev28\n" +"Project-Id-Version: designate 1.0.0.0rc1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-09-17 06:12+0000\n" +"POT-Creation-Date: 2015-09-24 21:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,17 +42,7 @@ msgstr "" msgid "Sucessfully elected as leader of group %(group)s" msgstr "" -#: designate/dnsutils.py:328 -#, python-format -msgid "Opening TCP Listening Socket on %(host)s:%(port)d" -msgstr "" - -#: designate/dnsutils.py:349 -#, python-format -msgid "Opening UDP Listening Socket on %(host)s:%(port)d" -msgstr "" - -#: designate/dnsutils.py:379 +#: designate/dnsutils.py:339 #, python-format msgid "Doing AXFR for %(name)s from %(host)s" msgstr "" @@ -62,14 +52,24 @@ msgstr "" msgid "Using policy_file found at: %s" msgstr "" -#: designate/service.py:280 +#: designate/service.py:241 msgid "_handle_tcp thread started" msgstr "" -#: designate/service.py:334 +#: designate/service.py:295 msgid "_handle_udp thread started" msgstr "" +#: designate/utils.py:462 +#, python-format +msgid "Opening TCP Listening Socket on %(host)s:%(port)d" +msgstr "" + +#: designate/utils.py:489 +#, python-format +msgid "Opening UDP Listening Socket on %(host)s:%(port)d" +msgstr "" + #: designate/agent/handler.py:56 #, python-format msgid "Agent masters: %(masters)s" @@ -546,25 +546,25 @@ msgstr "" msgid "delete_zone_export: Calling central's delete_zone_export." msgstr "" -#: designate/central/service.py:288 +#: designate/central/service.py:289 msgid "Checking for TLDs" msgstr "" -#: designate/central/service.py:291 +#: designate/central/service.py:292 msgid "NOT checking for TLDs" msgstr "" -#: designate/central/service.py:1096 +#: designate/central/service.py:1130 #, python-format msgid "Serial %(srv_serial)d is not equal to zone's %(serial)d, performing AXFR" msgstr "" -#: designate/central/service.py:1922 +#: designate/central/service.py:1958 #, python-format msgid "Creating zone for %(fip_id)s:%(region)s - %(fip_addr)s zone %(zonename)s" msgstr "" -#: designate/central/service.py:2361 +#: designate/central/service.py:2397 msgid "Target Tenant ID found - using scoped policy" msgstr "" @@ -638,7 +638,7 @@ msgstr "" msgid "perform_zone_xfr: Calling mdns for zone %(zone)s" msgstr "" -#: designate/objects/adapters/base.py:181 +#: designate/objects/adapters/base.py:180 #, python-format msgid "InvalidObject creating %(name)s with values %(values)r" msgstr "" diff --git a/designate/locale/designate.pot b/designate/locale/designate.pot index f73af659a..1e93858e5 100644 --- a/designate/locale/designate.pot +++ b/designate/locale/designate.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: designate 1.0.0.0b4.dev28\n" +"Project-Id-Version: designate 1.0.0.0rc1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-09-17 06:12+0000\n" +"POT-Creation-Date: 2015-09-24 21:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,26 +27,21 @@ msgstr "" msgid "Policy check failed for rule '%(rule)s' on target %(target)s" msgstr "" -#: designate/service.py:91 +#: designate/service.py:90 #, python-format msgid "Starting %(name)s service (version: %(version)s)" msgstr "" -#: designate/service.py:96 +#: designate/service.py:95 #, python-format msgid "Stopping %(name)s service" msgstr "" -#: designate/service.py:207 -#, python-format -msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds" -msgstr "" - -#: designate/service.py:397 +#: designate/service.py:359 msgid "serve() can only be called once" msgstr "" -#: designate/utils.py:444 designate/sqlalchemy/utils.py:112 +#: designate/utils.py:446 designate/sqlalchemy/utils.py:112 msgid "Unknown sort direction, must be 'desc' or 'asc'" msgstr "" diff --git a/designate/locale/en_GB/LC_MESSAGES/designate-log-critical.po b/designate/locale/en_GB/LC_MESSAGES/designate-log-critical.po deleted file mode 100644 index 4cc9ef250..000000000 --- a/designate/locale/en_GB/LC_MESSAGES/designate-log-critical.po +++ /dev/null @@ -1,35 +0,0 @@ -# Translations template for designate. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the designate project. -# -# Translators: -# Andi Chandler , 2014 -# OpenStack Infra , 2015. #zanata -msgid "" -msgstr "" -"Project-Id-Version: designate 1.0.0.0b4.dev28\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-09-17 06:12+0000\n" -"PO-Revision-Date: 2015-01-13 10:24+0000\n" -"Last-Translator: openstackjenkins \n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/" -"designate/language/en_GB/)\n" -"Language: en-GB\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Zanata 3.7.1\n" - -msgid "**** DO NOT USE IN PRODUCTION ****" -msgstr "**** DO NOT USE IN PRODUCTION ****" - -#, python-format -msgid "" -"Attempted to delete a domain which is not present in the backend. ID: %s" -msgstr "" -"Attempted to delete a domain which is not present in the backend. ID: %s" - -msgid "Starting designate testcontext middleware" -msgstr "Starting designate testcontext middleware" diff --git a/designate/locale/fr/LC_MESSAGES/designate-log-critical.po b/designate/locale/fr/LC_MESSAGES/designate-log-critical.po deleted file mode 100644 index fd06fffd5..000000000 --- a/designate/locale/fr/LC_MESSAGES/designate-log-critical.po +++ /dev/null @@ -1,34 +0,0 @@ -# Translations template for designate. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the designate project. -# -# Translators: -# Corina Roe , 2014 -msgid "" -msgstr "" -"Project-Id-Version: Designate\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:26+0000\n" -"PO-Revision-Date: 2015-01-13 22:24+0000\n" -"Last-Translator: openstackjenkins \n" -"Language-Team: French (http://www.transifex.com/openstack/designate/language/" -"fr/)\n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -msgid "**** DO NOT USE IN PRODUCTION ****" -msgstr "**** NE PAS UTILISER EN PRODUCTION ****" - -#, python-format -msgid "" -"Attempted to delete a domain which is not present in the backend. ID: %s" -msgstr "" -"Tentative de suppression d'un domaine non présent dans le serveur principal. " -"ID : %s" - -msgid "Starting designate testcontext middleware" -msgstr "Démarrage de Middleware Testcontext de Designate" diff --git a/designate/locale/fr/LC_MESSAGES/designate-log-error.po b/designate/locale/fr/LC_MESSAGES/designate-log-error.po deleted file mode 100644 index f1935f3ea..000000000 --- a/designate/locale/fr/LC_MESSAGES/designate-log-error.po +++ /dev/null @@ -1,50 +0,0 @@ -# Translations template for designate. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the designate project. -# -# Translators: -# Corina Roe , 2014 -msgid "" -msgstr "" -"Project-Id-Version: Designate\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:26+0000\n" -"PO-Revision-Date: 2015-07-28 15:04+0000\n" -"Last-Translator: openstackjenkins \n" -"Language-Team: French (http://www.transifex.com/openstack/designate/language/" -"fr/)\n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#, python-format -msgid "" -"Error Lines:\n" -"%s" -msgstr "" -"Lignes d'erreurs :\n" -"%s" - -#, python-format -msgid "Failed calling Neutron %(region)s - %(endpoint)s" -msgstr "Échec de l'appel Neutron %(region)s - %(endpoint)s" - -#, python-format -msgid "Failed to deserialize packet from %(host)s:%(port)d" -msgstr "N'a pas pu dé-sérialiser le paquet de %(host)s:%(port)d" - -msgid "Missing context in request, please check." -msgstr "Contexte manquant dans la requête. Veuillez vérifier." - -#, python-format -msgid "Number of errors: %d" -msgstr "Nombre d'erreurs : %d" - -#, python-format -msgid "Unhandled exception while processing request from %(host)s:%(port)d" -msgstr "" -"Exception non prise en charge lors du traitement d'une requête en provenance " -"de %(host)s:%(port)d" diff --git a/designate/locale/fr/LC_MESSAGES/designate-log-info.po b/designate/locale/fr/LC_MESSAGES/designate-log-info.po deleted file mode 100644 index 763087c4c..000000000 --- a/designate/locale/fr/LC_MESSAGES/designate-log-info.po +++ /dev/null @@ -1,249 +0,0 @@ -# Translations template for designate. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the designate project. -# -# Translators: -# Corina Roe , 2014 -msgid "" -msgstr "" -"Project-Id-Version: Designate\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:26+0000\n" -"PO-Revision-Date: 2015-07-28 15:04+0000\n" -"Last-Translator: openstackjenkins \n" -"Language-Team: French (http://www.transifex.com/openstack/designate/language/" -"fr/)\n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -msgid "Checking for TLDs" -msgstr "Vérification des TLD" - -#, python-format -msgid "Create Domain %r" -msgstr "Créer domaine %r" - -#, python-format -msgid "" -"Creating zone for %(fip_id)s:%(region)s - %(fip_addr)s zone %(zonename)s" -msgstr "" -"Créer une zone pour %(fip_id)s:%(region)s - %(fip_addr)s zone %(zonename)s" - -#, python-format -msgid "Delete Domain %r" -msgstr "Suppression du domaine %r" - -#, python-format -msgid "Getting auth pipeline: %s" -msgstr "Obtenir une pipeline d'auth : %s" - -#, python-format -msgid "Importing TLDs from %s" -msgstr "Importation des TLD de %s" - -msgid "NOT checking for TLDs" -msgstr "AUCUNE vérification des TLD" - -#, python-format -msgid "Number of tlds added: %d" -msgstr "Nombre des tlds ajoutés : %d" - -#, python-format -msgid "Opening TCP Listening Socket on %(host)s:%(port)d" -msgstr "Ouverture TCP Listening Socket sur %(host)s:%(port)d" - -#, python-format -msgid "Opening UDP Listening Socket on %(host)s:%(port)d" -msgstr "Ouverture UDP Listening Socket sur %(host)s:%(port)d" - -msgid "Starting designate faultwrapper middleware" -msgstr "Démarrage de Middleware Faultwrapper de Designate" - -msgid "Starting designate keystonecontext middleware" -msgstr "Démarrage de Middleware Keystonecontext de Designate" - -msgid "Starting designate maintenance middleware" -msgstr "Démarrage de Middleware Maintenance de Designate" - -msgid "Starting designate noauthcontext middleware" -msgstr "Démarrage de Middleware Noauthcontext de Designate" - -#, python-format -msgid "Using api-paste-config found at: %s" -msgstr "Utilisation de api-paste-config que l'on trouve à : %s" - -#, python-format -msgid "Using policy_file found at: %s" -msgstr "Utiliser le policy_file trouvé à : %s" - -msgid "_handle_tcp thread started" -msgstr "démarrage du thread _handle_tcp" - -msgid "_handle_udp thread started" -msgstr "démarrage du thread _handle_udp" - -msgid "count_domains: Calling central's count_domains." -msgstr "count_domains: appel de count_domains du central." - -msgid "count_records: Calling central's count_records." -msgstr "count_records: appel de count_records du central." - -msgid "count_recordsets: Calling central's count_recordsets." -msgstr "count_recordsets: appel de count_recordsets du central." - -msgid "count_report: Calling central's count_report." -msgstr "count_report: appel de count_report du central." - -msgid "count_tenants: Calling central's count_tenants." -msgstr "count_tenants: appel de count_tenants du central." - -msgid "create_blacklist: Calling central's create_blacklist" -msgstr "create_blacklist: appel de create_blacklist du central" - -msgid "create_domain: Calling central's create_domain." -msgstr "create_domain: appel de create_domain du central." - -msgid "create_record: Calling central's create_record." -msgstr "create_record: appel de create_record du central." - -msgid "create_recordset: Calling central's create_recordset." -msgstr "create_recordset: appel de create_recordset du central." - -msgid "create_tld: Calling central's create_tld." -msgstr "create_tld: appel de create_tld du central." - -msgid "create_tsigkey: Calling central's create_tsigkey." -msgstr "create_tsigkey: appel de create_tsigkey du central." - -msgid "delete_blacklist: Calling central's delete blacklist." -msgstr "delete_blacklist: appel de delete_blacklist du central" - -msgid "delete_domain: Calling central's delete_domain." -msgstr "delete_domain: appel de delete_domain du central." - -msgid "delete_record: Calling central's delete_record." -msgstr "delete_record: appel de delete_record du central." - -msgid "delete_recordset: Calling central's delete_recordset." -msgstr "delete_recordset: appel de delete_recordset du central." - -msgid "delete_tld: Calling central's delete_tld." -msgstr "delete_tld: appel de delete_tld du central." - -msgid "delete_tsigkey: Calling central's delete_tsigkey." -msgstr "delete_tsigkey: appel de delete_tsigkey du central." - -msgid "find_blacklist: Calling central's find_blacklist." -msgstr "find_blacklist: appel de find_blacklist du central." - -msgid "find_blacklists: Calling central's find_blacklists." -msgstr "find_blacklists: appel de find_blacklists du central." - -msgid "find_domain: Calling central's find_domain." -msgstr "find_domain: appel de find_domain du central." - -msgid "find_domains: Calling central's find_domains." -msgstr "find_domains: appel de find_domains du central." - -msgid "find_record: Calling central's find_record." -msgstr "find_record: appel de find_record du central" - -msgid "find_records: Calling central's find_records." -msgstr "find_records: appel de find_records du central." - -msgid "find_recordset: Calling central's find_recordset." -msgstr "find_recordset: appel de find_recordset du central" - -msgid "find_recordsets: Calling central's find_recordsets." -msgstr "find_recordsets: appel de find_recordsets du central." - -msgid "find_tenants: Calling central's find_tenants." -msgstr "find_tenants: appel de find_tenants du central." - -msgid "find_tlds: Calling central's find_tlds." -msgstr "find_tlds: appel de find_tlds du central." - -msgid "find_tsigkeys: Calling central's find_tsigkeys." -msgstr "find_tsigkeys: appel de find_tsigkeys du central." - -msgid "get_absolute_limits: Calling central's get_absolute_limits." -msgstr "get_absolute_limits: appel de get_absolute_limits du central." - -msgid "get_blacklist: Calling central's get_blacklist." -msgstr "get_blacklist: appel de get_blacklist du central." - -msgid "get_domain: Calling central's get_domain." -msgstr "get_domain: appel de get_domain du central." - -msgid "get_domain_servers: Calling central's get_domain_servers." -msgstr "get_domain_servers: appel de get_domain_servers du central." - -msgid "get_floatingip: Calling central's get_floatingip." -msgstr "get_floatingip: appel de get_floatingip du central." - -msgid "get_quota: Calling central's get_quota." -msgstr "get_quota: appel de get_quota du central." - -msgid "get_quotas: Calling central's get_quotas." -msgstr "get_quotas: appel de get_quotas du central." - -msgid "get_record: Calling central's get_record." -msgstr "get_record: appel de get_record du central." - -msgid "get_recordset: Calling central's get_recordset." -msgstr "get_recordset: appel de get_recordset du central." - -msgid "get_tenant: Calling central's get_tenant." -msgstr "get_tenant: appel de get_tenant du central." - -msgid "get_tld: Calling central's get_tld." -msgstr "get_tld: appel de get_tld du central." - -msgid "get_tsigkey: Calling central's get_tsigkey." -msgstr "get_tsigkey: appel de get_tsigkey du central." - -msgid "list_floatingips: Calling central's list_floatingips." -msgstr "list_floatingips: appel de list_floatingips du central." - -msgid "reset_quotas: Calling central's reset_quotas." -msgstr "reset_quotas: appel de reset_quotas du central." - -msgid "set_quota: Calling central's set_quota." -msgstr "set_quota: appel de set_quota du central." - -msgid "sync_domain: Calling central's sync_domains." -msgstr "sync_domain: appel de sync_domains du central." - -msgid "sync_domains: Calling central's sync_domains." -msgstr "sync_domains: appel de sync_domains du central." - -msgid "sync_record: Calling central's sync_record." -msgstr "sync_record: appel de sync_record du central." - -msgid "touch_domain: Calling central's touch_domain." -msgstr "touch_domain: appel de touch_domain du central." - -msgid "update_blacklist: Calling central's update_blacklist." -msgstr "update_blacklist: appel de update_blacklist du central." - -msgid "update_domain: Calling central's update_domain." -msgstr "update_domain: appel de update_domain du cnetral." - -msgid "update_floatingip: Calling central's update_floatingip." -msgstr "update_floatingip: appel de update_floatingip du central." - -msgid "update_record: Calling central's update_record." -msgstr "update_record: appel de update_record du central." - -msgid "update_recordset: Calling central's update_recordset." -msgstr "update_recordset: appel de update_recordset du central." - -msgid "update_tld: Calling central's update_tld." -msgstr "update_tld: appel de update_tld du central." - -msgid "update_tsigkey: Calling central's update_tsigkey." -msgstr "update_tsigkey: appel de update_tsigkey du central." diff --git a/designate/locale/fr/LC_MESSAGES/designate.po b/designate/locale/fr/LC_MESSAGES/designate.po deleted file mode 100644 index 586e49eb7..000000000 --- a/designate/locale/fr/LC_MESSAGES/designate.po +++ /dev/null @@ -1,54 +0,0 @@ -# French translations for designate. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the designate project. -# -# Translators: -# Corina Roe , 2014 -msgid "" -msgstr "" -"Project-Id-Version: Designate\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:26+0000\n" -"PO-Revision-Date: 2015-06-29 15:01+0000\n" -"Last-Translator: openstackjenkins \n" -"Language-Team: French (http://www.transifex.com/openstack/designate/language/" -"fr/)\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" - -#, python-format -msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds" -msgstr "" -"Impossible de se connecter au %(host)s:%(port)s après un effort d'une durée " -"de 30 secondes" - -#, python-format -msgid "Could not read %s. Re-running with sudo" -msgstr "Impossible de lire %s. Nouvelle exécution avec sudo" - -msgid "Please re-run designate-manage as root." -msgstr "Veuillez exécuter designate-manage à nouveau en tant que root" - -#, python-format -msgid "Policy check failed for rule '%(rule)s' on target %(target)s" -msgstr "" -"Vérification de stratégie ayant échoué pour la règle '%(rule)s' pour la " -"cible %(target)s" - -#, python-format -msgid "Policy check succeeded for rule '%(rule)s' on target %(target)s" -msgstr "" -"Vérification de stratégie réussie pour la règle '%(rule)s' pour la cible " -"%(target)s" - -msgid "Unknown sort direction, must be 'desc' or 'asc'" -msgstr "Direction d'ordonnancement inconnue, choisir 'desc' ou 'asc'" - -msgid "serve() can only be called once" -msgstr "serve() ne peut être appelé qu'une seule fois" - -msgid "sudo failed, continuing as if nothing happened" -msgstr "sudo a échoué, continue comme si de rien n'était" diff --git a/designate/locale/ko_KR/LC_MESSAGES/designate-log-critical.po b/designate/locale/ko_KR/LC_MESSAGES/designate-log-critical.po deleted file mode 100644 index 2017a2fcf..000000000 --- a/designate/locale/ko_KR/LC_MESSAGES/designate-log-critical.po +++ /dev/null @@ -1,34 +0,0 @@ -# Translations template for designate. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the designate project. -# -# Translators: -# Sungjin Kang , 2014 -# OpenStack Infra , 2015. #zanata -msgid "" -msgstr "" -"Project-Id-Version: designate 1.0.0.0b4.dev28\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-09-17 06:12+0000\n" -"PO-Revision-Date: 2015-01-13 10:24+0000\n" -"Last-Translator: openstackjenkins \n" -"Language-Team: Korean (Korea) (http://www.transifex.com/openstack/designate/" -"language/ko_KR/)\n" -"Language: ko-KR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Zanata 3.7.1\n" - -msgid "**** DO NOT USE IN PRODUCTION ****" -msgstr "**** 제품에서는 사용하지 마세요 ****" - -#, python-format -msgid "" -"Attempted to delete a domain which is not present in the backend. ID: %s" -msgstr "백엔드에 존재하지 않는 도메인을 삭제하려고 했습니다. ID: %s" - -msgid "Starting designate testcontext middleware" -msgstr "Designate 테스트 콘텍스트 미들웨어 시작" diff --git a/designate/locale/pt_BR/LC_MESSAGES/designate-log-critical.po b/designate/locale/pt_BR/LC_MESSAGES/designate-log-critical.po deleted file mode 100644 index b62ee2c50..000000000 --- a/designate/locale/pt_BR/LC_MESSAGES/designate-log-critical.po +++ /dev/null @@ -1,34 +0,0 @@ -# Translations template for designate. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the designate project. -# -# Translators: -# Rodrigo Felix de Almeida , 2014 -# OpenStack Infra , 2015. #zanata -msgid "" -msgstr "" -"Project-Id-Version: designate 1.0.0.0b4.dev28\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-09-17 06:12+0000\n" -"PO-Revision-Date: 2015-01-13 10:24+0000\n" -"Last-Translator: openstackjenkins \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/openstack/" -"designate/language/pt_BR/)\n" -"Language: pt-BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Zanata 3.7.1\n" - -msgid "**** DO NOT USE IN PRODUCTION ****" -msgstr "**** NÃO USE EM PRODUÇÃO ****" - -#, python-format -msgid "" -"Attempted to delete a domain which is not present in the backend. ID: %s" -msgstr "Tentado remover um domínio que não está presente no backend. ID: %s" - -msgid "Starting designate testcontext middleware" -msgstr "Iniciando o middleware designate testcontext" diff --git a/designate/locale/pt_BR/LC_MESSAGES/designate-log-error.po b/designate/locale/pt_BR/LC_MESSAGES/designate-log-error.po deleted file mode 100644 index e9d569434..000000000 --- a/designate/locale/pt_BR/LC_MESSAGES/designate-log-error.po +++ /dev/null @@ -1,51 +0,0 @@ -# Translations template for designate. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the designate project. -# -# Translators: -# Rodrigo Felix de Almeida , 2014 -# OpenStack Infra , 2015. #zanata -msgid "" -msgstr "" -"Project-Id-Version: designate 1.0.0.0b4.dev28\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-09-17 06:12+0000\n" -"PO-Revision-Date: 2015-07-28 03:04+0000\n" -"Last-Translator: openstackjenkins \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/openstack/" -"designate/language/pt_BR/)\n" -"Language: pt-BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Zanata 3.7.1\n" - -#, python-format -msgid "" -"Error Lines:\n" -"%s" -msgstr "" -"Linhas de erros:\n" -"%s" - -#, python-format -msgid "Failed calling Neutron %(region)s - %(endpoint)s" -msgstr "Falha ao chamar Neutron %(region)s - %(endpoint)s" - -#, python-format -msgid "Failed to deserialize packet from %(host)s:%(port)d" -msgstr "Falha ao deserializar pacote do %(host)s:%(port)d" - -msgid "Missing context in request, please check." -msgstr "Faltando contexto na requisição, por favor verifique." - -#, python-format -msgid "Number of errors: %d" -msgstr "Número de erros: %d" - -#, python-format -msgid "Unhandled exception while processing request from %(host)s:%(port)d" -msgstr "" -"Exception não-tratada enquanto processando requisição do %(host)s:%(port)d" From bfe79196c9557559f351ae9a854c73ac757051ee Mon Sep 17 00:00:00 2001 From: Endre Karlson Date: Tue, 29 Sep 2015 19:50:32 +0200 Subject: [PATCH 2/2] Fix handling of Pool NS changes Closes-Bug: #1500798 Change-Id: Ie697f35a523a63617ba386f0dcde63600ce5dac6 (cherry picked from commit c59a2a012e61a80ea4d985db04ac29a582c745d1) --- designate/central/service.py | 17 +++++++-- .../tests/unit/test_central/test_basic.py | 38 +++++++++++++++++-- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/designate/central/service.py b/designate/central/service.py index 7c0412c59..c0cde389a 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -609,13 +609,22 @@ class Service(service.RPCService, service.Service): def _add_ns(self, context, zone, ns_record): # Get NS recordset # If the zone doesn't have an NS recordset yet, create one - try: - ns_recordset = self.find_recordset( - context, criterion={'domain_id': zone['id'], 'type': "NS"}) + recordsets = self.find_recordsets( + context, criterion={'domain_id': zone['id'], 'type': "NS"} + ) - except exceptions.RecordSetNotFound: + managed = [] + for rs in recordsets: + if rs.managed: + managed.append(rs) + + if len(managed) == 0: self._create_ns(context, zone, [ns_record]) return + elif len(managed) != 1: + raise exceptions.RecordSetNotFound("No valid recordset found") + + ns_recordset = managed[0] # Add new record to recordset based on the new nameserver ns_recordset.records.append( diff --git a/designate/tests/unit/test_central/test_basic.py b/designate/tests/unit/test_central/test_basic.py index 42c90b904..a67638617 100644 --- a/designate/tests/unit/test_central/test_basic.py +++ b/designate/tests/unit/test_central/test_basic.py @@ -677,9 +677,11 @@ class CentralDomainTestCase(CentralBasic): def test__add_ns_creation(self): self.service._create_ns = Mock() - self.service.find_recordset = Mock( - side_effect=exceptions.RecordSetNotFound + + self.service.find_recordsets = Mock( + return_value=[] ) + self.service._add_ns( self.context, RoObject(id='1'), @@ -690,9 +692,37 @@ class CentralDomainTestCase(CentralBasic): def test__add_ns(self): self.service._update_recordset_in_storage = Mock() - self.service.find_recordset = Mock( - return_value=RoObject(records=[]) + + recordsets = [ + RoObject(records=[], managed=True) + ] + self.service.find_recordsets = Mock( + return_value=recordsets ) + + self.service._add_ns( + self.context, + RoObject(id='1'), + RoObject(name='bar') + ) + ctx, zone, rset = \ + self.service._update_recordset_in_storage.call_args[0] + self.assertEqual(len(rset.records), 1) + self.assertTrue(rset.records[0].managed) + self.assertEqual(rset.records[0].data.name, 'bar') + + def test__add_ns_with_other_ns_rs(self): + self.service._update_recordset_in_storage = Mock() + + recordsets = [ + RoObject(records=[], managed=True), + RoObject(records=[], managed=False) + ] + + self.service.find_recordsets = Mock( + return_value=recordsets + ) + self.service._add_ns( self.context, RoObject(id='1'),