Fixed some help text formatting issues

Author: allmightyspiff

docs/main.go

@@ -140,7 +140,7 @@ func getLongHelp(helpString string) string {
 	example_regex := regexp.MustCompile(`(?i)Example:+`)
 	helpString = example_regex.ReplaceAllString(helpString, "**Examples**:\n")
 	// for 'indented-by-two'
-	indent_regex := regexp.MustCompile(`(?m)^\s{2}(\S)`)
+	indent_regex := regexp.MustCompile(`(?m)^ {2}(\S)`)
 	helpString = indent_regex.ReplaceAllString(helpString, "    $1")
 
 	return getFlagHelp(helpString)

plugin/commands/subnet/create.go

@@ -11,7 +11,6 @@ import (
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/utils"
 	"strconv"
 	"strings"
-
 )
 
 type CreateCommand struct {
@@ -24,21 +23,20 @@ type CreateCommand struct {
 }
 
 func NewCreateCommand(sl *metadata.SoftlayerCommand) *CreateCommand {
-    thisCmd := &CreateCommand{
+	thisCmd := &CreateCommand{
 		SoftlayerCommand: sl,
 		NetworkManager:   managers.NewNetworkManager(sl.Session),
 	}
 	cobraCmd := &cobra.Command{
 		Use:   "create" + strings.ToUpper(fmt.Sprintf(" %s %s %s", T("Network"), T("Quantity"), T("VLAN"))),
 		Short: T("Add a new subnet to your account"),
 		Long: T(`Valid quantities vary by type.
-
 	- public IPv4: 4, 8, 16, 32
-	- private IPv4: 4, 8, 16, 32, 64 
+	- private IPv4: 4, 8, 16, 32, 64
 	- public IPv6: 64
 
 EXAMPLE:
-	${COMMAND_NAME} sl subnet create public 16 567 
+	${COMMAND_NAME} sl subnet create public 16 567
 	This command creates a public subnet with 16 IPv4 addresses and places it on vlan with ID 567.`),
 		Args: metadata.ThreeArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {

plugin/i18n/resources/de_DE.all.json

@@ -343,10 +343,6 @@
     "id": "${COMMAND_NAME} sl subnet cancel IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet cancel 12345678 -f\n   This command cancels subnet with ID 12345678 without asking for confirmation.",
     "translation": "${COMMAND_NAME} sl subnet cancel IDENTIFIER [OPTIONEN]\n\nBEISPIEL:\n   ${COMMAND_NAME} sl subnet cancel 12345678 -f\n   Dieser Befehl bricht das Teilnetz mit der ID 12345678 ab, ohne eine Bestätigung anzufordern."
   },
-  {
-    "id": "${COMMAND_NAME} sl subnet create NETWORK QUANTITY VLAN_ID [OPTIONS]\n\t\n\tAdd a new subnet to your account. Valid quantities vary by type.\n\t\n\tType    - Valid Quantities (IPv4)\n  \tpublic  - 4, 8, 16, 32\n  \tprivate - 4, 8, 16, 32, 64\n\n  \tType    - Valid Quantities (IPv6)\n\tpublic  - 64\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet create public 16 567 \n   This command creates a public subnet with 16 IPv4 addresses and places it on vlan with ID 567.",
-    "translation": "${COMMAND_NAME} sl subnet create NETWORK QUANTITY VLAN_ID [OPTIONEN]\n\t\n\tFügt ein neues Teilnetz zu Ihrem Konto hinzu. Die gültigen Mengen sind vom Typ abhängig.\n\t\n\tType    - Valid Quantities (IPv4)\n  \tpublic  - 4, 8, 16, 32\n  \tprivate - 4, 8, 16, 32, 64\n\n  \tType    - Valid Quantities (IPv6)\n\tpublic  - 64\n\nBEISPIEL:\n   ${COMMAND_NAME} sl subnet create public 16 567 \n   Dieser Befehl erstellt ein öffentliches Teilnetz mit 16 IPv4-Adressen und ordnet es im VLAN mit der ID 567 an."
-  },
   {
     "id": "${COMMAND_NAME} sl subnet detail IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet detail 12345678 \n   This command shows detailed information about subnet with ID 12345678, including virtual servers and hardware servers information.",
     "translation": "${COMMAND_NAME} sl subnet detail IDENTIFIER [OPTIONEN]\n\nBEISPIEL:\n   ${COMMAND_NAME} sl subnet detail 12345678 \n   Dieser Befehl zeigt Detailinformationen zum Teilnetz mit der ID 12345678 an, einschließlich virtuellen Servern und Informationen zu Hardware-Servern."
@@ -403,10 +399,6 @@
     "id": "${COMMAND_NAME} sl user detail-edit IDENTIFIER [OPTIONS]\n\nEXAMPLE: \n    ${COMMAND_NAME} sl user detail-edit USER_ID --template '{\"firstName\": \"Test\", \"lastName\": \"Testerson\"}'\n    This command edit a users details.",
     "translation": "${COMMAND_NAME} sl user detail-edit IDENTIFIER [OPTIONEN]\n\nBEISPIEL: \n    ${COMMAND_NAME} sl user detail-edit USER_ID --template '{\"firstName\": \"Test\", \"lastName\": \"Testerson\"}'\n    Mit diesem Befehl werden die Details eines Benutzers bearbeitet."
   },
-  {
-    "id": "${COMMAND_NAME} sl user edit-notifications [OPTIONS] NOTIFICATIONS\n\n\t\tNotification names should be enclosed in quotation marks. Examples:\n\t\t\tslcli user edit-notifications --enable 'Order Approved'\n\t\t\tslcli user edit-notifications --enable 'Order Approved' --enable  'Reload Complete'",
-    "translation": "${COMMAND_NAME} sl user edit-notifications [OPTIONEN] BENACHRICHTIGUNGEN\n\n Benachrichtigungsnamen müssen in Anführungszeichen eingeschlossen werden. Beispiele:\nslcli user edit-notifications --enable 'Bestellung genehmigt'\nslcli user edit-notifications --enable 'Bestellung genehmigt' --enable  'Erneutes Laden abgeschlossen'"
-  },
   {
     "id": "${COMMAND_NAME} sl vlan cancel IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vlan cancel 12345678 -f\n   This command cancels vlan with ID 12345678 without asking for confirmation.",
     "translation": "${COMMAND_NAME} sl vlan cancel IDENTIFIER [OPTIONEN]\n\t\nBEISPIEL:\n   ${COMMAND_NAME} sl vlan cancel 12345678 -f\n   Dieser Befehl bricht das VLAN mit der ID 12345678 ab, ohne eine Bestätigung anzufordern."
@@ -2583,6 +2575,10 @@
     "id": "Edit an SSH key",
     "translation": "SSH-Schlüssel bearbeiten"
   },
+  {
+    "id": "Edit bandwidth pool.",
+    "translation": "Bandbreitenpool bearbeiten. "
+  },
   {
     "id": "Edit by host record, such as www",
     "translation": "Nach Hostdatensatz bearbeiten, z. B. www"
@@ -9915,10 +9911,6 @@
     "id": "drive",
     "translation": "Laufwerk"
   },
-  {
-    "id": "Edit bandwidth pool.",
-    "translation": "Bandbreitenpool bearbeiten. "
-  },
   {
     "id": "either [--label] or [--note] must be specified to edit SSH key.",
     "translation": "Für die Bearbeitung des SSH-Schlüssels muss entweder [--label] oder [--note] angegeben werden."

plugin/i18n/resources/en_US.all.json

@@ -343,10 +343,6 @@
     "id": "${COMMAND_NAME} sl subnet cancel IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet cancel 12345678 -f\n   This command cancels subnet with ID 12345678 without asking for confirmation.",
     "translation": "${COMMAND_NAME} sl subnet cancel IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet cancel 12345678 -f\n   This command cancels subnet with ID 12345678 without asking for confirmation."
   },
-  {
-    "id": "${COMMAND_NAME} sl subnet create NETWORK QUANTITY VLAN_ID [OPTIONS]\n\t\n\tAdd a new subnet to your account. Valid quantities vary by type.\n\t\n\tType    - Valid Quantities (IPv4)\n  \tpublic  - 4, 8, 16, 32\n  \tprivate - 4, 8, 16, 32, 64\n\n  \tType    - Valid Quantities (IPv6)\n\tpublic  - 64\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet create public 16 567 \n   This command creates a public subnet with 16 IPv4 addresses and places it on vlan with ID 567.",
-    "translation": "${COMMAND_NAME} sl subnet create NETWORK QUANTITY VLAN_ID [OPTIONS]\n\t\n\tAdd a new subnet to your account. Valid quantities vary by type.\n\t\n\tType    - Valid Quantities (IPv4)\n  \tpublic  - 4, 8, 16, 32\n  \tprivate - 4, 8, 16, 32, 64\n\n  \tType    - Valid Quantities (IPv6)\n\tpublic  - 64\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet create public 16 567 \n   This command creates a public subnet with 16 IPv4 addresses and places it on vlan with ID 567."
-  },
   {
     "id": "${COMMAND_NAME} sl subnet detail IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet detail 12345678 \n   This command shows detailed information about subnet with ID 12345678, including virtual servers and hardware servers information.",
     "translation": "${COMMAND_NAME} sl subnet detail IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet detail 12345678 \n   This command shows detailed information about subnet with ID 12345678, including virtual servers and hardware servers information."
@@ -403,10 +399,6 @@
     "id": "${COMMAND_NAME} sl user detail-edit IDENTIFIER [OPTIONS]\n\nEXAMPLE: \n    ${COMMAND_NAME} sl user detail-edit USER_ID --template '{\"firstName\": \"Test\", \"lastName\": \"Testerson\"}'\n    This command edit a users details.",
     "translation": "${COMMAND_NAME} sl user detail-edit IDENTIFIER [OPTIONS]\n\nEXAMPLE: \n    ${COMMAND_NAME} sl user detail-edit USER_ID --template '{\"firstName\": \"Test\", \"lastName\": \"Testerson\"}'\n    This command edit a users details."
   },
-  {
-    "id": "${COMMAND_NAME} sl user edit-notifications [OPTIONS] NOTIFICATIONS\n\n\t\tNotification names should be enclosed in quotation marks. Examples:\n\t\t\tslcli user edit-notifications --enable 'Order Approved'\n\t\t\tslcli user edit-notifications --enable 'Order Approved' --enable  'Reload Complete'",
-    "translation": "${COMMAND_NAME} sl user edit-notifications [OPTIONS] NOTIFICATIONS\n\n\t\tNotification names should be enclosed in quotation marks. Examples:\n\t\t\tslcli user edit-notifications --enable 'Order Approved'\n\t\t\tslcli user edit-notifications --enable 'Order Approved' --enable  'Reload Complete'"
-  },
   {
     "id": "${COMMAND_NAME} sl vlan cancel IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vlan cancel 12345678 -f\n   This command cancels vlan with ID 12345678 without asking for confirmation.",
     "translation": "${COMMAND_NAME} sl vlan cancel IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vlan cancel 12345678 -f\n   This command cancels vlan with ID 12345678 without asking for confirmation."
@@ -2583,6 +2575,10 @@
     "id": "Edit an SSH key",
     "translation": "Edit an SSH key"
   },
+  {
+    "id": "Edit bandwidth pool.",
+    "translation": "Edit bandwidth pool."
+  },
   {
     "id": "Edit by host record, such as www",
     "translation": "Edit by host record, such as www"
@@ -6283,6 +6279,10 @@
     "id": "Note: IOPS above 6,000 available only in: https://cloud.ibm.com/docs/BlockStorage?topic=BlockStorage-selectDC",
     "translation": "Note: IOPS above 6,000 available only in: https://cloud.ibm.com/docs/BlockStorage?topic=BlockStorage-selectDC"
   },
+  {
+    "id": "Note: This virtual server will be rebooted once the upgrade order is placed.\nThe instance is halted until the upgrade transaction is completed. However for Network, no reboot is required.\n\nEXAMPLE:\n\t${COMMAND_NAME} sl vs upgrade 12345678 -c 8 -m 8192 --network 1000\n\tThis commands upgrades virtual server instance with ID 12345678 and set number of CPU cores to 8, memory to 8192M, network port speed to 1000 Mbps.",
+    "translation": "Note: This virtual server will be rebooted once the upgrade order is placed.\nThe instance is halted until the upgrade transaction is completed. However for Network, no reboot is required.\n\nEXAMPLE:\n\t${COMMAND_NAME} sl vs upgrade 12345678 -c 8 -m 8192 --network 1000\n\tThis commands upgrades virtual server instance with ID 12345678 and set number of CPU cores to 8, memory to 8192M, network port speed to 1000 Mbps."
+  },
   {
     "id": "Notes",
     "translation": "Notes"
@@ -6291,6 +6291,10 @@
     "id": "Notes to set on the new snapshot",
     "translation": "Notes to set on the new snapshot"
   },
+  {
+    "id": "Notification names should be enclosed in quotation marks.\nEXAMPLE:\n\tslcli user edit-notifications --enable 'Order Approved'\n\tslcli user edit-notifications --enable 'Order Approved' --enable 'Reload Complete'",
+    "translation": "Notification names should be enclosed in quotation marks.\nEXAMPLE:\n\tslcli user edit-notifications --enable 'Order Approved'\n\tslcli user edit-notifications --enable 'Order Approved' --enable 'Reload Complete'"
+  },
   {
     "id": "Notify",
     "translation": "Notify"
@@ -9443,6 +9447,10 @@
     "id": "VPN password to set for this user.",
     "translation": "VPN password to set for this user."
   },
+  {
+    "id": "Valid quantities vary by type.\n\t- public IPv4: 4, 8, 16, 32\n\t- private IPv4: 4, 8, 16, 32, 64\n\t- public IPv6: 64\n\nEXAMPLE:\n\t${COMMAND_NAME} sl subnet create public 16 567\n\tThis command creates a public subnet with 16 IPv4 addresses and places it on vlan with ID 567.",
+    "translation": "Valid quantities vary by type.\n\t- public IPv4: 4, 8, 16, 32\n\t- private IPv4: 4, 8, 16, 32, 64\n\t- public IPv6: 64\n\nEXAMPLE:\n\t${COMMAND_NAME} sl subnet create public 16 567\n\tThis command creates a public subnet with 16 IPv4 addresses and places it on vlan with ID 567."
+  },
   {
     "id": "Value",
     "translation": "Value"
@@ -9947,10 +9955,6 @@
     "id": "drive",
     "translation": "drive"
   },
-  {
-    "id": "Edit bandwidth pool.",
-    "translation": "Edit bandwidth pool."
-  },
   {
     "id": "either [--label] or [--note] must be specified to edit SSH key.",
     "translation": "either [--label] or [--note] must be specified to edit SSH key."

plugin/i18n/resources/es_ES.all.json

@@ -343,10 +343,6 @@
     "id": "${COMMAND_NAME} sl subnet cancel IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet cancel 12345678 -f\n   This command cancels subnet with ID 12345678 without asking for confirmation.",
     "translation": "${COMMAND_NAME} sl subnet cancel IDENTIFIER [OPTIONS]\n\nEJEMPLO:\n   ${COMMAND_NAME} sl subnet cancel 12345678 -f\n   Este mandato cancela la subred con el ID 12345678 sin solicitar confirmación."
   },
-  {
-    "id": "${COMMAND_NAME} sl subnet create NETWORK QUANTITY VLAN_ID [OPTIONS]\n\t\n\tAdd a new subnet to your account. Valid quantities vary by type.\n\t\n\tType    - Valid Quantities (IPv4)\n  \tpublic  - 4, 8, 16, 32\n  \tprivate - 4, 8, 16, 32, 64\n\n  \tType    - Valid Quantities (IPv6)\n\tpublic  - 64\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet create public 16 567 \n   This command creates a public subnet with 16 IPv4 addresses and places it on vlan with ID 567.",
-    "translation": "${COMMAND_NAME} sl subnet create NETWORK QUANTITY VLAN_ID [OPTIONS]\n\t\n\tAñadir una nueva subred a su cuenta. Las cantidades válidas varían según el tipo.\n\t\n\tType    - Valid Quantities (IPv4)\n  \tpublic  - 4, 8, 16, 32\n  \tprivate - 4, 8, 16, 32, 64\n\n  \tType    - Valid Quantities (IPv6)\n\tpublic  - 64\n\nEJEMPLO:\n   ${COMMAND_NAME} sl subnet create public 16 567 \n   Este mandato crea una subred pública con direcciones 16 IPv4 y la coloca en la vlan con el ID 567."
-  },
   {
     "id": "${COMMAND_NAME} sl subnet detail IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl subnet detail 12345678 \n   This command shows detailed information about subnet with ID 12345678, including virtual servers and hardware servers information.",
     "translation": "${COMMAND_NAME} sl subnet detail IDENTIFIER [OPTIONS]\n\nEJEMPLO:\n   ${COMMAND_NAME} sl subnet detail 12345678 \n   Este mandato muestra información detallada sobre la subred con el ID 12345678, incluyendo información de servidores de hardware y servidores virtuales."
@@ -403,10 +399,6 @@
     "id": "${COMMAND_NAME} sl user detail-edit IDENTIFIER [OPTIONS]\n\nEXAMPLE: \n    ${COMMAND_NAME} sl user detail-edit USER_ID --template '{\"firstName\": \"Test\", \"lastName\": \"Testerson\"}'\n    This command edit a users details.",
     "translation": "${COMMAND_NAME} sl user detail-edit IDENTIFIER [OPTIONS]\n\nEJEMPLO: \n    ${COMMAND_NAME} sl user detail-edit USER_ID --template '{\"firstName\": \"Test\", \"lastName\": \"Testerson\"}'\n    Este mandato edita los detalles de un usuario."
   },
-  {
-    "id": "${COMMAND_NAME} sl user edit-notifications [OPTIONS] NOTIFICATIONS\n\n\t\tNotification names should be enclosed in quotation marks. Examples:\n\t\t\tslcli user edit-notifications --enable 'Order Approved'\n\t\t\tslcli user edit-notifications --enable 'Order Approved' --enable  'Reload Complete'",
-    "translation": "${COMMAND_NAME} sl user edit-notifications [OPTIONS] NOTIFICATIONS \n\n Los nombres de notificación deben ir entre comillas. Ejemplos:\nslcli user edit-notifications --enable 'Order Approved'\nslcli user edit-notifications --enable 'Order Approved' --enable  'Reload Complete'"
-  },
   {
     "id": "${COMMAND_NAME} sl vlan cancel IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vlan cancel 12345678 -f\n   This command cancels vlan with ID 12345678 without asking for confirmation.",
     "translation": "${COMMAND_NAME} sl vlan cancel IDENTIFIER [OPTIONS]\n\t\nEJEMPLO:\n   ${COMMAND_NAME} sl vlan cancel 12345678 -f\n   Este mandato cancela la vlan con el ID 12345678 sin solicitar confirmación."
@@ -2583,6 +2575,10 @@
     "id": "Edit an SSH key",
     "translation": "Editar una clave SSH"
   },
+  {
+    "id": "Edit bandwidth pool.",
+    "translation": "editar agrupación de ancho de banda. "
+  },
   {
     "id": "Edit by host record, such as www",
     "translation": "Editar por registro de host, como www"
@@ -9915,10 +9911,6 @@
     "id": "drive",
     "translation": "unidad"
   },
-  {
-    "id": "Edit bandwidth pool.",
-    "translation": "editar agrupación de ancho de banda. "
-  },
   {
     "id": "either [--label] or [--note] must be specified to edit SSH key.",
     "translation": "Se debe especificar [--label] o [--note] para editar la clave SSH."