diff --git a/src/builtins/set.rs b/src/builtins/set.rs index c747972fb..00ef89752 100644 --- a/src/builtins/set.rs +++ b/src/builtins/set.rs @@ -665,7 +665,7 @@ fn show_scope(var_name: &wstr, scope: EnvMode, streams: &mut IoStreams, vars: &d value, EscapeStringStyle::Script(EscapeFlags::NO_PRINTABLES | EscapeFlags::NO_QUOTED), ); - streams.out.append(wgettext_fmt!( + streams.out.append(sprintf!( "$%ls[%d]: |%ls|\n", var_name, i + 1, diff --git a/src/builtins/shared.rs b/src/builtins/shared.rs index a265d2438..7651153ef 100644 --- a/src/builtins/shared.rs +++ b/src/builtins/shared.rs @@ -921,7 +921,7 @@ fn builtin_breakpoint( .map_or(true, |b| b.typ() == BlockType::breakpoint) { streams.err.append(wgettext_fmt!( - "%ls: Command not valid at and interactive prompt\n", + "%ls: Command not valid at an interactive prompt\n", cmd, )); return STATUS_ILLEGAL_CMD; diff --git a/src/builtins/ulimit.rs b/src/builtins/ulimit.rs index bee691725..4f771a371 100644 --- a/src/builtins/ulimit.rs +++ b/src/builtins/ulimit.rs @@ -67,7 +67,7 @@ fn print_all(hard: bool, streams: &mut IoStreams) { } else { "(kB, " }; - streams.out.append(wgettext_fmt!( + streams.out.append(sprintf!( "%-*ls %10ls-%lc) ", w, resource.desc, diff --git a/src/parser.rs b/src/parser.rs index db6b4fb9d..e9c43adca 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -987,7 +987,7 @@ pub fn get_backtrace(&self, src: &wstr, errors: &ParseErrorList) -> WString { which_line ) } else { - wgettext_fmt!("%ls: ", user_presentable_path(&filename, self.vars())) + sprintf!("%ls: ", user_presentable_path(&filename, self.vars())) } } else { L!("fish: ").to_owned()