address comments.

Author: sergey-shandar

src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs

@@ -583,4 +583,15 @@ The file needs to be a PowerShell script (.ps1 or .psm1) or a ZIP archive (.zip)
     <value>Use '{0}' to connect to the VMSS instances.</value>
     <comment>{0} = connection string</comment>
   </data>
+  <data name="ComputeInvalidImageName" xml:space="preserve">
+    <value>Invalid image resource id '{0}'.</value>
+    <comment>{0} = image resource id</comment>
+  </data>
+  <data name="ComputeMismatchSubscription" xml:space="preserve">
+    <value>The image subscription doesn't match the current subscription.</value>
+  </data>
+  <data name="ComputeNoImageFound" xml:space="preserve">
+    <value>Can't find the image '{0}'.</value>
+    <comment>{0} = image name</comment>
+  </data>
 </root>

src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx

@@ -84,12 +84,12 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(
                     location, image.Publisher, image.Offer, image.Sku, image.Version);
                 return new ImageAndOsType(imageModel.OsDiskImage.OperatingSystem, image);
             }
-            if (imageName.Contains("/"))
+            else if (imageName.Contains("/"))
             {
                 var imageArray = imageName.Split('/');
                 if (imageArray.Length != 9)
                 {
-                    throw new ArgumentException("Invalid image resource id  '" + imageName + "'.");
+                    throw new ArgumentException(string.Format(Resources.ComputeInvalidImageName, imageName));
                 }
                 // has to be ""
                 var empty = imageArray[0];
@@ -114,12 +114,12 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(
                     || providerNamespace != ComputeStrategy.Namespace
                     || provider != "images")
                 {
-                    throw new ArgumentException("Invalid image resource id '" + imageName + "'.");
+                    throw new ArgumentException(string.Format(Resources.ComputeInvalidImageName, imageName));
                 }
 
                 if (compute.SubscriptionId != subscriptionId)
                 {
-                    throw new ArgumentException("The image subscription doesn't match the current subscription.");
+                    throw new ArgumentException(Resources.ComputeMismatchSubscription);
                 }
 
                 var localImage = await compute.Images.GetAsync(imageResourceGroupName, resourceName);
@@ -156,8 +156,7 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(
 
                 if (result == null)
                 {
-                    // TODO: move it to resource.
-                    throw new ArgumentException("Can't find the image '" + imageName + "'");
+                    throw new ArgumentException(string.Format(Resources.ComputeNoImageFound, imageName));
                 }
 
                 return result;