fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-07 21:50:08 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: adds option key-language

Browse Source 
Fixes #2503
This commit is contained in:
Carter Li
2026-08-14 23:33:54 +08:00
parent 3908c39ce2
commit f95167e907
157 changed files with 638 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/terminalfont/terminalfont.c
+5 -7
View File
@@ -4,8 +4,6 @@
#include "detection/terminalfont/terminalfont.h"
#include "modules/terminalfont/terminalfont.h"
#define FF_TERMINALFONT_DISPLAY_NAME "Terminal Font"
bool ffPrintTerminalFont(FFTerminalFontOptions* options) {
bool success = false;
FFTerminalFontResult terminalFont;
@@ -14,10 +12,10 @@ bool ffPrintTerminalFont(FFTerminalFontOptions* options) {
ffStrbufInit(&terminalFont.error);
if (!ffDetectTerminalFont(&terminalFont)) {
ffPrintError(FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", terminalFont.error.chars);
ffPrintError(FF_MODULE_GET_DISPLAY_NAME(TerminalFont), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", terminalFont.error.chars);
} else {
if (options->moduleArgs.outputFormat.length == 0) {
ffPrintLogoAndKey(FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(TerminalFont), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
ffStrbufWriteTo(&terminalFont.font.pretty, stdout);
if (terminalFont.fallback.pretty.length) {
fputs(" / ", stdout);
@@ -25,7 +23,7 @@ bool ffPrintTerminalFont(FFTerminalFontOptions* options) {
}
putchar('\n');
} else {
FF_PRINT_FORMAT_CHECKED(FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(TerminalFont), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
FF_ARG(terminalFont.font.pretty, "combined"),
FF_ARG(terminalFont.font.name, "name"),
FF_ARG(terminalFont.font.size, "size"),
@@ -50,7 +48,7 @@ void ffParseTerminalFontJsonObject(FFTerminalFontOptions* options, yyjson_val* m
continue;
}
ffPrintError(FF_TERMINALFONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
ffPrintError(FF_MODULE_GET_DISPLAY_NAME(TerminalFont), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}
@@ -105,7 +103,7 @@ void ffDestroyTerminalFontOptions(FFTerminalFontOptions* options) {
}
FFModuleBaseInfo ffTerminalFontModuleInfo = {
.name = FF_TERMINALFONT_MODULE_NAME,
.name = "TerminalFont",
.description = "Print the font name and size used by the current terminal",
.displayName = {
.en = "Terminal Font",
src/modules/terminalfont/terminalfont.h
-2
View File
@@ -2,8 +2,6 @@
#include "option.h"
#define FF_TERMINALFONT_MODULE_NAME "TerminalFont"
bool ffPrintTerminalFont(FFTerminalFontOptions* options);
void ffInitTerminalFontOptions(FFTerminalFontOptions* options);
void ffDestroyTerminalFontOptions(FFTerminalFontOptions* options);