i18n: fix mismatched camelCase config variables

Commit Message

Jiang Xin June 17, 2022, 10:03 a.m. UTC

From: Jiang Xin <[e-mail]>


Some config variables are combinations of multiple words, and we
typically write them in camelCase forms in manpage and translatable
strings. It's not easy to find mismatches for these camelCase config
variables during code reviews, but occasionally they are identified
during localization translations.

To check for mismatched config variables, I introduced a new feature
in the helper program for localization[^1]. The following mismatched
config variables have been identified by running the helper program,
such as "git-po-helper check-pot".

Lowercase in manpage should use camelCase:

 * Documentation/config/http.txt: http.pinnedpubkey

Lowercase in translable strings should use camelCase:

 * builtin/fast-import.c:  pack.indexversion
 * builtin/gc.c:           gc.logexpiry
 * builtin/index-pack.c:   pack.indexversion
 * builtin/pack-objects.c: pack.indexversion
 * builtin/repack.c:       pack.writebitmaps
 * commit.c:               i18n.commitencoding
 * gpg-interface.c:        user.signingkey
 * http.c:                 http.postbuffer
 * submodule-config.c:     submodule.fetchjobs

Mismatched camelCases, choose the former:

 * Documentation/config/fetch.txt: fetch.credentialsInUrl
   remote.c:                       fetch.credentialsInURL

[^1]: https://github.com/git-l10n/git-po-helper

Signed-off-by: Jiang Xin <[e-mail]>
---
 Documentation/config/http.txt | 2 +-
 builtin/fast-import.c         | 2 +-
 builtin/gc.c                  | 2 +-
 builtin/index-pack.c          | 2 +-
 builtin/pack-objects.c        | 2 +-
 builtin/repack.c              | 2 +-
 commit.c                      | 2 +-
 gpg-interface.c               | 2 +-
 http.c                        | 2 +-
 remote.c                      | 2 +-
 submodule-config.c            | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

Comments

Junio C Hamano June 17, 2022, 3:43 p.m. UTC | #1

Jiang Xin <[e-mail]> writes:

> Mismatched camelCases, choose the former:
>
>  * Documentation/config/fetch.txt: fetch.credentialsInUrl
>    remote.c:                       fetch.credentialsInURL

We renamed this with "fetch" -> "transfer", didn't we?

Everything else looks good, though.

Thanks.

Junio C Hamano June 17, 2022, 5:41 p.m. UTC | #2

Junio C Hamano <[e-mail]> writes:

> Jiang Xin <[e-mail]> writes:
>
>> Mismatched camelCases, choose the former:
>>
>>  * Documentation/config/fetch.txt: fetch.credentialsInUrl
>>    remote.c:                       fetch.credentialsInURL
>
> We renamed this with "fetch" -> "transfer", didn't we?
>
> Everything else looks good, though.

I've applied after tweaking it a bit.

Will be pushing the result out shortly.

Patch

diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 179d03e57b..afeeccfbfa 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -203,7 +203,7 @@  http.schannelUseSSLCAInfo::
 	when the `schannel` backend was configured via `http.sslBackend`,
 	unless `http.schannelUseSSLCAInfo` overrides this behavior.
 
-http.pinnedpubkey::
+http.pinnedPubkey::
 	Public key of the https service. It may either be the filename of
 	a PEM or DER encoded public key file or a string starting with
 	'sha256//' followed by the base64 encoded sha256 hash of the
diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 28d3193c38..14113cfd82 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -3465,7 +3465,7 @@  static void git_pack_config(void)
 		pack_idx_opts.version = indexversion_value;
 		if (pack_idx_opts.version > 2)
 			git_die_config("pack.indexversion",
-					"bad pack.indexversion=%"PRIu32, pack_idx_opts.version);
+					"bad pack.indexVersion=%"PRIu32, pack_idx_opts.version);
 	}
 	if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value))
 		max_packsize = packsizelimit_value;
diff --git a/builtin/gc.c b/builtin/gc.c
index 4ea70089c9..021e9256ae 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -581,7 +581,7 @@  int cmd_gc(int argc, const char **argv, const char *prefix)
 	/* default expiry time, overwritten in gc_config */
 	gc_config();
 	if (parse_expiry_date(gc_log_expire, &gc_log_expire_time))
-		die(_("failed to parse gc.logexpiry value %s"), gc_log_expire);
+		die(_("failed to parse gc.logExpiry value %s"), gc_log_expire);
 
 	if (pack_refs < 0)
 		pack_refs = !is_bare_repository();
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 3e385b4800..6648f2daef 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1575,7 +1575,7 @@  static int git_index_pack_config(const char *k, const char *v, void *cb)
 	if (!strcmp(k, "pack.indexversion")) {
 		opts->version = git_config_int(k, v);
 		if (opts->version > 2)
-			die(_("bad pack.indexversion=%"PRIu32), opts->version);
+			die(_("bad pack.indexVersion=%"PRIu32), opts->version);
 		return 0;
 	}
 	if (!strcmp(k, "pack.threads")) {
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index cc5f41086d..39e28cfcaf 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3170,7 +3170,7 @@  static int git_pack_config(const char *k, const char *v, void *cb)
 	if (!strcmp(k, "pack.indexversion")) {
 		pack_idx_opts.version = git_config_int(k, v);
 		if (pack_idx_opts.version > 2)
-			die(_("bad pack.indexversion=%"PRIu32),
+			die(_("bad pack.indexVersion=%"PRIu32),
 			    pack_idx_opts.version);
 		return 0;
 	}
diff --git a/builtin/repack.c b/builtin/repack.c
index c957b2959f..4a7ae4cf48 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -41,7 +41,7 @@  static const char *const git_repack_usage[] = {
 
 static const char incremental_bitmap_conflict_error[] = N_(
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 );
 
 struct pack_objects_args {
diff --git a/commit.c b/commit.c
index 73865fee15..1fb1b2ea90 100644
--- a/commit.c
+++ b/commit.c
@@ -1526,7 +1526,7 @@  static int verify_utf8(struct strbuf *buf)
 static const char commit_utf8_warn[] =
 N_("Warning: commit message did not conform to UTF-8.\n"
    "You may want to amend it after fixing the message, or set the config\n"
-   "variable i18n.commitencoding to the encoding your project uses.\n");
+   "variable i18n.commitEncoding to the encoding your project uses.\n");
 
 int commit_tree_extended(const char *msg, size_t msg_len,
 			 const struct object_id *tree,
diff --git a/gpg-interface.c b/gpg-interface.c
index 280f1fa1a5..947b58ad4d 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -985,7 +985,7 @@  static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
 
 	if (!signing_key || signing_key[0] == '\0')
 		return error(
-			_("user.signingkey needs to be set for ssh signing"));
+			_("user.signingKey needs to be set for ssh signing"));
 
 	if (is_literal_ssh_key(signing_key, &literal_key)) {
 		/* A literal ssh key */
diff --git a/http.c b/http.c
index 11c6f69fac..168ca30c55 100644
--- a/http.c
+++ b/http.c
@@ -349,7 +349,7 @@  static int http_options(const char *var, const char *value, void *cb)
 	if (!strcmp("http.postbuffer", var)) {
 		http_post_buffer = git_config_ssize_t(var, value);
 		if (http_post_buffer < 0)
-			warning(_("negative value for http.postbuffer; defaulting to %d"), LARGE_PACKET_MAX);
+			warning(_("negative value for http.postBuffer; defaulting to %d"), LARGE_PACKET_MAX);
 		if (http_post_buffer < LARGE_PACKET_MAX)
 			http_post_buffer = LARGE_PACKET_MAX;
 		return 0;
diff --git a/remote.c b/remote.c
index 9b9bbfe80e..d50b83e7eb 100644
--- a/remote.c
+++ b/remote.c
@@ -633,7 +633,7 @@  static void validate_remote_url(struct remote *remote)
 	else if (!strcmp("allow", value))
 		return;
 	else
-		die(_("unrecognized value fetch.credentialsInURL: '%s'"), value);
+		die(_("unrecognized value fetch.credentialsInUrl: '%s'"), value);
 
 	for (i = 0; i < remote->url_nr; i++) {
 		struct url_info url_info = { 0 };
diff --git a/submodule-config.c b/submodule-config.c
index ce3beaf5d4..4a9780856c 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -302,7 +302,7 @@  int parse_submodule_fetchjobs(const char *var, const char *value)
 {
 	int fetchjobs = git_config_int(var, value);
 	if (fetchjobs < 0)
-		die(_("negative values not allowed for submodule.fetchjobs"));
+		die(_("negative values not allowed for submodule.fetchJobs"));
 	return fetchjobs;
 }