Manually rebase

rustcoreutils · Oct 25, 2024 · 16ce4bd · 16ce4bd
1 parent 6e0c8ac
commit 16ce4bd
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/text/grep.rs b/text/grep.rs
@@ -8,9 +8,8 @@
 //
 
 use clap::Parser;
-use gettextrs::{bind_textdomain_codeset, textdomain};
+use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
 use libc::{regcomp, regex_t, regexec, regfree, regmatch_t, REG_EXTENDED, REG_ICASE, REG_NOMATCH};
-use plib::PROJECT_NAME;
 use std::{
     ffi::CString,
     fs::File,
@@ -640,9 +639,10 @@ impl GrepModel {
 //     1 - No lines were selected.
 //     >1 - An error occurred.
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
-    // Parse command line arguments
+    setlocale(LocaleCategory::LcAll, "");
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
+
     let mut args = Args::parse();
 
     let exit_code = args