Fix indentation in create-service help text

- And rearrange translation files to appease i18n4go
cloudfoundry · Jun 10, 2015 · 870ead8 · 870ead8
1 parent 38c010d
commit 870ead8
Show file tree

Hide file tree

Showing 10 changed files with 209 additions and 72 deletions.
diff --git a/cf/commands/service/create_service.go b/cf/commands/service/create_service.go
@@ -1,6 +1,8 @@
 package service
 
 import (
+	"strings"
+
 	"github.com/cloudfoundry/cli/cf/actors/service_builder"
 	"github.com/cloudfoundry/cli/cf/api"
 	"github.com/cloudfoundry/cli/cf/command_metadata"
@@ -38,7 +40,7 @@ func (cmd CreateService) Metadata() command_metadata.CommandMetadata {
    CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE -c '{"name":"value","name":"value"}'
 
    Optionally provide a file containing service-specific configuration parameters in a valid JSON object.
-	 The path to the parameters file can be an absolute or relative path to a file:
+   The path to the parameters file can be an absolute or relative path to a file:
 
    CF_NAME create-service SERVICE_INSTANCE -c PATH_TO_FILE
 

diff --git a/cf/i18n/resources/de_DE.all.json b/cf/i18n/resources/de_DE.all.json
@@ -129,6 +129,11 @@
       "translation": "   Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n\n   CF_NAME bind-service APP_NAME SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n   Optionally provide a file containing service-specific configuration parameters in a valid JSON object. \n   The path to the parameters file can be an absolute or relative path to a file.\n   CF_NAME bind-service APP_NAME SERVICE_INSTANCE -c PATH_TO_FILE\n\n   Example of valid JSON object:\n   {\n      \"cluster_nodes\": {\n         \"count\": 5,\n         \"memory_mb\": 1024\n      }\n   }",
       "modified": true
    },
+   {
+      "id": "   Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n\n   CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n   Optionally provide a file containing service-specific configuration parameters in a valid JSON object.\n   The path to the parameters file can be an absolute or relative path to a file:\n\n   CF_NAME create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n   Example of valid JSON object:\n   {\n      \"cluster_nodes\": {\n         \"count\": 5,\n         \"memory_mb\": 1024\n      }\n   }",
+      "translation": "   Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n\n   CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n   Optionally provide a file containing service-specific configuration parameters in a valid JSON object.\n   The path to the parameters file can be an absolute or relative path to a file:\n\n   CF_NAME create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n   Example of valid JSON object:\n   {\n      \"cluster_nodes\": {\n         \"count\": 5,\n         \"memory_mb\": 1024\n      }\n   }",
+      "modified": false
+   },
    {
       "id": "   OrgAuditor - Read-only access to org info and reports\n",
       "translation": "   OrgAuditor - Read-only access to org info and reports\n",
@@ -650,9 +655,9 @@
       "modified": false
    },
    {
-      "id": "CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE [-c PARAMETERS_AS_JSON] [-t TAGS]\n\n  Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n  CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n  Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n  CF_NAME create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n\u0009Example of valid JSON object:\n  {\n    \"cluster_nodes\": {\n      \"count\": 5,\n      \"memory_mb\": 1024\n    }\n  }\n\nEXAMPLE:\n\u0009Linux/Mac:\n\u0009\u0009CF_NAME create-service db-service silver -c '{\"ram_gb\":4}'\n\n\u0009Windows Command Line\n\u0009\u0009CF_NAME create-service db-service silver -c \"{\\\"ram_gb\\\":4}\"\n\n\u0009Windows PowerShell\n\u0009\u0009CF_NAME create-service db-service silver -c '{\\\"ram_gb\\\":4}'\n\n\u0009CF_NAME create-service db-service silver mydb -c ~/workspace/tmp/instance_config.json\n\n\u0009CF_NAME create-service dbaas silver mydb -t \"list, of, tags\"\n\nTIP:\n   Use 'CF_NAME create-user-provided-service' to make user-provided services available to cf apps",
-      "translation": "CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE [-c PARAMETERS_AS_JSON]\n\n  Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n  CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n  Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n  CF_NAME create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n\u0009Example of valid JSON object:\n  {\n    \"cluster_nodes\": {\n      \"count\": 5,\n      \"memory_mb\": 1024\n    }\n  }\n\nEXAMPLE:\n\u0009Linux/Mac:\n\u0009\u0009CF_NAME create-service db-service silver -c '{\"ram_gb\":4}'\n\n\u0009Windows Command Line\n\u0009\u0009CF_NAME create-service db-service silver -c \"{\\\"ram_gb\\\":4}\"\n\n\u0009Windows PowerShell\n\u0009\u0009CF_NAME create-service db-service silver -c '{\\\"ram_gb\\\":4}'\n\n\u0009CF_NAME create-service db-service silver mydb -c ~/workspace/tmp/instance_config.json\n\nTIP:\n   Use 'CF_NAME create-user-provided-service' to make user-provided services available to cf apps",
-      "modified": true
+      "id": "CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE [-c PARAMETERS_AS_JSON] [-t TAGS]",
+      "translation": "CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE [-c PARAMETERS_AS_JSON] [-t TAGS]",
+      "modified": false
    },
    {
       "id": "CF_NAME create-service-auth-token LABEL PROVIDER TOKEN",
@@ -1889,6 +1894,11 @@
       "translation": "EXAMPLE:\n   Linux/Mac:\n      CF_NAME bind-service myapp mydb -c '{\"permissions\":\"read-only\"}'\n\n   Windows Command Line:\n      CF_NAME bind-service myapp mydb -c \"{\\\"permissions\\\":\\\"read-only\\\"}\"\n\n   Windows PowerShell:\n      CF_NAME bind-service myapp mydb -c '{\\\"permissions\\\":\\\"read-only\\\"}'\n\u0009\n   CF_NAME bind-service myapp mydb -c ~/workspace/tmp/instance_config.json",
       "modified": false
    },
+   {
+      "id": "EXAMPLE:\n   Linux/Mac:\n      CF_NAME create-service db-service silver -c '{\"ram_gb\":4}'\n\n   Windows Command Line:\n      CF_NAME create-service db-service silver -c \"{\\\"ram_gb\\\":4}\"\n\n   Windows PowerShell:\n      CF_NAME create-service db-service silver -c '{\\\"ram_gb\\\":4}'\n\n   CF_NAME create-service db-service silver mydb -c ~/workspace/tmp/instance_config.json\n\n   CF_NAME create-service dbaas silver mydb -t \"list, of, tags\"",
+      "translation": "EXAMPLE:\n   Linux/Mac:\n      CF_NAME create-service db-service silver -c '{\"ram_gb\":4}'\n\n   Windows Command Line:\n      CF_NAME create-service db-service silver -c \"{\\\"ram_gb\\\":4}\"\n\n   Windows PowerShell:\n      CF_NAME create-service db-service silver -c '{\\\"ram_gb\\\":4}'\n\n   CF_NAME create-service db-service silver mydb -c ~/workspace/tmp/instance_config.json\n\n   CF_NAME create-service dbaas silver mydb -t \"list, of, tags\"",
+      "modified": false
+   },
    {
       "id": "Enable CF_TRACE output for all requests and responses",
       "translation": "Enable CF_TRACE output for all requests and responses",
@@ -2159,6 +2169,11 @@
       "translation": "Error zipping application",
       "modified": false
    },
+   {
+      "id": "Error {{.ErrorDescription}} is being passed in as the argument for 'Position' but 'Position' requires an integer.  For more syntax help, see `cf create-buildpack -h`.",
+      "translation": "Error {{.ErrorDescription}} is being passed in as the argument for 'Position' but 'Position' requires an integer.  For more syntax help, see `cf create-buildpack -h`.",
+      "modified": false
+   },
    {
       "id": "Error: No name found for app",
       "translation": "Error: No name found for app",
@@ -2729,11 +2744,6 @@
       "translation": "Invalid memory limit: {{.Memory}}\n{{.ErrorDescription}}",
       "modified": false
    },
-   {
-      "id": "Error {{.ErrorDescription}} is being passed in as the argument for 'Position' but 'Position' requires an integer.  For more syntax help, see `cf create-buildpack -h`.",
-      "translation": "Error {{.ErrorDescription}} is being passed in as the argument for 'Position' but 'Position' requires an integer.  For more syntax help, see `cf create-buildpack -h`.",
-      "modified": false
-   },
    {
       "id": "Invalid timeout param: {{.Timeout}}\n{{.Err}}",
       "translation": "Invalid timeout param: {{.Timeout}}\n{{.Err}}",
@@ -4134,6 +4144,11 @@
       "translation": "TIP:\n",
       "modified": false
    },
+   {
+      "id": "TIP:\n   Use 'CF_NAME create-user-provided-service' to make user-provided services available to cf apps",
+      "translation": "TIP:\n   Use 'CF_NAME create-user-provided-service' to make user-provided services available to cf apps",
+      "modified": false
+   },
    {
       "id": "TIP: Changes will not apply to existing running applications until they are restarted.",
       "translation": "TIP: Changes will not apply to existing running applications until they are restarted.",

diff --git a/cf/i18n/resources/en_US.all.json b/cf/i18n/resources/en_US.all.json
@@ -129,6 +129,11 @@
       "translation": "   Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n\n   CF_NAME bind-service APP_NAME SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n   Optionally provide a file containing service-specific configuration parameters in a valid JSON object. \n   The path to the parameters file can be an absolute or relative path to a file.\n   CF_NAME bind-service APP_NAME SERVICE_INSTANCE -c PATH_TO_FILE\n\n   Example of valid JSON object:\n   {\n      \"permissions\": \"read-only\"\n   }",
       "modified": false
    },
+   {
+      "id": "   Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n\n   CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n   Optionally provide a file containing service-specific configuration parameters in a valid JSON object.\n   The path to the parameters file can be an absolute or relative path to a file:\n\n   CF_NAME create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n   Example of valid JSON object:\n   {\n      \"cluster_nodes\": {\n         \"count\": 5,\n         \"memory_mb\": 1024\n      }\n   }",
+      "translation": "   Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n\n   CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n   Optionally provide a file containing service-specific configuration parameters in a valid JSON object.\n   The path to the parameters file can be an absolute or relative path to a file:\n\n   CF_NAME create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n   Example of valid JSON object:\n   {\n      \"cluster_nodes\": {\n         \"count\": 5,\n         \"memory_mb\": 1024\n      }\n   }",
+      "modified": false
+   },
    {
       "id": "   OrgAuditor - Read-only access to org info and reports\n",
       "translation": "   OrgAuditor - Read-only access to org info and reports\n",
@@ -650,8 +655,8 @@
       "modified": false
    },
    {
-      "id": "CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE [-c PARAMETERS_AS_JSON] [-t TAGS]\n\n  Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n  CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n  Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n  CF_NAME create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n\u0009Example of valid JSON object:\n  {\n    \"cluster_nodes\": {\n      \"count\": 5,\n      \"memory_mb\": 1024\n    }\n  }\n\nEXAMPLE:\n\u0009Linux/Mac:\n\u0009\u0009CF_NAME create-service db-service silver -c '{\"ram_gb\":4}'\n\n\u0009Windows Command Line\n\u0009\u0009CF_NAME create-service db-service silver -c \"{\\\"ram_gb\\\":4}\"\n\n\u0009Windows PowerShell\n\u0009\u0009CF_NAME create-service db-service silver -c '{\\\"ram_gb\\\":4}'\n\n\u0009CF_NAME create-service db-service silver mydb -c ~/workspace/tmp/instance_config.json\n\n\u0009CF_NAME create-service dbaas silver mydb -t \"list, of, tags\"\n\nTIP:\n   Use 'CF_NAME create-user-provided-service' to make user-provided services available to cf apps",
-      "translation": "CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE [-c PARAMETERS_AS_JSON] [-t TAGS]\n\n  Optionally provide service-specific configuration parameters in a valid JSON object in-line:\n  CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n  Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n  CF_NAME create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n\u0009Example of valid JSON object:\n  {\n    \"cluster_nodes\": {\n      \"count\": 5,\n      \"memory_mb\": 1024\n    }\n  }\n\nEXAMPLE:\n\u0009Linux/Mac:\n\u0009\u0009CF_NAME create-service db-service silver -c '{\"ram_gb\":4}'\n\n\u0009Windows Command Line\n\u0009\u0009CF_NAME create-service db-service silver -c \"{\\\"ram_gb\\\":4}\"\n\n\u0009Windows PowerShell\n\u0009\u0009CF_NAME create-service db-service silver -c '{\\\"ram_gb\\\":4}'\n\n\u0009CF_NAME create-service db-service silver mydb -c ~/workspace/tmp/instance_config.json\n\n\u0009CF_NAME create-service dbaas silver mydb -t \"list, of, tags\"\n\nTIP:\n   Use 'CF_NAME create-user-provided-service' to make user-provided services available to cf apps",
+      "id": "CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE [-c PARAMETERS_AS_JSON] [-t TAGS]",
+      "translation": "CF_NAME create-service SERVICE PLAN SERVICE_INSTANCE [-c PARAMETERS_AS_JSON] [-t TAGS]",
       "modified": false
    },
    {
@@ -1889,6 +1894,11 @@
       "translation": "EXAMPLE:\n   Linux/Mac:\n      CF_NAME bind-service myapp mydb -c '{\"permissions\":\"read-only\"}'\n\n   Windows Command Line:\n      CF_NAME bind-service myapp mydb -c \"{\\\"permissions\\\":\\\"read-only\\\"}\"\n\n   Windows PowerShell:\n      CF_NAME bind-service myapp mydb -c '{\\\"permissions\\\":\\\"read-only\\\"}'\n\u0009\n   CF_NAME bind-service myapp mydb -c ~/workspace/tmp/instance_config.json",
       "modified": false
    },
+   {
+      "id": "EXAMPLE:\n   Linux/Mac:\n      CF_NAME create-service db-service silver -c '{\"ram_gb\":4}'\n\n   Windows Command Line:\n      CF_NAME create-service db-service silver -c \"{\\\"ram_gb\\\":4}\"\n\n   Windows PowerShell:\n      CF_NAME create-service db-service silver -c '{\\\"ram_gb\\\":4}'\n\n   CF_NAME create-service db-service silver mydb -c ~/workspace/tmp/instance_config.json\n\n   CF_NAME create-service dbaas silver mydb -t \"list, of, tags\"",
+      "translation": "EXAMPLE:\n   Linux/Mac:\n      CF_NAME create-service db-service silver -c '{\"ram_gb\":4}'\n\n   Windows Command Line:\n      CF_NAME create-service db-service silver -c \"{\\\"ram_gb\\\":4}\"\n\n   Windows PowerShell:\n      CF_NAME create-service db-service silver -c '{\\\"ram_gb\\\":4}'\n\n   CF_NAME create-service db-service silver mydb -c ~/workspace/tmp/instance_config.json\n\n   CF_NAME create-service dbaas silver mydb -t \"list, of, tags\"",
+      "modified": false
+   },
    {
       "id": "Enable CF_TRACE output for all requests and responses",
       "translation": "Enable CF_TRACE output for all requests and responses",
@@ -2159,6 +2169,11 @@
       "translation": "Error zipping application",
       "modified": false
    },
+   {
+      "id": "Error {{.ErrorDescription}} is being passed in as the argument for 'Position' but 'Position' requires an integer.  For more syntax help, see `cf create-buildpack -h`.",
+      "translation": "Error {{.ErrorDescription}} is being passed in as the argument for 'Position' but 'Position' requires an integer.  For more syntax help, see `cf create-buildpack -h`.",
+      "modified": false
+   },
    {
       "id": "Error: No name found for app",
       "translation": "Error: No name found for app",
@@ -2729,11 +2744,6 @@
       "translation": "Invalid memory limit: {{.Memory}}\n{{.ErrorDescription}}",
       "modified": false
    },
-   {
-      "id": "Error {{.ErrorDescription}} is being passed in as the argument for 'Position' but 'Position' requires an integer.  For more syntax help, see `cf create-buildpack -h`.",
-      "translation": "Error {{.ErrorDescription}} is being passed in as the argument for 'Position' but 'Position' requires an integer.  For more syntax help, see `cf create-buildpack -h`.",
-      "modified": false
-   },
    {
       "id": "Invalid timeout param: {{.Timeout}}\n{{.Err}}",
       "translation": "Invalid timeout param: {{.Timeout}}\n{{.Err}}",
@@ -4134,6 +4144,11 @@
       "translation": "TIP:\n",
       "modified": false
    },
+   {
+      "id": "TIP:\n   Use 'CF_NAME create-user-provided-service' to make user-provided services available to cf apps",
+      "translation": "TIP:\n   Use 'CF_NAME create-user-provided-service' to make user-provided services available to cf apps",
+      "modified": false
+   },
    {
       "id": "TIP: Changes will not apply to existing running applications until they are restarted.",
       "translation": "TIP: Changes will not apply to existing running applications until they are restarted.",