From 8aeafa13c90df7d3b723ab05d221052f8b3bae8f Mon Sep 17 00:00:00 2001 From: Daniel Rainer Date: Fri, 17 Oct 2025 23:27:39 +0200 Subject: [PATCH] format strings: remove length modifier This length modifier was reintroduced in b7fe3190bba1e7d314d3b4e65000f9cd8b6d6e38, which reverts 993b977c9b1d730c66c132b875e7e0db122e881d, a commit predating the removal of redundant length modifiers in format strings. Closes #11968 --- po/de.po | 8 ++++---- po/en.po | 8 ++++---- po/fr.po | 8 ++++---- po/pl.po | 8 ++++---- po/pt_BR.po | 8 ++++---- po/sv.po | 8 ++++---- po/zh_CN.po | 8 ++++---- src/builtins/function.rs | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/po/de.po b/po/de.po index 07f0f1940..36d6d31e4 100644 --- a/po/de.po +++ b/po/de.po @@ -82,10 +82,6 @@ msgstr "$status ist kein gültiger Befehl. Siehe `help conditions`" msgid "%.*s: invalid conversion specification" msgstr "%.*s: Ungültige Umwandlungsspezifikation" -#, c-format -msgid "%ls: function name required" -msgstr "%ls: Brauche Funktionsnamen" - #, c-format msgid "%s" msgstr "" @@ -718,6 +714,10 @@ msgstr "%s: Erwartete numerischen Wert" msgid "%s: fish was not built with embedded files" msgstr "" +#, c-format +msgid "%s: function name required" +msgstr "%s: Brauche Funktionsnamen" + #, c-format msgid "%s: given %d indexes but %d values\n" msgstr "" diff --git a/po/en.po b/po/en.po index ae8cfc776..5954c4513 100644 --- a/po/en.po +++ b/po/en.po @@ -80,10 +80,6 @@ msgstr "" msgid "%.*s: invalid conversion specification" msgstr "%.*s: invalid conversion specification" -#, c-format -msgid "%ls: function name required" -msgstr "" - #, c-format msgid "%s" msgstr "" @@ -716,6 +712,10 @@ msgstr "%s: expected a numeric value" msgid "%s: fish was not built with embedded files" msgstr "" +#, c-format +msgid "%s: function name required" +msgstr "" + #, c-format msgid "%s: given %d indexes but %d values\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index abc0852d1..b45ac080d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -181,10 +181,6 @@ msgstr "" msgid "%.*s: invalid conversion specification" msgstr "%.*s : spécification de conversion invalide" -#, c-format -msgid "%ls: function name required" -msgstr "" - #, c-format msgid "%s" msgstr "" @@ -817,6 +813,10 @@ msgstr "%s : valeur numérique attendue" msgid "%s: fish was not built with embedded files" msgstr "" +#, c-format +msgid "%s: function name required" +msgstr "" + #, c-format msgid "%s: given %d indexes but %d values\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index d40f49015..ee897210a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -76,10 +76,6 @@ msgstr "" msgid "%.*s: invalid conversion specification" msgstr "" -#, c-format -msgid "%ls: function name required" -msgstr "" - #, c-format msgid "%s" msgstr "" @@ -712,6 +708,10 @@ msgstr "%s: oczekiwano wartości liczbowej" msgid "%s: fish was not built with embedded files" msgstr "" +#, c-format +msgid "%s: function name required" +msgstr "" + #, c-format msgid "%s: given %d indexes but %d values\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 011df1307..5714f2ff2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -81,10 +81,6 @@ msgstr "" msgid "%.*s: invalid conversion specification" msgstr "%.*s: especificação de conversão inválida" -#, c-format -msgid "%ls: function name required" -msgstr "" - #, c-format msgid "%s" msgstr "" @@ -717,6 +713,10 @@ msgstr "%s: esperava valor numérico" msgid "%s: fish was not built with embedded files" msgstr "" +#, c-format +msgid "%s: function name required" +msgstr "" + #, c-format msgid "%s: given %d indexes but %d values\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 7be5cb0ba..a1ab2ce75 100644 --- a/po/sv.po +++ b/po/sv.po @@ -77,10 +77,6 @@ msgstr "" msgid "%.*s: invalid conversion specification" msgstr "" -#, c-format -msgid "%ls: function name required" -msgstr "" - #, c-format msgid "%s" msgstr "" @@ -713,6 +709,10 @@ msgstr "" msgid "%s: fish was not built with embedded files" msgstr "" +#, c-format +msgid "%s: function name required" +msgstr "" + #, c-format msgid "%s: given %d indexes but %d values\n" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index af9c76ef2..892277987 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -103,10 +103,6 @@ msgstr "$status 不是有效的命令。参见 `help conditions`" msgid "%.*s: invalid conversion specification" msgstr "%.*s: 无效的转换规范" -#, c-format -msgid "%ls: function name required" -msgstr "%ls: 函数名称是必须的" - #, c-format msgid "%s" msgstr "%s" @@ -739,6 +735,10 @@ msgstr "%s: 预期收到数值" msgid "%s: fish was not built with embedded files" msgstr "%s: fish 构建时未包含嵌入文件" +#, c-format +msgid "%s: function name required" +msgstr "%s: 函数名称是必须的" + #, c-format msgid "%s: given %d indexes but %d values\n" msgstr "%s: 给定索引 %d 但只有 %d 个值\n" diff --git a/src/builtins/function.rs b/src/builtins/function.rs index 6f03e87e8..477fcf4cb 100644 --- a/src/builtins/function.rs +++ b/src/builtins/function.rs @@ -244,7 +244,7 @@ fn validate_function_name( if argv.len() < 2 { streams .err - .append(wgettext_fmt!("%ls: function name required", cmd)); + .append(wgettext_fmt!("%s: function name required", cmd)); return Err(STATUS_INVALID_ARGS); } *function_name = argv[1].to_owned();