superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

terminal: fix build with -Di18n=false 

canonicalizeLocale should return a null-terminated string, and didn't previously.

Compiler output:
```
src/os/i18n.zig:139:45: error: expected type 'error{NoSpaceLeft}![:0]const u8', found '[]const u8'
    if (comptime !build_config.i18n) return locale;
                                            ^~~~~~
src/os/i18n.zig:139:45: note: destination pointer requires '0' sentinel
src/os/i18n.zig:138:21: note: function return type declared here
) error{NoSpaceLeft}![:0]const u8 {
  ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
```
pull/8359/head
Cheru Berhanu 2025-08-14 18:22:28 -07:00
parent 0c722b0e3d
commit 292efec669
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/os/i18n.zig
View File

@ -136,7 +136,12 @@ pub fn canonicalizeLocale(
buf: []u8, buf: []u8,
locale: []const u8, locale: []const u8,
) error{NoSpaceLeft}![:0]const u8 { ) error{NoSpaceLeft}![:0]const u8 {
if (comptime !build_config.i18n) return locale; if (comptime !build_config.i18n) {
if (buf.len < locale.len + 1) return error.NoSpaceLeft;
@memcpy(buf[0..locale.len], locale);
buf[locale.len] = 0;
return buf[0..locale.len :0];
}
// Fix zh locales for macOS // Fix zh locales for macOS
if (fixZhLocale(locale)) |fixed| { if (fixZhLocale(locale)) |fixed| {