unify some messages

Add missing chars (':', ' ', '=', '.', "is") to some messages
to reduce translation effort by unifying them.

Change-Id: Iab5ee81169dbcee2ca514b696369d2ac53086164
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

glance/api/v1/images.py

@@ -526,7 +526,7 @@ class Controller(controller.BaseController):
             try:
                 backend = store.get_store_from_location(location)
             except store.BadStoreUri:
-                msg = _("Invalid location %s") % location
+                msg = _("Invalid location: %s") % location
                 LOG.warn(msg)
                 raise HTTPBadRequest(explanation=msg,
                                      request=req,
@@ -925,7 +925,7 @@ class Controller(controller.BaseController):
                 self.update_store_acls(req, id, orig_or_updated_loc,
                                        public=is_public)
             except store.BadStoreUri:
-                msg = _("Invalid location %s") % location
+                msg = _("Invalid location: %s") % location
                 LOG.warn(msg)
                 raise HTTPBadRequest(explanation=msg,
                                      request=req,

glance/api/v2/image_members.py

@@ -75,7 +75,7 @@ class ImageMembersController(object):
 
             return new_member
         except exception.NotFound:
-            msg = _("Image %s not found") % image_id
+            msg = _("Image %s not found.") % image_id
             LOG.warning(msg)
             raise webob.exc.HTTPNotFound(explanation=msg)
         except exception.Forbidden:
@@ -119,7 +119,7 @@ class ImageMembersController(object):
             member_repo.save(member)
             return member
         except exception.NotFound:
-            msg = _("Image %s not found") % image_id
+            msg = _("Image %s not found.") % image_id
             LOG.warning(msg)
             raise webob.exc.HTTPNotFound(explanation=msg)
         except exception.Forbidden:
@@ -157,7 +157,7 @@ class ImageMembersController(object):
                 members.append(member)
             return dict(members=members)
         except exception.NotFound:
-            msg = _("Image %s not found") % image_id
+            msg = _("Image %s not found.") % image_id
             LOG.warning(msg)
             raise webob.exc.HTTPNotFound(explanation=msg)
         except exception.Forbidden:
@@ -186,7 +186,7 @@ class ImageMembersController(object):
             member = member_repo.get(member_id)
             return member
         except (exception.NotFound, exception.Forbidden):
-            msg = _("Image %s not found") % image_id
+            msg = _("Image %s not found.") % image_id
             LOG.warning(msg)
             raise webob.exc.HTTPNotFound(explanation=msg)
 
@@ -204,7 +204,7 @@ class ImageMembersController(object):
             member_repo.remove(member)
             return webob.Response(body='', status=204)
         except exception.NotFound:
-            msg = _("Image %s not found") % image_id
+            msg = _("Image %s not found.") % image_id
             LOG.warning(msg)
             raise webob.exc.HTTPNotFound(explanation=msg)
         except exception.Forbidden:

glance/api/v2/image_tags.py

@@ -48,7 +48,7 @@ class Controller(object):
             image.tags.add(tag_value)
             image_repo.save(image)
         except exception.NotFound:
-            msg = _("Image %s not found") % image_id
+            msg = _("Image %s not found.") % image_id
             LOG.warning(msg)
             raise webob.exc.HTTPNotFound(explanation=msg)
         except exception.Forbidden:
@@ -75,7 +75,7 @@ class Controller(object):
             image.tags.remove(tag_value)
             image_repo.save(image)
         except exception.NotFound:
-            msg = _("Image %s not found") % image_id
+            msg = _("Image %s not found.") % image_id
             LOG.warning(msg)
             raise webob.exc.HTTPNotFound(explanation=msg)
         except exception.Forbidden:

glance/api/v2/tasks.py

@@ -134,7 +134,7 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
     def _get_request_body(self, request):
         output = super(RequestDeserializer, self).default(request)
         if 'body' not in output:
-            msg = _('Body expected in request')
+            msg = _('Body expected in request.')
             raise webob.exc.HTTPBadRequest(explanation=msg)
         return output['body']
 

glance/db/simple/api.py

@@ -1986,10 +1986,10 @@ def _is_namespace_visible(context, namespace):
 def _check_namespace_visibility(context, namespace, namespace_name):
     if not _is_namespace_visible(context, namespace):
         msg = ("Forbidding request, metadata definition namespace=%s"
-               " not visible." % namespace_name)
+               " is not visible." % namespace_name)
         LOG.debug(msg)
         emsg = _("Forbidding request, metadata definition namespace=%s"
-                 " not visible.") % namespace_name
+                 " is not visible.") % namespace_name
         raise exception.MetadefForbidden(emsg)
 
 

glance/db/sqlalchemy/metadef_api/namespace.py

@@ -119,10 +119,10 @@ def _get_by_name(context, name, session):
     # Make sure they are allowed to view it.
     if not _is_namespace_visible(context, namespace_rec.to_dict()):
         msg = ("Forbidding request, metadata definition namespace=%s"
-               " not visible." % name)
+               " is not visible." % name)
         LOG.debug(msg)
         emsg = _("Forbidding request, metadata definition namespace=%s"
-                 " not visible.") % name
+                 " is not visible.") % name
         raise exc.MetadefForbidden(emsg)
 
     return namespace_rec

glance/db/sqlalchemy/metadef_api/object.py

@@ -35,7 +35,7 @@ def _get(context, object_id, session):
             .filter_by(id=object_id)
         metadef_object = query.one()
     except sa_orm.exc.NoResultFound:
-        msg = (_("Metadata definition object not found for id %s")
+        msg = (_("Metadata definition object not found for id=%s")
                % object_id)
         LOG.warn(msg)
         raise exc.MetadefObjectNotFound(msg)