Update comments and docs

docs/commands/glossary-delete.md

@@ -0,0 +1,21 @@
+To delete glossary entry in Zanata, the command-line client's `glossary-delete` command can be used.
+
+```bash
+zanata-cli glossary-delete --id 1005
+```
+
+This command will:
+
+1. Look up the server config from `zanata.xml`.
+2. Delete glossary entry with id `1005`
+
+To delete all glossary in Zanata
+
+```bash
+zanata-cli glossary-delete --all
+```
+
+To see all options available for `glossary-delete` option:
+```bash
+zanata-cli help glossary-delete
+```

docs/commands/glossary-pull.md

@@ -10,14 +10,14 @@ This command will:
 2. Download all glossary entries in server
 3. The file will be in `.csv` format. (default)
 
-To download different as format, use the `--file-type` options (csv or po). 
+To download in different format, use the `--file-type` options (csv or po). 
 For example:
 
 ```bash
 zanata-cli glossary-pull --file-type po
 ```
 
-To download only few locales for `--file-type po`, use the ` --trans-lang` options. 
+To download only specific locales for `--file-type po`, use the ` --trans-lang` options. 
 For example to download `de` and `fr` locales only:
 
 ```bash

mkdocs.yml

@@ -21,6 +21,7 @@ pages:
   - pull: 'commands/pull.md'
   - glossary-push: 'commands/glossary-push.md'
   - glossary-pull: 'commands/glossary-pull.md'
+  - glossary-delete: 'commands/glossary-delete.md'
 - Maven Plugin:
   - Installation: 'maven-plugin/installation.md'
   - Configuration: 'maven-plugin/configuration.md'

zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteOptionsImpl.java

@@ -27,7 +27,7 @@ public void setId(String id) {
     }
 
     @Option(name = "--all", metaVar = "ALL",
-        usage = "Delete entire glossaries in server. Default: false")
+        usage = "Delete entire glossaries from the server. Default: false")
     public void setAllGlossary(boolean allGlossary) {
         this.allGlossary = allGlossary;
     }
@@ -44,6 +44,6 @@ public String getCommandName() {
 
     @Override
     public String getCommandDescription() {
-        return "Delete glossary entry in Zanata";
+        return "Delete glossary entries in Zanata";
     }
 }

zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/pull/GlossaryPullOptionsImpl.java

@@ -20,7 +20,7 @@ public class GlossaryPullOptionsImpl extends ConfigurableGlossaryOptionsImpl
 
     @Option(name = "--file-type", metaVar = "(CSV or PO)",
         usage = "File type to be downloaded.\n" +
-            "csv - csv file format with comma separated\n" +
+            "csv (default) - csv file format with comma separated\n" +
             "po - a zip file of po files on available locales")
     public void setFileType(String fileType) {
         this.fileType = fileType;

zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java

@@ -95,7 +95,7 @@ private String validateFileExtensionWithTransLang() throws RuntimeException {
         if (fileExtension.equals("po")
                 && StringUtils.isBlank(getOpts().getTransLang())) {
             throw new RuntimeException(
-                    "Option 'zanata.transLang' is required for this file type.");
+                    "Option '--trans-lang' is required for this file type.");
         }
         return fileExtension;
     }
@@ -113,21 +113,21 @@ public void run() throws Exception {
 
         if (glossaryFile == null) {
             throw new RuntimeException(
-                    "Need to specify file to push. Use --file to specify file to upload.");
+                    "Option '--file' is required.");
         }
         if (!glossaryFile.exists()) {
             throw new RuntimeException("File '" + glossaryFile
-                    + "' does not exist - check file option");
+                    + "' does not exist. Check '--file' option");
         }
 
         if (getOpts().getSourceLang() == null
                 || getOpts().getSourceLang().length() < 0) {
             throw new RuntimeException(
-                    "Need to specify source language. Use --src-lang to specify the source language.");
+                    "Option '--src-lang' is required for source language.");
         }
 
         if (getOpts().getBatchSize() <= 0) {
-            throw new RuntimeException("Batch size needs to be 1 or more.");
+            throw new RuntimeException("Option '--batch-size' needs to be 1 or more.");
         }
 
         String fileExtension = validateFileExtensionWithTransLang();

zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushOptions.java

@@ -6,6 +6,9 @@
 import org.zanata.client.commands.ConfigurableOptions;
 
 public interface GlossaryPushOptions extends ConfigurableGlossaryOptions {
+    public String DEFAULT_SOURCE_LANG = "en-US";
+    public int DEFAULT_BATCH_SIZE = 50;
+
     public File getFile();
 
     public String getSourceLang();

zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushOptionsImpl.java

@@ -13,12 +13,12 @@ public class GlossaryPushOptionsImpl extends ConfigurableGlossaryOptionsImpl
         implements GlossaryPushOptions {
 
     private File file;
-    private String sourceLang;
+    private String sourceLang = DEFAULT_SOURCE_LANG;
     private String transLang;
-    private int batchSize;
+    private int batchSize = DEFAULT_BATCH_SIZE;
 
     @Option(name = "--file",
-            usage = "Location path for the glossary file.")
+            usage = "Location path for the glossary file.", required = true)
     public void setFile(File file) {
         this.file = file;
     }

zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryPushMojo.java

@@ -42,7 +42,7 @@ public class GlossaryPushMojo extends GlossaryMojo<GlossaryPushOptions>
      *
      * @parameter expression="${zanata.sourceLang}" default-value="en-US"
      */
-    private String sourceLang = "en-US";
+    private String sourceLang = DEFAULT_SOURCE_LANG;
 
     /**
      * Translation language of document. Not required for csv file
@@ -64,7 +64,7 @@ public class GlossaryPushMojo extends GlossaryMojo<GlossaryPushOptions>
      *
      * @parameter expression="${zanata.batchSize}" default-value=50
      */
-    private int batchSize = 50;
+    private int batchSize = DEFAULT_BATCH_SIZE;
 
     public GlossaryPushMojo() throws Exception {
         super();