Apply suggestions from code review

Co-authored-by: per1234 <[email protected]>

Author: cmaglie

cli/upload/upload.go

@@ -68,7 +68,7 @@ func NewCommand() *cobra.Command {
 
 func checkFlagsConflicts(command *cobra.Command, args []string) {
 	if importFile != "" && importDir != "" {
-		feedback.Errorf(tr("error: %[1]s and %[2]s flags cannot be used together", "--input-file", "--input-dir"))
+		feedback.Errorf(tr("error: %s and %s flags cannot be used together", "--input-file", "--input-dir"))
 		os.Exit(errorcodes.ErrBadArgument)
 	}
 }

commands/upload/upload.go

@@ -526,7 +526,7 @@ func determineBuildPathAndSketchName(importFile, importDir string, sk *sketch.Sk
 	// Case 1: importFile flag has been specified
 	if importFile != "" {
 		if importDir != "" {
-			return nil, "", fmt.Errorf(tr("%[1]s and %[2]s cannot be used together", "importFile", "importDir"))
+			return nil, "", fmt.Errorf(tr("%s and %s cannot be used together", "importFile", "importDir"))
 		}
 
 		// We have a path like "path/to/my/build/SketchName.ino.bin". We are going to

i18n/data/en.po

@@ -5,10 +5,6 @@ msgstr ""
 msgid "%[1]s %[2]s Version: %[3]s Commit: %[4]s Date: %[5]s"
 msgstr "%[1]s %[2]s Version: %[3]s Commit: %[4]s Date: %[5]s"
 
-#: commands/upload/upload.go:529
-msgid "%[1]s and %[2]s cannot be used together"
-msgstr "%[1]s and %[2]s cannot be used together"
-
 #: legacy/builder/fail_if_imported_library_is_wrong.go:37
 msgid "%[1]s folder is no longer supported! See %[2]s for more information"
 msgstr "%[1]s folder is no longer supported! See %[2]s for more information"
@@ -37,6 +33,10 @@ msgstr "%[1]s, protocol version: %[2]d"
 msgid "%s already downloaded"
 msgstr "%s already downloaded"
 
+#: commands/upload/upload.go:529
+msgid "%s and %s cannot be used together"
+msgstr "%s and %s cannot be used together"
+
 #: cli/output/rpc_progress.go:76
 msgid "%s downloaded"
 msgstr "%s downloaded"
@@ -133,8 +133,8 @@ msgid "Already installed %s"
 msgstr "Already installed %s"
 
 #: legacy/builder/resolve_library.go:34
-msgid "Alternatives for %s:"
-msgstr "Alternatives for %s:"
+msgid "Alternatives for %[1]s: %[2]s"
+msgstr "Alternatives for %[1]s: %[2]s"
 
 #: cli/lib/search.go:171
 msgid "Architecture: %s"
@@ -2560,8 +2560,8 @@ msgid "error querying Arduino Cloud Api"
 msgstr "error querying Arduino Cloud Api"
 
 #: cli/upload/upload.go:71
-msgid "error: %[1]s and %[2]s flags cannot be used together"
-msgstr "error: %[1]s and %[2]s flags cannot be used together"
+msgid "error: %s and %s flags cannot be used together"
+msgstr "error: %s and %s flags cannot be used together"
 
 #: arduino/resources/install.go:67
 msgid "extracting archive: %s"
@@ -3075,10 +3075,6 @@ msgstr "reading package root dir: %s"
 msgid "reading sketch metadata %[1]s: %[2]s"
 msgstr "reading sketch metadata %[1]s: %[2]s"
 
-#: legacy/builder/wipeout_build_path_if_build_options_changed.go:49
-msgid "rebuilding all"
-msgstr "rebuilding all"
-
 #: commands/upload/upload.go:472
 msgid "recipe not found '%s'"
 msgstr "recipe not found '%s'"
@@ -3313,6 +3309,10 @@ msgstr "writing sketch metadata %[1]s: %[2]s"
 msgid "wrong format in server response"
 msgstr "wrong format in server response"
 
+#: legacy/builder/wipeout_build_path_if_build_options_changed.go:49
+msgid "{0} invalid, rebuilding all"
+msgstr "{0} invalid, rebuilding all"
+
 #: legacy/builder/builder_utils/utils.go:323
 #: legacy/builder/builder_utils/utils.go:329
 #: legacy/builder/builder_utils/utils.go:393

i18n/rice-box.go

@@ -31,7 +31,7 @@ func ResolveLibrary(ctx *types.Context, header string) *libraries.Library {
 
 	logger := ctx.GetLogger()
 	if ctx.Verbose {
-		logger.Println(constants.LOG_LEVEL_INFO, tr("Alternatives for %s:", header), candidates)
+		logger.Println(constants.LOG_LEVEL_INFO, tr("Alternatives for %[1]s: %[2]s", header, candidates))
 		logger.Println(constants.LOG_LEVEL_INFO, fmt.Sprintf("ResolveLibrary(%s)", header))
 		logger.Println(constants.LOG_LEVEL_INFO, fmt.Sprintf("  -> %s: %s", tr("candidates"), candidates))
 	}

legacy/builder/resolve_library.go

@@ -46,7 +46,7 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(ctx *types.Context) error {
 
 	var prevOpts *properties.Map
 	if err := json.Unmarshal([]byte(previousBuildOptionsJson), &prevOpts); err != nil || prevOpts == nil {
-		ctx.GetLogger().Println(constants.LOG_LEVEL_DEBUG, ", "+tr("rebuilding all"), constants.BUILD_OPTIONS_FILE)
+		ctx.GetLogger().Println(constants.LOG_LEVEL_DEBUG, tr("{0} invalid, rebuilding all"), constants.BUILD_OPTIONS_FILE)
 		return doCleanup(ctx.BuildPath)
 	}