Mercurial > vim
changeset 32499:0d2b75395eda v9.0.1581
patch 9.0.1581: translation does not work for plural argument
Commit: https://github.com/vim/vim/commit/a1d5f9f33c68d06475406d6f44d307d5e01adc01
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat May 27 13:40:11 2023 +0100
patch 9.0.1581: translation does not work for plural argument
Problem: Translation does not work for plural argument.
Solution: Use PLURAL_MSG() for errors and with xgettext. (closes https://github.com/vim/vim/issues/12443)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 27 May 2023 14:45:04 +0200 |
| parents | 6e64f36e3dcc |
| children | 2c5d32878fcb |
| files | src/errors.h src/po/Make_all.mak src/po/Make_cyg.mak src/po/Make_ming.mak src/po/Make_mvc.mak src/po/Makefile src/version.c |
| diffstat | 7 files changed, 35 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -6,6 +6,18 @@ * Do ":help credits" in Vim to see a list of people who contributed. */ +// Use PLURAL_MSG() for messages that are passed to ngettext(), so that the +// second one uses msgid_plural. +#ifdef DO_INIT +# define PLURAL_MSG(var1, msg1, var2, msg2) \ + char var1[] = msg1; \ + char var2[] = msg2; +#else +# define PLURAL_MSG(var1, msg1, var2, msg2) \ + extern char var1[]; \ + extern char var2[]; +#endif + /* * Definition of error messages, sorted on error number. */ @@ -398,10 +410,10 @@ EXTERN char e_missing_endif[] EXTERN char e_missing_marker[] INIT(= N_("E172: Missing marker")); #endif -EXTERN char e_nr_more_file_to_edit[] - INIT(= N_("E173: %d more file to edit")); -EXTERN char e_nr_more_files_to_edit[] - INIT(= N_("E173: %d more files to edit")); + +PLURAL_MSG(e_nr_more_file_to_edit, "E173: %d more file to edit", + e_nr_more_files_to_edit, "E173: %d more files to edit") + EXTERN char e_command_already_exists_add_bang_to_replace_it_str[] INIT(= N_("E174: Command already exists: add ! to replace it: %s")); EXTERN char e_no_attribute_specified[] @@ -2832,10 +2844,10 @@ EXTERN char e_missing_gt[] INIT(= N_("E1104: Missing >")); EXTERN char e_cannot_convert_str_to_string[] INIT(= N_("E1105: Cannot convert %s to string")); -EXTERN char e_one_argument_too_many[] - INIT(= N_("E1106: One argument too many")); -EXTERN char e_nr_arguments_too_many[] - INIT(= N_("E1106: %d arguments too many")); + +PLURAL_MSG(e_one_argument_too_many, "E1106: One argument too many", + e_nr_arguments_too_many, "E1106: %d arguments too many") + EXTERN char e_string_list_dict_or_blob_required[] INIT(= N_("E1107: String, List, Dict or Blob required")); EXTERN char e_list_item_nr_is_not_list[] @@ -3019,10 +3031,10 @@ EXTERN char e_cannot_open_terminal_from_ #ifdef FEAT_EVAL EXTERN char e_cannot_use_legacy_with_command_str[] INIT(= N_("E1189: Cannot use :legacy with this command: %s")); -EXTERN char e_one_argument_too_few[] - INIT(= N_("E1190: One argument too few")); -EXTERN char e_nr_arguments_too_few[] - INIT(= N_("E1190: %d arguments too few")); + +PLURAL_MSG(e_one_argument_too_few, "E1190: One argument too few", + e_nr_arguments_too_few, "E1190: %d arguments too few") + EXTERN char e_call_to_function_that_failed_to_compile_str[] INIT(= N_("E1191: Call to function that failed to compile: %s")); EXTERN char e_empty_function_name[]
--- a/src/po/Make_all.mak +++ b/src/po/Make_all.mak @@ -188,3 +188,5 @@ PO_VIM_JSLIST = \ optwin.js \ defaults.js +# Arguments for xgettext to pick up messages to translate from the source code. +XGETTEXT_KEYWORDS = --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --keyword=PLURAL_MSG:2,4
--- a/src/po/Make_cyg.mak +++ b/src/po/Make_cyg.mak @@ -66,14 +66,14 @@ PO_INPUTLIST = \ first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(XGETTEXT) --default-domain=$(LANGUAGE) \ - --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(PO_INPUTLIST) $(PO_VIM_JSLIST) + --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST) $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(XGETTEXT) --default-domain=$(PACKAGE) \ - --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(PO_INPUTLIST) $(PO_VIM_JSLIST) + --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST) $(MV) $(PACKAGE).po $(PACKAGE).pot $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js
--- a/src/po/Make_ming.mak +++ b/src/po/Make_ming.mak @@ -79,14 +79,14 @@ PO_INPUTLIST = \ first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(XGETTEXT) --default-domain=$(LANGUAGE) \ - --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(PO_INPUTLIST) $(PO_VIM_JSLIST) + --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST) $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(XGETTEXT) --default-domain=$(PACKAGE) \ - --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(PO_INPUTLIST) $(PO_VIM_JSLIST) + --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST) $(MV) $(PACKAGE).po $(PACKAGE).pot $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js
--- a/src/po/Make_mvc.mak +++ b/src/po/Make_mvc.mak @@ -60,7 +60,7 @@ first_time: files $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes - $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(PO_VIM_JSLIST) + $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments $(XGETTEXT_KEYWORDS) --files-from=.\files $(PO_VIM_JSLIST) $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js @@ -68,7 +68,7 @@ first_time: files $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes - $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(PO_VIM_JSLIST) + $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments $(XGETTEXT_KEYWORDS) --files-from=.\files $(PO_VIM_JSLIST) $(MV) $(PACKAGE).po $(PACKAGE).pot $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js
--- a/src/po/Makefile +++ b/src/po/Makefile @@ -208,8 +208,7 @@ PO_INPUTLIST = \ $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) # create vim.pot $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments \ - --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 \ - $(PO_INPUTLIST) $(PO_VIM_JSLIST) + $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST) mv -f $(PACKAGE).po $(PACKAGE).pot # Fix Vim scripts names, so that "gf" works $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)