correct package install error dialog messages (#9834)

DynamoDS · Jul 8, 2019 · fe74bf4 · fe74bf4
1 parent ef55f1b
commit fe74bf4
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/DynamoCore/Properties/Resources.Designer.cs b/src/DynamoCore/Properties/Resources.Designer.cs
diff --git a/src/DynamoCore/Properties/Resources.en-US.resx b/src/DynamoCore/Properties/Resources.en-US.resx
@@ -704,6 +704,6 @@ The input name should be a valid variable name, without spaces. An input type an
     <value>{1} cannot be loaded. 
 Installing it will conflict with one or more node definitions that already exist in {0}, which is currently loaded. 
 To install {1}, Dynamo needs to first uninstall {0}. 
-Restart Dynamo to complete the uninstall, then try and download {1} again.</value>
+Restart Dynamo to complete the uninstall.</value>
   </data>
 </root>
diff --git a/src/DynamoCore/Properties/Resources.resx b/src/DynamoCore/Properties/Resources.resx
@@ -704,6 +704,6 @@ The input name should be a valid variable name, without spaces. An input type an
     <value>{1} cannot be loaded. 
 Installing it will conflict with one or more node definitions that already exist in {0}, which is currently loaded. 
 To install {1}, Dynamo needs to first uninstall {0}. 
-Restart Dynamo to complete the uninstall, then try and download {1} again.</value>
+Restart Dynamo to complete the uninstall.</value>
   </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2203,7 +2203,7 @@ Do you want to install the latest Dynamo update?</value>
     <value>{1} cannot be loaded.
 Installing it will conflict with one or more node definitions that already exist in {0}, which is currently loaded. 
 To install {1}, Dynamo needs to first uninstall {0}. 
-Restart Dynamo to complete the uninstall, then try and download {1} again.
+Restart Dynamo to complete the uninstall.
 
 Uninstall the following packages: {0}?</value>
   </data>

diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2206,7 +2206,7 @@ Want to publish a different package?</value>
     <value>{1} cannot be loaded.
 Installing it will conflict with one or more node definitions that already exist in {0}, which is currently loaded. 
 To install {1}, Dynamo needs to first uninstall {0}. 
-Restart Dynamo to complete the uninstall, then try and download {1} again.
+Restart Dynamo to complete the uninstall.
 
 Uninstall the following packages: {0}?</value>
   </data>

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -468,7 +468,7 @@ private void ClearSearchResults()
 
         private string JoinPackageNames(IEnumerable<Package> pkgs)
         {
-            return String.Join(", ", pkgs.Select(x => x.Name));
+            return String.Join(", ", pkgs.Select(x => x.Name + " " + x.VersionName));
         } 
 
         private void PackageOnExecuted(PackageManagerSearchElement element, PackageVersion version, string downloadPath)