Use Yast::Builtins.strftime in 'Change Filter' dialog #45
Conversation
srinidhibs
force-pushed
the
bnc#1081459
branch
from
23230fd
to
e6191f7
Compare
src/lib/y2journal/query_presenter.rb
Outdated
| @@ -96,6 +96,11 @@ def interval_description | |||
| end | |||
| end | |||
|
|
|||
| # Split journalctl timestamp at "—"; localize and return the joined string back | |||
| def self.localize_timestamp(ts) | |||
| ts.map { |t| Yast::Builtins.strftime(t, "%c") }.join(" to ") | |||
There was a problem hiding this comment.
This is actually a non-translatable string. No matter in which language you are, it will always be
"$DATE1 to $DATE2". The dates themselves maybe look nicer than the previous version (which uses the default journalctl output which is not exactly pretty), but we should not introduce a hardcoded English sentence.
|
Hi @srinidhibs! I hope you’re staying healthy. Do you plan to continue with this PR? Thanks! |
|
Hello @dgdavid
Yes, thank you for asking! I hope the same for you as well!
Yes. I'm really sorry about the radio silence! The machine which I was using for my FOSS contributions had run into some issues. I'll work on it this weekend and try to update this PR soon after that. Regards, |
src/lib/y2journal/query_presenter.rb
Outdated
|
|
||
| # TRANSLATORS: %<first>s and %<last>s will be replaced by already localized | ||
| # timestamps indicating when the system booted and when it was shut down | ||
| _(format("%<first>s to %<last>s", first: start_time, last: end_time)) |
There was a problem hiding this comment.
This cannot work, you are executing format first and then passing the result (for example "2021-03-20 to 2021-03-21") to _(). Obviously, such string will not be found for translation.
It can only work the other way around: format(_("blah %<first>"), first: start_time)
There was a problem hiding this comment.
Shouldn't you apply some format to the timestamps here? Right now it would look like this (in my current Ruby version, that may change in the future):
2021-08-27 10:31:01 +0200 to 2021-08-30 15:36:09 +0200
I think that looks even uglier than before.
What about something like this?
def self.localize_timestamp(boot)
start_time = Yast::Builtins.strftime(boot[:timestamps][:first], "%c")
end_time = Yast::Builtins.strftime(boot[:timestamps][:last], "%c")
# TRANSLATORS: blah
format(_("%<first>s to %<last>s"), first: start_time, last: end_time)
endThere was a problem hiding this comment.
@ancorgs I'm sorry! There are a couple of changes that I forgot to push. I thought of using the existing TIME_FORMAT that is defined in the same file:
TIME_FORMAT = "%b %d %H:%M:%S".freezeWould this be acceptable? I've also fixed the format(_(...)) problem that you called out earlier.
There was a problem hiding this comment.
Sure, it fully makes sense.
Again, sorry for the late reply. :-(
There was a problem hiding this comment.
Those extra changes were never pushed. But it's a shame to leave this contribution in this almost-finished status. So I guess I will cherry-pick @srinidhibs commits in a new branch and try to fix the standing issues myself.
Unless @srinidhibs still has those commits around and he manages to finally push them, of course. 😉
There was a problem hiding this comment.
Hey @ancorgs! I'm sorry for dropping the ball on this one! Can you please give me a couple of days? I'll try to find out if I've unfinished work in my local branch and try to close this soon.
from QueryPresenter#interval_description enabled by making the `boot[:timestamps]` hash mimic the `interval` hash
|
✔️ Internal Jenkins job #18 successfully finished |
|
✔️ Public Jenkins job #27 successfully finished |
PR #45 reintroduced a dependency on the old output of `journalctl --list-boots` by looking for an Em Dash to separate the two timestamps. Now there is a space. Let's allow the Em Dash for compatibility. test/data/list-boots-*.out use both.
Fixes bsc#1081459
"SLEx_15_LOC : YaST:ALL_LANGS:Possible untranslated day abbreviation in Systemd Journal/Entries to Display Filter dialog"