Restore more f-strings that do not need localisation

Some f-strings changed to the format method in earlier commits do not
need localisation. This commit restores them to reduce the amount of
changes.

Author: ic

src/click/core.py

@@ -84,19 +84,15 @@ def _check_nested_chain(
         return
 
     if register:
-        message = (
+        message = _(
             "It is not possible to add the group {cmd_name!r} to another"
-            " group {base_cmd_name!r} that is in chain mode.".format(
-                cmd_name=cmd_name, base_cmd_name=base_command.name
-            )  # noqa: UP032
-        )
+            " group {base_cmd_name!r} that is in chain mode."
+        ).format(cmd_name=cmd_name, base_cmd_name=base_command.name)  # noqa: UP032
     else:
-        message = (
+        message = _(
             "Found the group {cmd_name!r} as subcommand to another group "
-            " {base_cmd_name!r} that is in chain mode. This is not supported.".format(
-                cmd_name=cmd_name, base_cmd_name=base_command.name
-            )  # noqa: UP032
-        )
+            " {base_cmd_name!r} that is in chain mode. This is not supported."
+        ).format(cmd_name=cmd_name, base_cmd_name=base_command.name)  # noqa: UP032
 
     raise RuntimeError(message)
 
@@ -2137,10 +2133,10 @@ def __init__(
         if __debug__:
             if self.type.is_composite and nargs != self.type.arity:
                 raise ValueError(
-                    "'nargs' must be {arity} (or None) for"
-                    " type {type!r}, but it was {nargs}.".format(
-                        arity=self.type.arity, type=self.type, nargs=nargs
-                    )
+                    _(
+                        "'nargs' must be {arity} (or None) for"
+                        " type {type!r}, but it was {nargs}."
+                    ).format(arity=self.type.arity, type=self.type, nargs=nargs)
                 )
 
             # Skip no default or callable default.

src/click/decorators.py

@@ -93,9 +93,11 @@ def new_func(*args: P.args, **kwargs: P.kwargs) -> R:
 
             if obj is None:
                 raise RuntimeError(
-                    "Managed to invoke callback without a context"
-                    " object of type {type!r}"
-                    " existing.".format(type=object_type.__name__)  # noqa: UP032
+                    _(
+                        "Managed to invoke callback without a context"
+                        " object of type {type!r}"
+                        " existing."
+                    ).format(type=object_type.__name__)  # noqa: UP032
                 )  # noqa: UP032
 
             return ctx.invoke(f, obj, *args, **kwargs)
@@ -129,14 +131,14 @@ def new_func(*args: P.args, **kwargs: P.kwargs) -> R:
         return update_wrapper(new_func, f)
 
     if doc_description is None:
-        doc_description = "the {key!r} key from :attr:`click.Context.meta`".format(
+        doc_description = _("the {key!r} key from :attr:`click.Context.meta`").format(
             key=key
         )  # noqa: UP032
 
-    decorator.__doc__ = (
+    decorator.__doc__ = _(
         "Decorator that passes {description} as the first argument"
-        " to the decorated function.".format(description=doc_description)  # noqa: UP032
-    )
+        " to the decorated function."
+    ).format(description=doc_description)  # noqa: UP032
     return decorator
 
 
@@ -508,13 +510,15 @@ def callback(ctx: Context, param: Parameter, value: bool) -> None:
                 version = importlib.metadata.version(package_name)
             except importlib.metadata.PackageNotFoundError:
                 raise RuntimeError(
-                    "{name!r} is not installed. Try passing"
-                    " 'package_name' instead.".format(name=package_name)  # noqa: UP032
+                    _(
+                        "{name!r} is not installed. Try passing"
+                        " 'package_name' instead."
+                    ).format(name=package_name)  # noqa: UP032
                 ) from None
 
         if version is None:
             raise RuntimeError(
-                "Could not determine the version for {name!r} automatically.".format(
+                _("Could not determine the version for {name!r} automatically.").format(
                     name=package_name
                 )  # noqa: UP032
             )

src/click/formatting.py

@@ -155,9 +155,7 @@ def write_usage(self, prog: str, args: str = "", prefix: str | None = None) -> N
         if prefix is None:
             prefix = "{usage} ".format(usage=_("Usage:"))
 
-        usage_prefix = "{prefix:>{indent}}{prog} ".format(
-            prefix=prefix, indent=self.current_indent, prog=prog
-        )
+        usage_prefix = f"{prefix:>{self.current_indent}}{prog} "
         text_width = self.width - self.current_indent
 
         if text_width >= (term_len(usage_prefix) + 20):
@@ -186,11 +184,7 @@ def write_usage(self, prog: str, args: str = "", prefix: str | None = None) -> N
 
     def write_heading(self, heading: str) -> None:
         """Writes a heading into the buffer."""
-        self.write(
-            "{prefix:>{indent}}{message}:\n".format(
-                prefix="", indent=self.current_indent, message=heading
-            )
-        )
+        self.write(f"{'':>{self.current_indent}}{heading}:\n")
 
     def write_paragraph(self) -> None:
         """Writes a paragraph into the buffer."""
@@ -235,11 +229,7 @@ def write_dl(
         first_col = min(widths[0], col_max) + col_spacing
 
         for first, second in iter_rows(rows, len(widths)):
-            self.write(
-                "{prefix:>{indent}}{message}".format(
-                    prefix="", indent=self.current_indent, message=first
-                )
-            )
+            self.write(f"{'':>{self.current_indent}}{first}")
             if not second:
                 self.write("\n")
                 continue
@@ -257,13 +247,7 @@ def write_dl(
                 self.write(f"{lines[0]}\n")
 
                 for line in lines[1:]:
-                    self.write(
-                        "{prefix:>{indent}}{message}\n".format(
-                            prefix="",
-                            indent=first_col + self.current_indent,
-                            message=line,
-                        )
-                    )
+                    self.write(f"{'':>{first_col + self.current_indent}}{line}\n")
             else:
                 self.write("\n")
 

src/click/shell_completion.py

@@ -1,11 +1,3 @@
-# Ask Ruff to accept the format method on strings, and not let pyupgrade
-# always force f-strings. The latter are unfortunately not supported yet
-# by Babel, a localisation library.
-#
-# Note: Using `# noqa: UP032` on lines has not worked, so a file
-#       setting.
-# ruff: noqa: UP032
-
 from __future__ import annotations
 
 import collections.abc as cabc
@@ -381,9 +373,7 @@ def get_completion_args(self) -> tuple[list[str], str]:
         return args, incomplete
 
     def format_completion(self, item: CompletionItem) -> str:
-        return "{type}\n{value}\n{help}".format(
-            type=item.type, value=item.value, help=item.help if item.help else "_"
-        )
+        return f"{item.type}\n{item.value}\n{item.help if item.help else '_'}"
 
 
 class FishComplete(ShellComplete):
@@ -406,9 +396,7 @@ def get_completion_args(self) -> tuple[list[str], str]:
 
     def format_completion(self, item: CompletionItem) -> str:
         if item.help:
-            return "{type},{value}\t{help}".format(
-                type=item.type, value=item.value, help=item.help
-            )  # noqa: UP032
+            return f"{item.type},{item.value}\t{item.help}"
 
         return f"{item.type},{item.value}"
 

src/click/types.py

@@ -326,10 +326,10 @@ def get_metavar(self, param: Parameter, ctx: Context) -> str | None:
 
         # Use curly braces to indicate a required argument.
         if param.required and param.param_type_name == "argument":
-            return "{{{choices}}}".format(choices=choices_str)  # noqa: UP032
+            return f"{{{choices_str}}}"
 
         # Use square braces to indicate an option or optional argument.
-        return "[{choices}]".format(choices=choices_str)  # noqa: UP032
+        return f"[{choices_str}]"
 
     def get_missing_message(self, param: Parameter, ctx: Context | None) -> str:
         """
@@ -442,7 +442,7 @@ def to_info_dict(self) -> dict[str, t.Any]:
         return info_dict
 
     def get_metavar(self, param: Parameter, ctx: Context) -> str | None:
-        return "[{formats}]".format(formats="|".join(self.formats))  # noqa: UP032
+        return f"[{'|'.join(self.formats)}]"
 
     def _try_to_convert_date(self, value: t.Any, format: str) -> datetime | None:
         try: