Skip to contentSkip to conversation

po: Un-transliterate the %zu format code

PATCH Superseded Glenn Washburn 2 participants 4 messages Mar 7, 2022 – Mar 10, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 po: Un-transliterate the %zu format code

Commit 45bffae13 uses the %zu format specifier which has not been used in any translated strings yet. So the sed scripts used for tranliterating certain languages need to be updated otherwise creation of the message indexes will fail on an unknown format code. This is essentially the same issue fixed for the %m format code in commit 2e246b6f.

---
 po/arabic.sed   | 3 ++-
 po/cyrillic.sed | 3 ++-
 po/greek.sed    | 3 ++-
 po/hebrew.sed   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)
po/arabic.sed +2 -1
index 21dc8b6db2..3fbee72480 100644
@@ -74,9 +74,10 @@ s,%\([0-9]*\)للد,%\1lld,g
 
 s,%\([0-9\.\*]*\)س,%\1s,g
 s,%\([0-9\.\*]*\)م,%\1m,g
-s,%\([0-9]*\)لو,%\1lu,g
 s,%\([0-9]*\)و,%\1u,g
+s,%\([0-9]*\)لو,%\1lu,g
 s,%\([0-9]*\)للو,%\1llu,g
+s,%\([0-9]*\)زو,%\1zu,g
 s,%\([0-9]*\)كس,%\1x,g
 s,%\([0-9]*\)لكس,%\1lx,g
 s,%\([0-9]*\)للكس,%\1llx,g
po/cyrillic.sed +2 -1
index 2e3e6655d6..472f095295 100644
@@ -97,9 +97,10 @@ s,%\([0-9]*\)ллд,%\1lld,g
 
 s,%\([0-9\.\*]*\)с,%\1s,g
 s,%\([0-9\.\*]*\)м,%\1m,g
-s,%\([0-9]*\)лу,%\1lu,g
 s,%\([0-9]*\)у,%\1u,g
+s,%\([0-9]*\)лу,%\1lu,g
 s,%\([0-9]*\)ллу,%\1llu,g
+s,%\([0-9]*\)зу,%\1zu,g
 s,%\([0-9]*\)ѯ,%\1x,g
 s,%\([0-9]*\)лѯ,%\1lx,g
 s,%\([0-9]*\)ллѯ,%\1llx,g
po/greek.sed +2 -1
index 3543f6aac3..0e81625fbb 100644
@@ -99,9 +99,10 @@ s,%\([0-9]*\)λλδ,%\1lld,g
 
 s,%\([0-9\.\*]*\)σ,%\1s,g
 s,%\([0-9\.\*]*\)μ,%\1m,g
-s,%\([0-9]*\)λυ,%\1lu,g
 s,%\([0-9]*\)υ,%\1u,g
+s,%\([0-9]*\)λυ,%\1lu,g
 s,%\([0-9]*\)λλυ,%\1llu,g
+s,%\([0-9]*\)ζυ,%\1zu,g
 s,%\([0-9]*\)ξ,%\1x,g
 s,%\([0-9]*\)λξ,%\1lx,g
 s,%\([0-9]*\)λλξ,%\1llx,g
po/hebrew.sed +2 -1
index 9210014bc3..33174bbdcc 100644
@@ -82,9 +82,10 @@ s,%\([0-9]*\)ללד,%\1lld,g
 
 s,%\([0-9\.\*]*\)ש,%\1s,g
 s,%\([0-9\.\*]*\)מ,%\1m,g
-s,%\([0-9]*\)לוּ,%\1lu,g
 s,%\([0-9]*\)וּ,%\1u,g
+s,%\([0-9]*\)לוּ,%\1lu,g
 s,%\([0-9]*\)ללוּ,%\1llu,g
+s,%\([0-9]*\)זוּ,%\1zu,g
 s,%\([0-9]*\)כּס,%\1x,g
 s,%\([0-9]*\)לכּס,%\1lx,g
 s,%\([0-9]*\)ללכּס,%\1llx,g
Signature · 1 line
2.27.0
#1 lore raw
Quoted 1 line · Glenn Washburn

Commit 45bffae13 uses the %zu format specifier which has not been used in

If you mention a commit please use the following format:
commit 45bffae13 (util/resolve: Bail with error if moddep.lst file line is too long)

Quoted 4 lines

any translated strings yet. So the sed scripts used for tranliterating certain languages need to be updated otherwise creation of the message indexes will fail on an unknown format code. This is essentially the same issue fixed for the %m format code in commit 2e246b6f.

Ditto.

Quoted 13 lines
---
 po/arabic.sed   | 3 ++-
 po/cyrillic.sed | 3 ++-
 po/greek.sed    | 3 ++-
 po/hebrew.sed   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)
po/arabic.sed +0 -0
index 21dc8b6db2..3fbee72480 100644

po/arabic.sed s,%\([0-9]*\)للد,%\1lld,g · line 78

Quoted 6 lines
po/arabic.sed +1 -1
@@ -74,9 +74,10 @@ s,%\([0-9]*\)للد,%\1lld,g
 
 s,%\([0-9\.\*]*\)س,%\1s,g
 s,%\([0-9\.\*]*\)م,%\1m,g
-s,%\([0-9]*\)لو,%\1lu,g
 s,%\([0-9]*\)و,%\1u,g
+s,%\([0-9]*\)لو,%\1lu,g

I am OK with this move but please mention it in the commit message.

Quoted 10 lines
po/arabic.sed +1 -0
 s,%\([0-9]*\)للو,%\1llu,g
+s,%\([0-9]*\)زو,%\1zu,g
 s,%\([0-9]*\)كس,%\1x,g
 s,%\([0-9]*\)لكس,%\1lx,g
 s,%\([0-9]*\)للكس,%\1llx,g
po/cyrillic.sed +0 -0
index 2e3e6655d6..472f095295 100644

po/cyrillic.sed s,%\([0-9]*\)ллд,%\1lld,g · line 101

Quoted 6 lines
po/cyrillic.sed +1 -1
@@ -97,9 +97,10 @@ s,%\([0-9]*\)ллд,%\1lld,g
 
 s,%\([0-9\.\*]*\)с,%\1s,g
 s,%\([0-9\.\*]*\)м,%\1m,g
-s,%\([0-9]*\)лу,%\1lu,g
 s,%\([0-9]*\)у,%\1u,g
+s,%\([0-9]*\)лу,%\1lu,g

Ditto and below...

Daniel

#2 lore raw
Quoted 5 lines · On Wed, 9 Mar 2022 17:10:01 +0100 Daniel Kiper <[email protected]> wrote:
Quoted 1 line · Glenn Washburn

Commit 45bffae13 uses the %zu format specifier which has not been used in

If you mention a commit please use the following format:
commit 45bffae13 (util/resolve: Bail with error if moddep.lst file line is too long)

Ok, I'm not clear if this is just for the future, or you want me to resend this patch. I have no problem resending.

Glenn

Quoted 50 lines
Quoted 5 lines

any translated strings yet. So the sed scripts used for tranliterating certain languages need to be updated otherwise creation of the message indexes will fail on an unknown format code. This is essentially the same issue fixed for the %m format code in commit 2e246b6f.

Ditto.

Quoted 13 lines
---
 po/arabic.sed   | 3 ++-
 po/cyrillic.sed | 3 ++-
 po/greek.sed    | 3 ++-
 po/hebrew.sed   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)
po/arabic.sed +0 -0
index 21dc8b6db2..3fbee72480 100644

po/arabic.sed s,%\([0-9]*\)للد,%\1lld,g · line 78

Quoted 6 lines
po/arabic.sed +1 -1
@@ -74,9 +74,10 @@ s,%\([0-9]*\)للد,%\1lld,g
 
 s,%\([0-9\.\*]*\)س,%\1s,g
 s,%\([0-9\.\*]*\)م,%\1m,g
-s,%\([0-9]*\)لو,%\1lu,g
 s,%\([0-9]*\)و,%\1u,g
+s,%\([0-9]*\)لو,%\1lu,g

I am OK with this move but please mention it in the commit message.

Quoted 10 lines
po/arabic.sed +1 -0
 s,%\([0-9]*\)للو,%\1llu,g
+s,%\([0-9]*\)زو,%\1zu,g
 s,%\([0-9]*\)كس,%\1x,g
 s,%\([0-9]*\)لكس,%\1lx,g
 s,%\([0-9]*\)للكس,%\1llx,g
po/cyrillic.sed +0 -0
index 2e3e6655d6..472f095295 100644

po/cyrillic.sed s,%\([0-9]*\)ллд,%\1lld,g · line 101

Quoted 6 lines
po/cyrillic.sed +1 -1
@@ -97,9 +97,10 @@ s,%\([0-9]*\)ллд,%\1lld,g
 
 s,%\([0-9\.\*]*\)с,%\1s,g
 s,%\([0-9\.\*]*\)м,%\1m,g
-s,%\([0-9]*\)лу,%\1lu,g
 s,%\([0-9]*\)у,%\1u,g
+s,%\([0-9]*\)лу,%\1lu,g

Ditto and below...

Daniel

#3 lore raw
Quoted 11 lines · Glenn Washburn
Quoted 5 lines · On Wed, 9 Mar 2022 17:10:01 +0100 Daniel Kiper <[email protected]> wrote:
Quoted 1 line · Glenn Washburn

Commit 45bffae13 uses the %zu format specifier which has not been used in

If you mention a commit please use the following format:
commit 45bffae13 (util/resolve: Bail with error if moddep.lst file line is too long)

Ok, I'm not clear if this is just for the future, or you want me to resend this patch. I have no problem resending.

Yes, please resend because commit message should be extended as I said below.

Daniel