openstack
/
trove
Code Issues Proposed changes

Merge "Correct incorrect i18n of some messages"

This commit is contained in:
Jenkins 2016-09-01 09:59:05 +00:00 committed by Gerrit Code Review
parent 193bcc6b70 b7ba1b43d9
commit 5bb5f62ae1
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trove/common/strategies/cluster/experimental/vertica/taskmanager.py
View File

@ -196,7 +196,7 @@ class VerticaClusterTasks(task_models.ClusterTasks):
db_instance.id)
if self.get_ip(master_instance) in remove_member_ips:
raise RuntimeError(_("Cannot remove master instance!"))
LOG.debug(_("Marking cluster k-safety: %s") % k)
LOG.debug("Marking cluster k-safety: %s" % k)
self.get_guest(master_instance).mark_design_ksafe(k)
self.get_guest(master_instance).shrink_cluster(
remove_member_ips)

2
trove/guestagent/datastore/experimental/postgresql/service/config.py
View File

@ -198,7 +198,7 @@ class PgSqlConfig(PgSqlProcess):
if self.configuration_manager.has_system_override(BACKUP_CFG_OVERRIDE):
return
LOG.info("Applying changes to WAL config for use by base backups")
LOG.info(_("Applying changes to WAL config for use by base backups"))
wal_arch_loc = CONF.postgresql.wal_archive_location
if not os.path.isdir(wal_arch_loc):
raise RuntimeError(_("Cannot enable backup as WAL dir '%s' does "

2
trove/guestagent/strategies/restore/experimental/postgresql_impl.py
View File

@ -171,7 +171,7 @@ class PgBaseBackupIncremental(PgBaseBackup):
metadata = self.storage.load_metadata(location, checksum)
if 'parent_location' in metadata:
LOG.info("Found parent at %s", metadata['parent_location'])
LOG.info(_("Found parent at %s"), metadata['parent_location'])
parent_location = metadata['parent_location']
parent_checksum = metadata['parent_checksum']
self._incremental_restore(parent_location, parent_checksum)

2
trove/module/models.py
View File

@ -139,7 +139,7 @@ class Module(object):
description, tenant_id, datastore,
datastore_version, auto_apply, visible, live_update):
if module_type.lower() not in Modules.VALID_MODULE_TYPES:
LOG.error("Valid module types: %s" % Modules.VALID_MODULE_TYPES)
LOG.error(_("Valid module types: %s") % Modules.VALID_MODULE_TYPES)
raise exception.ModuleTypeNotFound(module_type=module_type)
Module.validate_action(
context, 'create', tenant_id, auto_apply, visible)