51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
|
diff -u -r ../newsboat-2.18/rust/libnewsboat/src/configpaths.rs ./rust/libnewsboat/src/configpaths.rs
|
||
|
|
--- ../newsboat-2.18/rust/libnewsboat/src/configpaths.rs 2019-12-22 11:56:20.000000000 +0000
|
||
|
|
+++ ./rust/libnewsboat/src/configpaths.rs 2020-01-02 20:41:18.852245000 +0000
|
||
|
|
@@ -1,6 +1,5 @@
|
||
|
|
use cliargsparser::CliArgsParser;
|
||
|
|
use dirs;
|
||
|
|
-use gettextrs::gettext;
|
||
|
|
use libc;
|
||
|
|
use logger::{self, Level};
|
||
|
|
use std::fs::{self, DirBuilder};
|
||
|
|
@@ -69,11 +68,9 @@
|
||
|
|
let uid = unsafe { libc::getuid() };
|
||
|
|
|
||
|
|
config_paths.error_message = fmt!(
|
||
|
|
- &gettext(
|
||
|
|
"Fatal error: couldn't determine home directory!\n\
|
||
|
|
Please set the HOME environment variable or add \
|
||
|
|
- a valid user for UID %u!"
|
||
|
|
- ),
|
||
|
|
+ a valid user for UID %u!",
|
||
|
|
uid
|
||
|
|
);
|
||
|
|
|
||
|
|
@@ -131,7 +128,7 @@
|
||
|
|
if !self.silent {
|
||
|
|
eprintln!(
|
||
|
|
"{}",
|
||
|
|
- &gettext("Migrating configs and data from Newsbeuter's XDG dirs...")
|
||
|
|
+ "Migrating configs and data from Newsbeuter's XDG dirs..."
|
||
|
|
);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -187,7 +184,7 @@
|
||
|
|
if !self.silent {
|
||
|
|
eprintln!(
|
||
|
|
"{}",
|
||
|
|
- &gettext("Migrating configs and data from ~/.newsbeuter/...")
|
||
|
|
+ "Migrating configs and data from ~/.newsbeuter/..."
|
||
|
|
);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -199,7 +196,7 @@
|
||
|
|
eprintln!(
|
||
|
|
"{}",
|
||
|
|
&fmt!(
|
||
|
|
- &gettext("Aborting migration because mkdir on `%s' failed: %s"),
|
||
|
|
+ "Aborting migration because mkdir on `%s' failed: %s",
|
||
|
|
&newsboat_dir.to_string_lossy().into_owned(),
|
||
|
|
err.to_string()
|
||
|
|
)
|