Merge branch version/0-37-0-RC1 to adopt changes from PR #2407

Author: as-builds

internal/locale/locales/en-us.yaml

@@ -992,12 +992,16 @@ field_version:
   other: Version
 field_bitwidth:
   other: Bit Width
-commit_message_add_platform:
+commit_message_added_platform:
   other: "Added platform: {{.V0}} {{.V1}}bit {{.V2}}"
+commit_message_updated_platform:
+  other: "Updated platform: {{.V0}} to {{.V1}}"
 commit_message_removed_platform:
   other: "Removed platform: {{.V0}} {{.V1}}bit {{.V2}}"
-commit_message_add_language:
+commit_message_added_language:
   other: "Added language: {{.V0}} {{.V1}}"
+commit_message_updated_language:
+  other: "Updated language: {{.V0}} to {{.V1}}"
 commit_message_removed_language:
   other: "Removed language: {{.V0}} {{.V1}}"
 downloading_artifacts:
@@ -1120,7 +1124,7 @@ package_search_flag_exact-term_description:
   other: Ensures that search results match search term exactly
 package_import_flag_filename_description:
   other: The file to import
-commit_message_add_package:
+commit_message_added_package:
   other: "Added package: {{.V0}}@{{.V1}}"
 commit_message_removed_package:
   other: "Removed package: {{.V0}}"
@@ -2015,7 +2019,7 @@ export_project_statement:
   other: Exporting env for project [ACTIONABLE]{{.V0}}[/RESET] located at [ACTIONABLE]{{.V1}}[/RESET].
 err_rtprogress_outofsync:
   other: |
-    Received events that appear to be out of order. 
+    Received events that appear to be out of order.
     Please report this issue on [ACTIONABLE]{{.V0}}[/RESET] and include your log file at [ACTIONABLE]{{.V1}}[/RESET].
 err_home_not_found:
   other: |

pkg/platform/model/vcs.go

@@ -532,7 +532,7 @@ func CommitPackage(parentCommitID strfmt.UUID, operation Operation, packageName
 	var message string
 	switch operation {
 	case OperationAdded:
-		message = "commit_message_add_package"
+		message = "commit_message_added_package"
 	case OperationUpdated:
 		message = "commit_message_updated_package"
 	case OperationRemoved:
@@ -717,11 +717,11 @@ func languageCommitMessage(op Operation, name, version string) string {
 	var msgL10nKey string
 	switch op {
 	case OperationAdded:
-		msgL10nKey = locale.T("commit_message_add_language")
+		msgL10nKey = "commit_message_added_language"
 	case OperationUpdated:
-		msgL10nKey = locale.T("commit_message_update_language")
+		msgL10nKey = "commit_message_updated_language"
 	case OperationRemoved:
-		msgL10nKey = locale.T("commit_message_remove_language")
+		msgL10nKey = "commit_message_removed_language"
 	}
 
 	return locale.Tr(msgL10nKey, name, version)
@@ -731,11 +731,11 @@ func platformCommitMessage(op Operation, name, version string, word int) string
 	var msgL10nKey string
 	switch op {
 	case OperationAdded:
-		msgL10nKey = locale.T("commit_message_add_platform")
+		msgL10nKey = "commit_message_added_platform"
 	case OperationUpdated:
-		msgL10nKey = locale.T("commit_message_update_platform")
+		msgL10nKey = "commit_message_updated_platform"
 	case OperationRemoved:
-		msgL10nKey = locale.T("commit_message_remove_platform")
+		msgL10nKey = "commit_message_removed_platform"
 	}
 
 	return locale.Tr(msgL10nKey, name, strconv.Itoa(word), version)
@@ -745,13 +745,16 @@ func packageCommitMessage(op Operation, name, version string) string {
 	var msgL10nKey string
 	switch op {
 	case OperationAdded:
-		msgL10nKey = locale.T("commit_message_add_package")
+		msgL10nKey = "commit_message_added_package"
 	case OperationUpdated:
-		msgL10nKey = locale.T("commit_message_update_package")
+		msgL10nKey = "commit_message_updated_package"
 	case OperationRemoved:
-		msgL10nKey = locale.T("commit_message_remove_package")
+		msgL10nKey = "commit_message_removed_package"
 	}
 
+	if version == "" {
+		version = locale.Tl("package_version_auto", "auto")
+	}
 	return locale.Tr(msgL10nKey, name, version)
 }