[JGIT PATCH 2/4] jgit programs: Use i18n.logOutputEncoding or user's locale for output
- From
Robin Rosenberg <robin.rosenberg@dewire.com>
- Date
- Oct 12, 2008, 22:50 UTC
- Message-ID
- <1223851860-13068-3-git-send-email-robin.rosenberg@dewire.com>
- In-Reply-To
- <1223851860-13068-2-git-send-email-robin.rosenberg@dewire.com>
We should present the data in the user's locale to make it readable.
This prevents garbage from being displayed for user's whose locale is not UTF-8, when non-ascii appears in most cases. If the characters cannot be converted garbage will appear in any case.
When jgit gains the capability to present blob data this code must be replaced to handle data and metadata differently.
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> --- .../src/org/spearce/jgit/pgm/TextBuiltin.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java index a68d87c..d1bf9e0 100644 --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java @@ -86,8 +86,15 @@ final void setCommandName(final String name) { void init(final Repository repo) { try { - out = new PrintWriter(new BufferedWriter(new OutputStreamWriter( - System.out, "UTF-8"))); + String outputEncoding = repo.getConfig().getString("i18n", null, + "logOutputEncoding"); + System.out.println("Encoding = "+ outputEncoding); + if (outputEncoding != null) + out = new PrintWriter(new BufferedWriter( + new OutputStreamWriter(System.out, outputEncoding))); + else + out = new PrintWriter(new BufferedWriter( + new OutputStreamWriter(System.out))); } catch (IOException e) { throw die("cannot create output stream"); }
-- 1.6.0.2.308.gef4a