commit e54cb89914b99b4a7d0270c34570959596ce16e1
Author: Jakub Bogusz <[email protected]>
Date: Sat Sep 16 16:36:05 2023 +0200
- find_lang 1.42: allow three-letter language codes for *.qm
find-lang.sh | 12 ++++++------
rpm-pld-macros.spec | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 56de969..eea25b9 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,5 +1,5 @@
%define rpm_macros_rev 2.028
-%define find_lang_rev 1.41
+%define find_lang_rev 1.42
# split into individual X_prov_ver if there is a reason to desync
%define prov_ver 4.15
Summary: PLD Linux RPM macros
diff --git a/find-lang.sh b/find-lang.sh
index fa120e8..5339946 100755
--- a/find-lang.sh
+++ b/find-lang.sh
@@ -36,7 +36,7 @@
# * start support for KDE help files
PROG=${0##*/}
-VERSION=1.41
+VERSION=1.42
usage () {
cat <<EOF
@@ -237,12 +237,12 @@ s:%lang(C) ::' >> $MO_NAME
cat __qm.files
fi
) | sed '
-'"$NO_ALL_NAME$QM"'s:\(.*/'"$NAME"'_\([a-zA-Z]\{2\}\([_@].*\)\?\)\.qm$\):%lang(\2)
\1:
+'"$NO_ALL_NAME$QM"'s:\(.*/'"$NAME"'_\([a-zA-Z]\{2,3\}\([_@].*\)\?\)\.qm$\):%lang(\2)
\1:
'"$NO_ALL_NAME$QM"'s:\(.*/share/locale/\)\([^/@]\+\)\(@quot\|@boldquot\)\?\(@[^/]*\)\?\(/.*/'"$NAME"'\.qm$\):%lang(\2\4)
\1\2\3\4\5:
-'"$ALL_NAME$QM"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
-'"$ALL_NAME$QM"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
-'"$ALL_NAME$QM"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
-'"$ALL_NAME$QM"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QM"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2,3\}[_@].*\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QM"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2,3\}\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QM"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2,3\}[_@].*\)\.qm$\):%lang(\2)
\1:
+'"$ALL_NAME$QM"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2,3\}\)\.qm$\):%lang(\2) \1:
s:^[^%].*::
/^[^%]/d
s:%lang(C) ::' >> $MO_NAME
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/819d1fb56fe42e440f92d860b1616f3e95082ed2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
