l10n: localizable upload progress messages

Currenly the data rate in throughput_string(...) method is
output by simple strbuf_humanise_bytes(...) call and '/s' append.
But for proper translation of such string the translator needs
full context.

Add strbuf_humanise_rate(...) method to properly print out
localizable version of data rate ('3.5 MiB/s' etc) with full context.

Strings with the units in strbuf_humanise_bytes(...) are marked
for translation.

Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/progress.c b/progress.c
index a2e8cf64a8d1aa2f94c745bbb5098b9c771f3a05..951f7c7461a43b75b3c6e1c025568a9c8f246fbc 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -150,8 +150,7 @@ static void throughput_string(struct strbuf *buf, uint64_t total,
        strbuf_addstr(buf, ", ");
        strbuf_humanise_bytes(buf, total);
        strbuf_addstr(buf, " | ");
-       strbuf_humanise_bytes(buf, rate * 1024);
-       strbuf_addstr(buf, "/s");
+       strbuf_humanise_rate(buf, rate * 1024);
 }
 
 void display_throughput(struct progress *progress, uint64_t total)

diff --git a/strbuf.c b/strbuf.c
index 0e18b259ce51fc73f82f7b77032221b33411c25f..d30f916858883aa312bd824a53516cb099a2e922 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -811,25 +811,57 @@ void strbuf_addstr_urlencode(struct strbuf *sb, const char *s,
        strbuf_add_urlencode(sb, s, strlen(s), reserved);
 }
 
-void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
+static void strbuf_humanise(struct strbuf *buf, off_t bytes,
+                                int humanise_rate)
 {
        if (bytes > 1 << 30) {
-               strbuf_addf(buf, "%u.%2.2u GiB",
+               strbuf_addf(buf,
+                               humanise_rate == 0 ?
+                                       /* TRANSLATORS: IEC 80000-13:2008 gibibyte */
+                                       _("%u.%2.2u GiB") :
+                                       /* TRANSLATORS: IEC 80000-13:2008 gibibyte/second */
+                                       _("%u.%2.2u GiB/s"),
                            (unsigned)(bytes >> 30),
                            (unsigned)(bytes & ((1 << 30) - 1)) / 10737419);
        } else if (bytes > 1 << 20) {
                unsigned x = bytes + 5243;  /* for rounding */
-               strbuf_addf(buf, "%u.%2.2u MiB",
+               strbuf_addf(buf,
+                               humanise_rate == 0 ?
+                                       /* TRANSLATORS: IEC 80000-13:2008 mebibyte */
+                                       _("%u.%2.2u MiB") :
+                                       /* TRANSLATORS: IEC 80000-13:2008 mebibyte/second */
+                                       _("%u.%2.2u MiB/s"),
                            x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20);
        } else if (bytes > 1 << 10) {
                unsigned x = bytes + 5;  /* for rounding */
-               strbuf_addf(buf, "%u.%2.2u KiB",
+               strbuf_addf(buf,
+                               humanise_rate == 0 ?
+                                       /* TRANSLATORS: IEC 80000-13:2008 kibibyte */
+                                       _("%u.%2.2u KiB") :
+                                       /* TRANSLATORS: IEC 80000-13:2008 kibibyte/second */
+                                       _("%u.%2.2u KiB/s"),
                            x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
        } else {
-               strbuf_addf(buf, "%u bytes", (unsigned)bytes);
+               strbuf_addf(buf,
+                               humanise_rate == 0 ?
+                                       /* TRANSLATORS: IEC 80000-13:2008 byte */
+                                       Q_("%u byte", "%u bytes", (unsigned)bytes) :
+                                       /* TRANSLATORS: IEC 80000-13:2008 byte/second */
+                                       Q_("%u byte/s", "%u bytes/s", (unsigned)bytes),
+                               (unsigned)bytes);
        }
 }
 
+void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
+{
+       strbuf_humanise(buf, bytes, 0);
+}
+
+void strbuf_humanise_rate(struct strbuf *buf, off_t bytes)
+{
+       strbuf_humanise(buf, bytes, 1);
+}
+
 void strbuf_add_absolute_path(struct strbuf *sb, const char *path)
 {
        if (!*path)

diff --git a/strbuf.h b/strbuf.h
index c8d98dfb95b8d81b316e887fa031dab0b2165784..f62278a0be59be4c6cff17f0a0adcc6361e93e82 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -372,6 +372,12 @@ void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src);
  */
 void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes);
 
+/**
+ * Append the given byte rate as a human-readable string (i.e. 12.23 KiB/s,
+ * 3.50 MiB/s).
+ */
+void strbuf_humanise_rate(struct strbuf *buf, off_t bytes);
+
 /**
  * Add a formatted string to the buffer.
  */