X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fcli%2FCliReader.java;h=03cb22738b37b1f25cb4ff9c5c73d2d4bcb5ff82;hb=53f76130c5337a77362b191f22115b461811ba36;hp=22d11cbdfbbb87f9f41b28844d8317087070af1b;hpb=6be5e3bb218e1ed118ad5e693e13d1da2b49df13;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/reader/cli/CliReader.java b/src/be/nikiroo/fanfix/reader/cli/CliReader.java index 22d11cb..03cb227 100644 --- a/src/be/nikiroo/fanfix/reader/cli/CliReader.java +++ b/src/be/nikiroo/fanfix/reader/cli/CliReader.java @@ -14,6 +14,7 @@ import be.nikiroo.fanfix.reader.BasicReader; import be.nikiroo.fanfix.searchable.BasicSearchable; import be.nikiroo.fanfix.searchable.SearchableTag; import be.nikiroo.fanfix.supported.SupportType; +import be.nikiroo.utils.StringUtils; /** * Command line {@link Story} reader. @@ -186,16 +187,17 @@ class CliReader extends BasicReader { } // TODO: i18n + String stories = "stories"; + String num = StringUtils.formatNumber(subtag + .getCount()); if (sp.isEmpty()) { System.out.println(String.format( - "%d/%d: %s, %d %s", page, item, - subtag.getName(), subtag.getCount(), - "stories")); + "%d/%d: %s, %s %s", page, item, + subtag.getName(), num, stories)); } else { System.out.println(String.format( - "%d/%d: %s (%s), %d %s", page, item, - subtag.getName(), sp, - subtag.getCount(), "stories")); + "%d/%d: %s (%s), %s %s", page, item, + subtag.getName(), sp, num, stories)); } } } else { @@ -215,11 +217,18 @@ class CliReader extends BasicReader { for (SearchableTag subtag : subtags) { String total = ""; if (subtag.getCount() > 0) { - // TODO: use StringUtils fromNumber - total = " (" + subtag.getCount() + ")"; + total = StringUtils.formatNumber(subtag + .getCount()); } - System.out.println(i + ": " + subtag.getName() - + total); + + if (total.isEmpty()) { + System.out.println(String.format("%d: %s", i, + subtag.getName())); + } else { + System.out.println(String.format("%d: %s (%s)", + i, subtag.getName(), total)); + } + i++; } }