D6081: i18n-ja: correct translation of "committing"
matvore added a comment. In https://phab.mercurial-scm.org/D6081#89058, @yuja wrote: > Maybe need a pullreq? We can't review i18n messages. Done: https://bitbucket.org/foozy/mercurial-translation-ja/pull-requests/1/ > https://www.mercurial-scm.org/wiki/TranslatingMercurial#Existing_Translations > >> -msgstr "secret フェーズでコミット中" >> +msgstr "secret フェーズでコミットします" > > Perhaps, it should just remove the "中". The Japanese translation appears > to avoid using desu/masu. Done in pull request. There was another flag description for --close-branch. I fixed this to not have "します." Now all the flag descriptions in "hg help commit" (including -v ones) are consistent. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6081 To: matvore, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6081: i18n-ja: correct translation of "committing"
matvore created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The previous translation considered the English word to mean "committing is currently happening" but it actually meant "for purposes of committing." REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6081 AFFECTED FILES i18n/ja.po CHANGE DETAILS diff --git a/i18n/ja.po b/i18n/ja.po --- a/i18n/ja.po +++ b/i18n/ja.po @@ -15229,7 +15229,7 @@ msgstr "作業領域の親リビジョンの改変" msgid "use the secret phase for committing" -msgstr "secret フェーズでコミット中" +msgstr "secret フェーズでコミットします" msgid "commit the specified files or all outstanding changes" msgstr "指定ファイルまたは全ての変更内容のリポジトリへの記録" To: matvore, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6080: i18n-ja: translate "integer" more precisely
matvore created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There were some times where "integer" was translated inaccurately as suuchi (number). Make these more precise by translating them as seisuuchi or simply seisuu. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6080 AFFECTED FILES i18n/ja.po CHANGE DETAILS diff --git a/i18n/ja.po b/i18n/ja.po --- a/i18n/ja.po +++ b/i18n/ja.po @@ -3546,11 +3546,11 @@ #, python-format msgid "svn: revision %s is not an integer" -msgstr "svn: リビジョン %s が数字ではありません" +msgstr "svn: リビジョン %s が整数値ではありません" #, python-format msgid "svn: start revision %s is not an integer" -msgstr "svn: 開始リビジョン %s が数字ではありません" +msgstr "svn: 開始リビジョン %s が整数値ではありません" #, python-format msgid "no revision found in module %s" @@ -34397,7 +34397,7 @@ msgstr "%d 秒遅れでロックを獲得\n" msgid "limit must be a positive integer" -msgstr "制限には正数を指定してください" +msgstr "制限には正の整数値を指定してください" msgid "limit must be positive" msgstr "制限には正数を指定してください" @@ -35397,7 +35397,7 @@ #, fuzzy msgid "relation subscript must be an integer" -msgstr "CPU 数には数値を指定してください" +msgstr "CPU 数には整数値を指定してください" #, fuzzy msgid "can't use a subscript in this context" @@ -35467,7 +35467,7 @@ #. i18n: "ancestors" is a keyword #, fuzzy msgid "ancestors expects an integer depth" -msgstr "word にはインデックス値を数値で指定してください" +msgstr "word にはインデックス値を整数値で指定してください" #, fuzzy msgid "negative depth" @@ -35695,7 +35695,7 @@ #. i18n: "descendants" is a keyword #, fuzzy msgid "descendants expects an integer depth" -msgstr "pad() の width 引数には数値を指定してください" +msgstr "pad() の width 引数には整数値を指定してください" msgid "" "``destination([set])``\n" @@ -36659,7 +36659,7 @@ msgstr "%r は名前定義に使用できません" msgid "cannot use an integer as a name" -msgstr "数値だけの名前は使用できません" +msgstr "整数値だけの名前は使用できません" #, python-format msgid "leading or trailing whitespace in name %r" @@ -37840,7 +37840,7 @@ #. i18n: "fill" is a keyword msgid "fill expects an integer width" -msgstr "fill には数値を指定してください" +msgstr "fill には整数値を指定してください" msgid "" ":formatnode(node): Obtain the preferred form of a changeset hash. " @@ -37873,7 +37873,7 @@ #. i18n: "pad" is a keyword msgid "pad() expects an integer width" -msgstr "pad() の width 引数には数値を指定してください" +msgstr "pad() の width 引数には整数値を指定してください" #. i18n: "pad" is a keyword msgid "pad() expects a single fill character" @@ -38135,7 +38135,7 @@ #. i18n: "shortest" is a keyword msgid "shortest() expects an integer minlength" -msgstr "shortest() の minlength 引数には数値を指定してください" +msgstr "shortest() の minlength 引数には整数値を指定してください" msgid "" ":strip(text[, chars]): Strip characters from a string. By default,\n" @@ -38190,7 +38190,7 @@ #. i18n: "word" is a keyword msgid "word expects an integer index" -msgstr "word にはインデックス値を数値で指定してください" +msgstr "word にはインデックス値を整数値で指定してください" #. i18n: column positioning for "hg log" #, python-format @@ -38358,7 +38358,7 @@ msgid ":changessincelatesttag: Integer. All ancestors not in the latest tag." msgstr "" -":changessincelatesttag: 数値。 最新タグ以降の全祖先リビジョン数。\n" +":changessincelatesttag: 整数。 最新タグ以降の全祖先リビジョン数。\n" "(※ 訳注: 履歴中に分岐がない場合は latesttagdistance と等価です)" msgid "" @@ -38455,7 +38455,7 @@ #, fuzzy msgid ":phaseidx: Integer. The changeset phase index. (ADVANCED)" -msgstr ":phaseidx: 数値。 当該リビジョンのフェーズ値。" +msgstr ":phaseidx: 整数。 当該リビジョンのフェーズ値。" msgid ":rev: Integer. The repository-local changeset revision number." msgstr ":rev: 整数。 各リポジトリ固有のリビジョン番号。" @@ -38559,7 +38559,7 @@ #, fuzzy msgid "not an integer" -msgstr "数値だけの名前は使用できません" +msgstr "整数値だけの名前は使用できません" #, python-format msgid "incompatible use of template filter '%s'" @@ -39710,7 +39710,7 @@ msgstr "" msgid "number of cpus must be an integer" -msgstr "CPU 数には数値を指定してください" +msgstr "CPU 数には整数値を指定してください" msgid "failed to kill worker threads while handling an exception\n" msgstr "" To: matvore, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH] blackbox: add configitem for format of log timestamps
I see now Yuya told me the change was queued in a prior e-mail. This thread is actually a nexus of 5 or 6 e-mail screw-ups on my part, so I didn't see it. Thank you all for helping me and I'll try Phabricator next time :) On Wed, Nov 21, 2018 at 8:37 AM Pulkit Goyal <7895pul...@gmail.com> wrote: > > > > On Wed, Nov 21, 2018 at 7:32 PM MATTHEW DEVORE wrote: >> >> Ping. Did you have any trouble applying this updated patch? This one should >> not have any mangled spaces. > > > Your patch is already pushed. > https://www.mercurial-scm.org/repo/hg/rev/25f1c7bd649d ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH] blackbox: add configitem for format of log timestamps
Ping. Did you have any trouble applying this updated patch? This one should not
have any mangled spaces.
> On October 23, 2018 at 1:49 PM Matthew DeVore wrote:
>
>
> From: Matt DeVore
>
> My e-mail client was mangling spaces, which is why you couldn't apply the
> patch earlier. I'm sending this again with a different tool and e-mail
> address.
>
>
> # HG changeset patch
> # User Matt DeVore
> # Date 1539816481 25200
> # Wed Oct 17 15:48:01 2018 -0700
> # Node ID 13c2fe6d3b30a743daa1984404a70ed769779d11
> # Parent a0e7fa019290d5348c4a83f6b287f2612d645025
> blackbox: add configitem for format of log timestamps
>
> Sometimes blackbox logs are used to report performance problems, but the
> timestamps are only at second granularity, so often the timings have to
> stated separately by the reporter. This is inconvenient and error-prone,
> so I would like to include %f in the date format. This patch makes that
> possible.
>
> diff --git a/hgext/blackbox.py b/hgext/blackbox.py
> --- a/hgext/blackbox.py
> +++ b/hgext/blackbox.py
> @@ -33,6 +33,11 @@ Examples::
> # rotate up to N log files when the current one gets too big
> maxfiles = 3
>
> + [blackbox]
> + # Include nanoseconds in log entries with %f (see Python function
> + # datetime.datetime.strftime)
> + date-format = '%Y-%m-%d @ %H:%M:%S.%f'
> +
> """
>
> from __future__ import absolute_import
> @@ -82,6 +87,9 @@ configitem('blackbox', 'maxfiles',
> configitem('blackbox', 'track',
> default=lambda: ['*'],
> )
> +configitem('blackbox', 'date-format',
> + default='%Y/%m/%d %H:%M:%S',
> +)
>
> lastui = None
>
> @@ -169,7 +177,9 @@ def wrapui(ui):
> return
> ui._bbinlog = True
> default = self.configdate('devel', 'default-date')
> - date = dateutil.datestr(default, '%Y/%m/%d %H:%M:%S')
> + format = ui.config('blackbox', 'date-format')
> + date = dateutil.datestr(default,
> + ui.config('blackbox', 'date-format'))
> user = procutil.getuser()
> pid = '%d' % procutil.getpid()
> formattedmsg = msg[0] % msg[1:]
> diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
> --- a/tests/test-blackbox.t
> +++ b/tests/test-blackbox.t
> @@ -82,6 +82,16 @@ recursive aliases work correctly
> 1970/01/01 00:00:00 bob @ (5000)>
> so-confusing exited 0 after * seconds (glob)
> 1970/01/01 00:00:00 bob @ (5000)>
> blackbox
>
> +custom date format
> + $ rm ./.hg/blackbox.log
> + $ hg --config blackbox.date-format='%Y-%m-%d @ %H:%M:%S' \
> + > --config devel.default-date='1334347993 0' --traceback status
> + A a
> + $ hg blackbox
> + 2012-04-13 @ 20:13:13 bob @ (5000)>
> --config 'blackbox.date-format=%Y-%m-%d @ %H:%M:%S' --config
> 'devel.default-date=1334347993 0' --traceback status
> + 2012-04-13 @ 20:13:13 bob @ (5000)>
> --config 'blackbox.date-format=%Y-%m-%d @ %H:%M:%S' --config
> 'devel.default-date=1334347993 0' --traceback status exited 0 after * seconds
> (glob)
> + 1970/01/01 00:00:00 bob @ (5000)>
> blackbox
> +
> incoming change tracking
>
> create two heads to verify that we only see one change in the log later
>
>___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH] blackbox: add configitem for format of log timestamps
From: Matt DeVore
My e-mail client was mangling spaces, which is why you couldn't apply the
patch earlier. I'm sending this again with a different tool and e-mail address.
# HG changeset patch
# User Matt DeVore
# Date 1539816481 25200
# Wed Oct 17 15:48:01 2018 -0700
# Node ID 13c2fe6d3b30a743daa1984404a70ed769779d11
# Parent a0e7fa019290d5348c4a83f6b287f2612d645025
blackbox: add configitem for format of log timestamps
Sometimes blackbox logs are used to report performance problems, but the
timestamps are only at second granularity, so often the timings have to
stated separately by the reporter. This is inconvenient and error-prone,
so I would like to include %f in the date format. This patch makes that
possible.
diff --git a/hgext/blackbox.py b/hgext/blackbox.py
--- a/hgext/blackbox.py
+++ b/hgext/blackbox.py
@@ -33,6 +33,11 @@ Examples::
# rotate up to N log files when the current one gets too big
maxfiles = 3
+ [blackbox]
+ # Include nanoseconds in log entries with %f (see Python function
+ # datetime.datetime.strftime)
+ date-format = '%Y-%m-%d @ %H:%M:%S.%f'
+
"""
from __future__ import absolute_import
@@ -82,6 +87,9 @@ configitem('blackbox', 'maxfiles',
configitem('blackbox', 'track',
default=lambda: ['*'],
)
+configitem('blackbox', 'date-format',
+default='%Y/%m/%d %H:%M:%S',
+)
lastui = None
@@ -169,7 +177,9 @@ def wrapui(ui):
return
ui._bbinlog = True
default = self.configdate('devel', 'default-date')
-date = dateutil.datestr(default, '%Y/%m/%d %H:%M:%S')
+format = ui.config('blackbox', 'date-format')
+date = dateutil.datestr(default,
+ui.config('blackbox', 'date-format'))
user = procutil.getuser()
pid = '%d' % procutil.getpid()
formattedmsg = msg[0] % msg[1:]
diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -82,6 +82,16 @@ recursive aliases work correctly
1970/01/01 00:00:00 bob @ (5000)>
so-confusing exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @ (5000)>
blackbox
+custom date format
+ $ rm ./.hg/blackbox.log
+ $ hg --config blackbox.date-format='%Y-%m-%d @ %H:%M:%S' \
+ >--config devel.default-date='1334347993 0' --traceback status
+ A a
+ $ hg blackbox
+ 2012-04-13 @ 20:13:13 bob @ (5000)>
--config 'blackbox.date-format=%Y-%m-%d @ %H:%M:%S' --config
'devel.default-date=1334347993 0' --traceback status
+ 2012-04-13 @ 20:13:13 bob @ (5000)>
--config 'blackbox.date-format=%Y-%m-%d @ %H:%M:%S' --config
'devel.default-date=1334347993 0' --traceback status exited 0 after * seconds
(glob)
+ 1970/01/01 00:00:00 bob @ (5000)>
blackbox
+
incoming change tracking
create two heads to verify that we only see one change in the log later
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH] blackbox: add configitem for format of log timestamps
Below is the updated patch, but only the Node ID and Parent have changed.
The context lines haven't changed.
Thank you for the review!
- Matt
# HG changeset patch
# User Matt DeVore
# Date 1539816481 25200
# Wed Oct 17 15:48:01 2018 -0700
# Node ID 2e598639da17601b731454614ecba2c13f6b91a9
# Parent dce0e0f78f0f10578a17b586fe061e1985dd5c5f
blackbox: add configitem for format of log timestamps
Sometimes blackbox logs are used to report performance problems, but the
timestamps are only at second granularity, so often the timings have to
stated separately by the reporter. This is inconvenient and error-prone,
so I would like to include %f in the date format. This patch makes that
possible.
diff --git a/hgext/blackbox.py b/hgext/blackbox.py
--- a/hgext/blackbox.py
+++ b/hgext/blackbox.py
@@ -33,6 +33,11 @@ Examples::
# rotate up to N log files when the current one gets too big
maxfiles = 3
+ [blackbox]
+ # Include nanoseconds in log entries with %f (see Python function
+ # datetime.datetime.strftime)
+ date-format = '%Y-%m-%d @ %H:%M:%S.%f'
+
"""
from __future__ import absolute_import
@@ -82,6 +87,9 @@ configitem('blackbox', 'maxfiles',
configitem('blackbox', 'track',
default=lambda: ['*'],
)
+configitem('blackbox', 'date-format',
+default='%Y/%m/%d %H:%M:%S',
+)
lastui = None
@@ -169,7 +177,9 @@ def wrapui(ui):
return
ui._bbinlog = True
default = self.configdate('devel', 'default-date')
-date = dateutil.datestr(default, '%Y/%m/%d %H:%M:%S')
+format = ui.config('blackbox', 'date-format')
+date = dateutil.datestr(default,
+ui.config('blackbox', 'date-format'))
user = procutil.getuser()
pid = '%d' % procutil.getpid()
formattedmsg = msg[0] % msg[1:]
diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -82,6 +82,16 @@ recursive aliases work correctly
1970/01/01 00:00:00 bob @ (5000)>
so-confusing exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @ (5000)>
blackbox
+custom date format
+ $ rm ./.hg/blackbox.log
+ $ hg --config blackbox.date-format='%Y-%m-%d @ %H:%M:%S' \
+ >--config devel.default-date='1334347993 0' --traceback status
+ A a
+ $ hg blackbox
+ 2012-04-13 @ 20:13:13 bob @ (5000)>
--config 'blackbox.date-format=%Y-%m-%d @ %H:%M:%S' --config
'devel.default-date=1334347993 0' --traceback status
+ 2012-04-13 @ 20:13:13 bob @ (5000)>
--config 'blackbox.date-format=%Y-%m-%d @ %H:%M:%S' --config
'devel.default-date=1334347993 0' --traceback status exited 0 after * seconds
(glob)
+ 1970/01/01 00:00:00 bob @ (5000)>
blackbox
+
incoming change tracking
create two heads to verify that we only see one change in the log later
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[PATCH] blackbox: add configitem for format of log timestamps
# HG changeset patch
# User Matt DeVore
# Date 1539816481 25200
# Wed Oct 17 15:48:01 2018 -0700
# Node ID b42c2264048f8859c8966577a1929aa80132ffa5
# Parent 5644f7c8982e805e53f56fcbfe0322e9de58a934
blackbox: add configitem for format of log timestamps
Sometimes blackbox logs are used to report performance problems, but the
timestamps are only at second granularity, so often the timings have to
stated separately by the reporter. This is inconvenient and error-prone,
so I would like to include %f in the date format. This patch makes that
possible.
diff --git a/hgext/blackbox.py b/hgext/blackbox.py
--- a/hgext/blackbox.py
+++ b/hgext/blackbox.py
@@ -33,6 +33,11 @@ Examples::
# rotate up to N log files when the current one gets too big
maxfiles = 3
+ [blackbox]
+ # Include nanoseconds in log entries with %f (see Python function
+ # datetime.datetime.strftime)
+ date-format = '%Y-%m-%d @ %H:%M:%S.%f'
+
"""
from __future__ import absolute_import
@@ -82,6 +87,9 @@ configitem('blackbox', 'maxfiles',
configitem('blackbox', 'track',
default=lambda: ['*'],
)
+configitem('blackbox', 'date-format',
+default='%Y/%m/%d %H:%M:%S',
+)
lastui = None
@@ -169,7 +177,9 @@ def wrapui(ui):
return
ui._bbinlog = True
default = self.configdate('devel', 'default-date')
-date = dateutil.datestr(default, '%Y/%m/%d %H:%M:%S')
+format = ui.config('blackbox', 'date-format')
+date = dateutil.datestr(default,
+ui.config('blackbox', 'date-format'))
user = procutil.getuser()
pid = '%d' % procutil.getpid()
formattedmsg = msg[0] % msg[1:]
diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -82,6 +82,16 @@ recursive aliases work correctly
1970/01/01 00:00:00 bob @ (5000)>
so-confusing exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @ (5000)>
blackbox
+custom date format
+ $ rm ./.hg/blackbox.log
+ $ hg --config blackbox.date-format='%Y-%m-%d @ %H:%M:%S' \
+ >--config devel.default-date='1334347993 0' --traceback status
+ A a
+ $ hg blackbox
+ 2012-04-13 @ 20:13:13 bob @ (5000)>
--config 'blackbox.date-format=%Y-%m-%d @ %H:%M:%S' --config
'devel.default-date=1334347993 0' --traceback status
+ 2012-04-13 @ 20:13:13 bob @ (5000)>
--config 'blackbox.date-format=%Y-%m-%d @ %H:%M:%S' --config
'devel.default-date=1334347993 0' --traceback status exited 0 after * seconds
(glob)
+ 1970/01/01 00:00:00 bob @ (5000)>
blackbox
+
incoming change tracking
create two heads to verify that we only see one change in the log later
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
