Re: [PATCH 07/22] builtin/update-index.c: mark strings for translation

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Nguyễn Thái Ngọc Duy  <pclouds@xxxxxxxxx> writes:

> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
> ---

This does look like a "new i18n bug" introduced in this cycle, but
given that this program does not have many _()s in the first place,
I'm inclined to say we should do the whole thing post 2.8.0 release
for this file, discarding this patch.

>  builtin/update-index.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index 1c94ca5..21e38a8 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -1127,9 +1127,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
>  		break;
>  	case UC_DISABLE:
>  		if (git_config_get_untracked_cache() == 1)
> -			warning("core.untrackedCache is set to true; "
> -				"remove or change it, if you really want to "
> -				"disable the untracked cache");
> +			warning(_("core.untrackedCache is set to true; "
> +				  "remove or change it, if you really want to "
> +				  "disable the untracked cache"));
>  		remove_untracked_cache(&the_index);
>  		report(_("Untracked cache disabled"));
>  		break;
> @@ -1139,9 +1139,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
>  	case UC_ENABLE:
>  	case UC_FORCE:
>  		if (git_config_get_untracked_cache() == 0)
> -			warning("core.untrackedCache is set to false; "
> -				"remove or change it, if you really want to "
> -				"enable the untracked cache");
> +			warning(_("core.untrackedCache is set to false; "
> +				  "remove or change it, if you really want to "
> +				  "enable the untracked cache"));
>  		add_untracked_cache(&the_index);
>  		report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
>  		break;
> @@ -1156,7 +1156,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
>  			unable_to_lock_die(get_index_file(), lock_error);
>  		}
>  		if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
> -			die("Unable to write new index file");
> +			die(_("Unable to write new index file"));
>  	}
>  
>  	rollback_lock_file(lock_file);
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]