h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-07 01:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

gettext: don't cache messages outside of gettext

Browse Source 
Using gettext by calling it once on initialization and then reusing the
result prevents changes to the messages as when locale variables change.
A call to the gettext implementation should be made every time the
message is used to handle language changes.

Closes #12012
This commit is contained in:
Daniel Rainer
2025-10-31 17:36:41 +01:00
committed by Johannes Altmanninger
parent 525c9bbdcb
commit f511ef69c3
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/complete.rs
View File

@@ -61,14 +61,16 @@
// There are a few more completion description strings defined in expand.rs. Maybe all completion
// description strings should be defined in the same file?
/// Description for ~USER completion.
static COMPLETE_USER_DESC: Lazy<&wstr> = Lazy::new(|| wgettext!("Home for %s"));
localizable_consts!(
/// Description for ~USER completion.
COMPLETE_USER_DESC "Home for %s"
/// Description for short variables. The value is concatenated to this description.
static COMPLETE_VAR_DESC_VAL: Lazy<&wstr> = Lazy::new(|| wgettext!("Variable: %s"));
/// Description for short variables. The value is concatenated to this description.
COMPLETE_VAR_DESC_VAL "Variable: %s"
/// Description for abbreviations.
static ABBR_DESC: Lazy<&wstr> = Lazy::new(|| wgettext!("Abbreviation: %s"));
/// Description for abbreviations.
ABBR_DESC "Abbreviation: %s"
);
#[derive(Clone, Copy, Default, PartialEq, Eq, Debug)]
pub struct CompletionMode {
@@ -1145,7 +1147,7 @@ fn complete_abbr(&mut self, cmd: WString) {
let desc_func = move |key: &wstr| {
let replacement = descs.get(key).expect("Abbreviation not found");
sprintf!(*ABBR_DESC, replacement)
wgettext_fmt!(ABBR_DESC, replacement)
};
self.complete_strings(
&cmd,
@@ -1683,7 +1685,7 @@ fn complete_variable(&mut self, s: &wstr, start_offset: usize) -> bool {
};
let value = expand_escape_variable(&var);
desc = sprintf!(*COMPLETE_VAR_DESC_VAL, value);
desc = wgettext_fmt!(COMPLETE_VAR_DESC_VAL, value);
}
}
@@ -1812,7 +1814,7 @@ fn getpwent_name() -> Option<WString> {
}
if string_prefixes_string(user_name, &pw_name) {
let desc = sprintf!(*COMPLETE_USER_DESC, &pw_name);
let desc = wgettext_fmt!(COMPLETE_USER_DESC, &pw_name);
// Append a user name.
// TODO: propagate overflow?
let _ = self.completions.add(Completion::new(
@@ -1824,7 +1826,7 @@ fn getpwent_name() -> Option<WString> {
result = true;
} else if string_prefixes_string_case_insensitive(user_name, &pw_name) {
let name = sprintf!("~%s", &pw_name);
let desc = sprintf!(*COMPLETE_USER_DESC, &pw_name);
let desc = wgettext_fmt!(COMPLETE_USER_DESC, &pw_name);
// Append a user name
// TODO: propagate overflow?

27
src/wildcard.rs
View File

@@ -20,14 +20,15 @@
};
use crate::wutil::dir_iter::DirEntryType;
use crate::wutil::{dir_iter::DirEntry, lwstat, waccess};
use once_cell::sync::Lazy;
static COMPLETE_EXEC_DESC: Lazy<&wstr> = Lazy::new(|| wgettext!("command"));
static COMPLETE_EXEC_LINK_DESC: Lazy<&wstr> = Lazy::new(|| wgettext!("command link"));
static COMPLETE_FILE_DESC: Lazy<&wstr> = Lazy::new(|| wgettext!("file"));
static COMPLETE_SYMLINK_DESC: Lazy<&wstr> = Lazy::new(|| wgettext!("symlink"));
static COMPLETE_DIRECTORY_SYMLINK_DESC: Lazy<&wstr> = Lazy::new(|| wgettext!("dir symlink"));
static COMPLETE_DIRECTORY_DESC: Lazy<&wstr> = Lazy::new(|| wgettext!("directory"));
localizable_consts!(
COMPLETE_EXEC_DESC "command"
COMPLETE_EXEC_LINK_DESC "command link"
COMPLETE_FILE_DESC "file"
COMPLETE_SYMLINK_DESC "symlink"
COMPLETE_DIRECTORY_SYMLINK_DESC "dir symlink"
COMPLETE_DIRECTORY_DESC "directory"
);
/// Character representing any character except '/' (slash).
pub const ANY_CHAR: char = char_offset(WILDCARD_RESERVED_BASE, 0);
@@ -313,18 +314,18 @@ fn file_get_desc(
return if is_link {
if is_dir {
*COMPLETE_DIRECTORY_SYMLINK_DESC
wgettext!(COMPLETE_DIRECTORY_SYMLINK_DESC)
} else if is_executable(filename) {
*COMPLETE_EXEC_LINK_DESC
wgettext!(COMPLETE_EXEC_LINK_DESC)
} else {
*COMPLETE_SYMLINK_DESC
wgettext!(COMPLETE_SYMLINK_DESC)
}
} else if is_dir {
*COMPLETE_DIRECTORY_DESC
wgettext!(COMPLETE_DIRECTORY_DESC)
} else if is_executable(filename) {
*COMPLETE_EXEC_DESC
wgettext!(COMPLETE_EXEC_DESC)
} else {
*COMPLETE_FILE_DESC
wgettext!(COMPLETE_FILE_DESC)
};
}