From: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Dimitriy Ryazantcev" <dimitriy.ryazantcev@gmail.com>
Subject: [PATCH v4] l10n: localizable upload progress messages
Date: Sun, 23 Jun 2019 12:27:17 +0300 [thread overview]
Message-ID: <20190623092717.82424-2-dimitriy.ryazantcev@gmail.com> (raw)
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
---
progress.c | 4 +++-
strbuf.c | 16 ++++++++++++----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/progress.c b/progress.c
index a2e8cf64a8..fc62941fa4 100644
--- a/progress.c
+++ b/progress.c
@@ -151,7 +151,9 @@ static void throughput_string(struct strbuf *buf, uint64_t total,
strbuf_humanise_bytes(buf, total);
strbuf_addstr(buf, " | ");
strbuf_humanise_bytes(buf, rate * 1024);
- strbuf_addstr(buf, "/s");
+ strbuf_addstr(buf, "/");
+ /* TRANSLATORS: unit symbol for IEC 80000-13:2008 second */
+ strbuf_addstr(buf, _("s"));
}
void display_throughput(struct progress *progress, uint64_t total)
diff --git a/strbuf.c b/strbuf.c
index 0e18b259ce..706b3b8e42 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -814,19 +814,27 @@ void strbuf_addstr_urlencode(struct strbuf *sb, const char *s,
void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
{
if (bytes > 1 << 30) {
- strbuf_addf(buf, "%u.%2.2u GiB",
+ strbuf_addf(buf, "%u.%2.2u ",
(unsigned)(bytes >> 30),
(unsigned)(bytes & ((1 << 30) - 1)) / 10737419);
+ /* TRANSLATORS: unit symbol for IEC 80000-13:2008 gibibyte */
+ strbuf_addstr(buf, _("GiB"));
} else if (bytes > 1 << 20) {
unsigned x = bytes + 5243; /* for rounding */
- strbuf_addf(buf, "%u.%2.2u MiB",
+ strbuf_addf(buf, "%u.%2.2u ",
x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20);
+ /* TRANSLATORS: unit symbol for IEC 80000-13:2008 mebibyte */
+ strbuf_addstr(buf, _("MiB"));
} else if (bytes > 1 << 10) {
unsigned x = bytes + 5; /* for rounding */
- strbuf_addf(buf, "%u.%2.2u KiB",
+ strbuf_addf(buf, "%u.%2.2u ",
x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
+ /* TRANSLATORS: unit symbol for IEC 80000-13:2008 kibibyte */
+ strbuf_addstr(buf, _("KiB"));
} else {
- strbuf_addf(buf, "%u bytes", (unsigned)bytes);
+ strbuf_addf(buf, "%u ", (unsigned)bytes);
+ /* TRANSLATORS: unit symbol for IEC 80000-13:2008 byte */
+ strbuf_addstr(buf, _("B"));
}
}
--
2.22.0
reply other threads:[~2019-06-23 9:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190623092717.82424-2-dimitriy.ryazantcev@gmail.com \
--to=dimitriy.ryazantcev@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).