Remove intl/en/messages.json and proof read strings

Author: Setogit

.gitignore

@@ -14,3 +14,4 @@ intl/pt
 intl/ru
 intl/zh-Hans
 intl/zh-Hant
+intl/en/*.json

bin/sl-deploy.js

@@ -8,8 +8,8 @@ var defaults = require('strong-url-defaults');
 var defaultPackagePath = require('../lib/package').getPackagePath;
 var deploy = require('../');
 var fs = require('fs');
-var getPackageInfo = require('../lib/package').getPackageInfo;
 var g = require('strong-globalize');
+var getPackageInfo = require('../lib/package').getPackageInfo;
 var maybeTunnel = require('strong-tunnel');
 var path = require('path');
 
@@ -82,8 +82,8 @@ serviceName = serviceName || (packageInfo ? packageInfo.name : null);
 if (!serviceName) {
   g.error(
      'Unable to detect service name, {{package.json}} ' +
-     'has no "name" property.\n' +
-     'Please update your package.json or specify a service name.\n' +
+     'has no "{{name}}" property.\n' +
+     'Please update your {{package.json}} or specify a service name.\n' +
      'See {{`%s --help`}} for more details.', $0
    );
   process.exit(1);

intl/en/messages.json

@@ -15,35 +15,21 @@ Arguments:
 
     Defaults to the name of the application specified in the {{package.json}} file.
 
-    If a service with that name is not available on the process manager,
-    a new service will be created and the application will be deployed.
-
-  {{URL}}: The URL of the StrongLoop process manager.
-
-    Defaults to `{{http://localhost:8701}}`. If a URL is provided, both the host
-    and port is optional, they default to `{{localhost}}` and 8701, respectively.
-    If the server requires authentication, the credentials must be part of the
-    URL, see examples.
-
-    URL may also use the `{{http+ssh://}}` protocol which will connect using ssh
-    and then tunnel the http requests over that connection. The ssh username
-    will default to your current user and authentication defaults to using your
-    current ssh-agent. The {{username}} can be overridden by setting an `{{SSH_USER}}`
-    environment variable. The authentication can be overridden to use an
-    existing private key instead of an agent by setting the `SSH_KEY`
-    environment variable to the path of the private key to be used. The port
-    used for ssh can be overridden by setting an `{{SSH_PORT}}` environment
-    variable.
+    If a service with that name is not available on the process manager, a new service will be created and the application will be deployed.
+
+  {{URL}}: The {{URL}} of the StrongLoop process manager.
+
+    Defaults to `{{http://localhost:8701}}`. If a {{URL}} is provided, both the host and port is optional, they default to `{{localhost}}` and 8701, respectively. If the server requires authentication, the credentials must be part of the URL, see examples.
+
+    URL may also use the `{{http+ssh://}}` protocol which will connect using {{ssh}} and then tunnel the http requests over that connection. The {{ssh username}} will default to your current user and authentication defaults to using your current {{ssh-agent}}. The {{username}} can be overridden by setting an `{{SSH_USER}}` environment variable. The authentication can be overridden to use an existing private key instead of an agent by setting the `{{SSH_KEY}}` environment variable to the path of the private key to be used. The port used for ssh can be overridden by setting an `{{SSH_PORT}}` environment ariable.
 
   {{PACK}}: Deploy an {{NPM package/tarball}}.
 
   {{BRANCH}}: Deploy a {{git}} branch.
 
-Default behaviour is to deploy to `{{http://localhost:8701}}`. An {{npm}} package from
-the parent directory is deployed, if one is found for the current application
-version, otherwise the {{git}} branch `{{deploy}}` is deployed.
+Default behaviour is to deploy to `{{http://localhost:8701}}`. An {{npm}} package from the parent directory is deployed, if one is found for the current application version, otherwise the {{git}} branch `{{deploy}}` is deployed.
 
-Note that if {{PACK}} or {{BRANCH}} is specified, URL *must* be specified as well.
+Note that if {{PACK}} or {{BRANCH}} is specified, {{URL}} *must* be specified as well.
 
 Examples:
 

intl/en/sl-deploy.txt

@@ -48,7 +48,7 @@ function isValidGitURL(workingDir, url, callback) {
     if (err) {
       debug(err);
       if (urlFormat(urlParse(url)) !== url) {
-        g.error('URL `%s` is not valid', url);
+        g.error('{{URL}} `%s` is not valid', url);
       }
       err = g.Error('invalid url');
     }

lib/git.js

@@ -23,17 +23,17 @@ function _performLocalDeployment(service, baseURL, what, callback) {
 
   var postURL = url.parse(baseURL);
   if (postURL.protocol !== 'http:') {
-    g.error('Invalid URL `%s`. Only http:// URLs are supported.',
+    g.error('Invalid {{URL}} `%s`. Only {{http:// URLs}} are supported.',
       baseURL
     );
-    return callback(g.Error('Invalid URL'));
+    return callback(g.Error('Invalid {{URL}}'));
   }
 
   if (postURL.hostname) {
     if (postURL.hostname !== 'localhost' && postURL.hostname !== '127.0.0.1') {
-      g.error('Invalid URL `%s`. Only {{localhost}} URLs are supported.',
+      g.error('Invalid {{URL}} `%s`. Only {{localhost}} URLs are supported.',
         baseURL);
-      return callback(g.Error('Invalid URL'));
+      return callback(g.Error('Invalid {{URL}}'));
     }
   }
 
@@ -65,7 +65,7 @@ function _performLocalDeployment(service, baseURL, what, callback) {
         return callback(null, service);
       }
       console.error('%s', msg);
-      callback(g.Error('HTTP error %s', res.statusCode));
+      callback(g.Error('{{HTTP}} error %s', res.statusCode));
     }));
   });
 

lib/post-json.js

@@ -27,10 +27,10 @@ function _performHttpPutDeployment(service, baseURL, npmPkg, callback) {
 
   var postURL = url.parse(baseURL);
   if (postURL.protocol !== 'http:') {
-    g.error('Invalid URL `%s`. Only http:// URLs are supported.',
+    g.error('Invalid {{URL}} `%s`. Only {{http:// URLs}} are supported.',
       baseURL
     );
-    return callback(g.Error('Invalid URL'));
+    return callback(g.Error('Invalid {{URL}}'));
   }
 
   var postOptions = {
@@ -49,11 +49,11 @@ function _performHttpPutDeployment(service, baseURL, npmPkg, callback) {
       }
 
       if (res.statusCode === 401 || res.statusCode === 403) {
-        g.error('Valid credentials must be given in the URL.');
+        g.error('Valid credentials must be given in the {{URL}}.');
       } else {
         console.error('%s', msg);
       }
-      callback(g.Error('HTTP error %s', res.statusCode));
+      callback(g.Error('{{HTTP}} error %s', res.statusCode));
     }));
   });