Merge pull request #774 from Ramkishor-Chaladi/issue_719

Added a space before ":" in incorrecte, [ICT] A space is missing in French before the colon

Author: allmightyspiff

plugin/commands/tags/delete_test.go

@@ -66,7 +66,7 @@ var _ = Describe("Tags Delete", func() {
 			It("Incorrect Usage", func() {
 				err := testhelpers.RunCobraCommand(cliCommand.Command)
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring("Incorrect Usage"))
+				Expect(err.Error()).To(ContainSubstring("Incorrect Usage: "))
 			})
 		})
 	})

plugin/commands/tags/detail_test.go

@@ -57,7 +57,7 @@ var _ = Describe("Tags Detail", func() {
 			It("Incorrect Usage", func() {
 				err := testhelpers.RunCobraCommand(cliCommand.Command)
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring("Incorrect Usage"))
+				Expect(err.Error()).To(ContainSubstring("Incorrect Usage: "))
 			})
 		})
 		//sl tags list (SLAPI ERROR)

plugin/errors/invalid_usage.go

@@ -19,7 +19,7 @@ func NewInvalidUsageError(message string) *InvalidUsageError {
 
 func (e *InvalidUsageError) Error() string {
 	if e.Message == "" {
-		return T("Incorrect Usage.")
+		return T("Incorrect Usage: ")
 	}
 
 	return T("Incorrect Usage: ") + e.Message

plugin/metadata/args.go

@@ -96,7 +96,7 @@ func ExactArgs(n int) cobra.PositionalArgs {
 // Just one arg
 func OneArgs(cmd *cobra.Command, args []string) error {
 	if len(args) != 1 {
-		return fmt.Errorf("%s: %s", T("Incorrect Usage"), T("This command requires one argument."))
+		return fmt.Errorf("%s%s", T("Incorrect Usage: "), T("This command requires one argument."))
 		// return fmt.Errorf(T("Incorrect Usage: This command requires one argument."))
 	}
 	return nil
@@ -105,23 +105,23 @@ func OneArgs(cmd *cobra.Command, args []string) error {
 // Just two arg
 func TwoArgs(cmd *cobra.Command, args []string) error {
 	if len(args) != 2 {
-		return fmt.Errorf("%s: %s", T("Incorrect Usage"), T("This command requires two arguments."))
+		return fmt.Errorf("%s%s", T("Incorrect Usage: "), T("This command requires two arguments."))
 	}
 	return nil
 }
 
 // Just three arg
 func ThreeArgs(cmd *cobra.Command, args []string) error {
 	if len(args) != 3 {
-		return fmt.Errorf("%s: %s", T("Incorrect Usage"), T("This command requires three arguments."))
+		return fmt.Errorf("%s%s", T("Incorrect Usage: "), T("This command requires three arguments."))
 	}
 	return nil
 }
 
 // Just four arg
 func FourArgs(cmd *cobra.Command, args []string) error {
 	if len(args) != 4 {
-		return fmt.Errorf("%s: %s", T("Incorrect Usage"),T("This command requires four arguments."))
+		return fmt.Errorf("%s%s", T("Incorrect Usage: "), T("This command requires four arguments."))
 	}
 	return nil
 }

plugin/plugin.go

@@ -93,7 +93,7 @@ func (sl *SoftlayerPlugin) Run(context plugin.PluginContext, args []string) {
 	cobraErr := cobraCommand.Execute()
 	if cobraErr != nil {
 		// Since we surpress the help message on errors, lets show the help message if the error is 'unknown flag'
-		helpTextTriggers := []string{"unknown flag", T("Incorrect Usage"), T("Invalid input for")}
+		helpTextTriggers := []string{"unknown flag", T("Incorrect Usage: "), T("Invalid input for")}
 		for _, trigger := range helpTextTriggers {
 			if strings.Contains(fmt.Sprintf("%v", cobraErr), trigger) {
 				realCommand, _, _ := cobraCommand.Find(args)
@@ -214,7 +214,7 @@ func cobraToCLIMeta(topCommand *cobra.Command, namespace string) []plugin.Comman
 func getTopCobraCommand(ui terminal.UI, session *session.Session) *cobra.Command {
 
 	slCommand := metadata.NewSoftlayerCommand(ui, session)
-	helpFlag := false;
+	helpFlag := false
 	cobraCmd := &cobra.Command{
 		Use:          "sl",
 		Short:        T("Manage Classic infrastructure services"),