From 6d9901ee3c26cc80eb3ac3eba44e59bd94910ec9 Mon Sep 17 00:00:00 2001 From: Oneric Date: Sat, 29 Apr 2023 01:33:40 +0200 Subject: [PATCH] po/make_pot: use gettext to process desktop file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gettext understands desktop files since 0.19 (2014), so there’s no need for custom grep logic. This change matches meson’s i18n which also uses gettext for this. As a side efffect of this some long strings now get broken into multiple lines (cosmetic only) and some blank line gaps are normalised by gettext. Cherry picks: https://github.com/wangqr/Aegisub/commit/0e29c8d0e492cd8bb7a2dd5c2b2e6d620e7f2777 With fixups from: https://github.com/wangqr/Aegisub/commit/e98b7292f1f909db80ad4e1d79d9149ae43e0255 --- po/make_pot.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/po/make_pot.sh b/po/make_pot.sh index f18ac1167..72caece0b 100755 --- a/po/make_pot.sh +++ b/po/make_pot.sh @@ -42,12 +42,8 @@ find ../automation -name *.lua \ | sed 's/\\/\\\\\\\\/g' \ | maybe_append -for i in 'Name' 'GenericName' 'Comment' 'Keywords' -do - grep ^$i -n ../packages/desktop/aegisub.desktop.in.in \ - | sed 's/\([0-9]\+\):[^=]\+=\(.*\)$/aegisub.desktop|\1|"\2"/' \ - | maybe_append -done +xgettext ../packages/desktop/aegisub.desktop.in.in \ + --language=Desktop --join-existing --omit-header -o aegisub.pot for i in 'name' 'summary' 'p' 'li' 'caption'; do xmlstarlet sel -t -v "//$i" ../packages/desktop/aegisub.appdata.xml.in.in | jq -R .