From: Bruno Haible <bruno@clisp.org>
Date: Fri, 14 Jul 2023 16:11:10 +0000 (+0200)
Subject: Improve support for GtkBuilder 4.
X-Git-Tag: v0.23~418
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10f4a477e9b2f76b425d1bc3bad49c52105837e7;p=thirdparty%2Fgettext.git

Improve support for GtkBuilder 4.

Reported by Stuart <stuart.a.hayhurst@gmail.com> in
<https://lists.gnu.org/archive/html/bug-gettext/2023-07/msg00010.html>.

* gettext-tools/its/gtkbuilder.its: Recognize translatable="1" and similar as
equivalent to translatable="yes".
* NEWS: Mention it.
---

diff --git a/NEWS b/NEWS
index 8c572bfbb..7420e9ece 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Version 0.23 - July 2023
+
+* Programming languages support:
+  - Glade: xgettext has improved support for GtkBuilder 4.
+
 Version 0.22 - June 2023
 
 * PO file format:
@@ -465,9 +470,9 @@ Version 0.18.3 - July 2013
     The gnu::autosprintf class now provides an assignment operator.
 
   - Glade:
-    xgettext now supports GtkBuider file format used by Glade 3.
+    xgettext now supports GtkBuilder file format used by Glade 3.
     xgettext now also extracts contexts (msgctxt) from Glade 2 and
-    GtkBuider files.
+    GtkBuilder files.
 
   - JavaScript:
     xgettext now partially supports JavaScript.  Since the current
diff --git a/gettext-tools/its/gtkbuilder.its b/gettext-tools/its/gtkbuilder.its
index 2a29f11fd..8078e1d4f 100644
--- a/gettext-tools/its/gtkbuilder.its
+++ b/gettext-tools/its/gtkbuilder.its
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright (C) 2015 Free Software Foundation, Inc.
+  Copyright (C) 2015, 2023 Free Software Foundation, Inc.
   This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
   This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,12 @@
            xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0"
            version="2.0">
   <its:translateRule selector="/interface" translate="no"/>
-  <its:translateRule selector="/interface//*[@translatable = 'yes']"
+  <!-- https://developer-old.gnome.org/gtk4/stable/GtkBuilder.html says about
+       boolean attribute values:
+       "strings like “TRUE”, “t”, “yes”, “y”, “1” are interpreted as TRUE,
+        strings like “FALSE”, “f”, “no”, “n”, “0” are interpreted as FALSE"
+  -->
+  <its:translateRule selector="/interface//*[@translatable = 'TRUE' or @translatable = 't' or @translatable = 'yes' or @translatable = 'y' or @translatable = '1']"
                      translate="yes"/>
   <its:locNoteRule selector="/interface//*[@comments]"
                    locNotePointer="@comments"