pr-1088/jnavila/i18n-refactor-v4
tagged this
02 Jan 17:15
This series is a meager attempt at rationalizing a small fraction of the internationalized messages. Sorry in advance for the dull task of reviewing these insipide patches. Doing so has some positive effects: * non-translatable constant strings are kept out of the way for translators * messages with identical meaning are built identically * the total number of messages to translate is decreased. Changes since V1: * took into account the comments, except for ref-filter.c where the proposed refactoring is not obvious. * added even more strings to the "cannot be used together" crowd. Changes since V2: * fixed change of behaviour in tag.c * reverted sam changes as per Johannes Sixt comments Changes since V3: * apply Oxford comma where needed * switch all options to " '%s' " style where i18n is applied. Jean-Noël Avila (11): i18n: refactor "foo and bar are mutually exclusive" i18n: refactor "%s, %s and %s are mutually exclusive" i18n: turn "options are incompatible" into "cannot be used together" i18n: standardize "cannot open" and "cannot read" i18n: tag.c factorize i18n strings i18n: factorize "--foo requires --bar" and the like i18n: factorize "no directory given for --foo" i18n: refactor "unrecognized %(foo) argument" strings i18n: factorize "--foo outside a repository" i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom" i18n: turn even more messages into "cannot be used together" ones apply.c | 8 ++++---- archive.c | 8 ++++---- builtin/add.c | 14 +++++++------- builtin/am.c | 6 +++--- builtin/branch.c | 2 +- builtin/cat-file.c | 2 +- builtin/checkout.c | 18 +++++++++--------- builtin/clone.c | 6 +++--- builtin/commit.c | 17 +++++++++-------- builtin/describe.c | 6 +++--- builtin/diff-tree.c | 2 +- builtin/difftool.c | 4 ++-- builtin/fast-export.c | 4 ++-- builtin/fetch.c | 8 ++++---- builtin/index-pack.c | 4 ++-- builtin/init-db.c | 2 +- builtin/log.c | 8 ++++---- builtin/ls-files.c | 2 +- builtin/merge.c | 4 ++-- builtin/pack-objects.c | 2 +- builtin/push.c | 8 ++++---- builtin/rebase.c | 10 +++++----- builtin/repack.c | 4 ++-- builtin/reset.c | 10 +++++----- builtin/rev-list.c | 4 ++-- builtin/rm.c | 4 ++-- builtin/show-branch.c | 4 ++-- builtin/stash.c | 8 ++++---- builtin/submodule--helper.c | 4 ++-- builtin/tag.c | 23 +++++++++++++---------- builtin/worktree.c | 6 +++--- diff.c | 12 ++++++++---- fetch-pack.c | 2 +- git.c | 6 +++--- http-fetch.c | 4 ++-- range-diff.c | 2 +- ref-filter.c | 22 +++++++++++----------- revision.c | 22 +++++++++++----------- t/t0001-init.sh | 2 +- t/t2025-checkout-no-overlay.sh | 2 +- t/t2026-checkout-pathspec-file.sh | 8 ++++---- t/t2072-restore-pathspec-file.sh | 6 +++--- t/t3431-rebase-fork-point.sh | 2 +- t/t3601-rm-pathspec-file.sh | 4 ++-- t/t3704-add-pathspec-file.sh | 10 +++++----- t/t3909-stash-pathspec-file.sh | 6 +++--- t/t4209-log-pickaxe.sh | 10 +++++----- t/t5606-clone-options.sh | 4 ++-- t/t7107-reset-pathspec-file.sh | 6 +++--- t/t7500-commit-template-squash-signoff.sh | 11 ++++++----- t/t7526-commit-pathspec-file.sh | 10 +++++----- 51 files changed, 186 insertions(+), 177 deletions(-) base-commit: 2ae0a9cb8298185a94e5998086f380a355dd8907 Submitted-As: https://lore.kernel.org/git/pull.1088.v4.git.1641143745.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1088.git.1638514909.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1088.v2.git.1640647437.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1088.v3.git.1640804107.gitgitgadget@gmail.com
Assets 2
-
2022-01-02T17:15:46Z -
2022-01-02T17:15:46Z -