Merge branch 'sunweaver-pr/fix-and-update-translations'

Attributes GH PR #29: https://github.com/AyatanaIndicators/ayatana-indicator-notifications/pull/29

7 files changed, 30 insertions, 75 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index aa5dddd..c81ac7b 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,13 +3,6 @@
 ##
 
 set (SCHEMA_NAME "org.ayatana.indicator.notifications.gschema.xml")
-set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
-set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
-
-# generate the .xml file using intltool
-find_package(Intltool REQUIRED)
-set (ENV{LC_ALL} "C")
-intltool_merge_translations("${SCHEMA_FILE_IN}" "${SCHEMA_FILE}" ALL UTF8 STYLE "xml" NO_TRANSLATIONS)
 
 # let GSettings do the rest
 find_package(GSettings REQUIRED)
diff --git a/data/org.ayatana.indicator.notifications.gschema.xml.in b/data/org.ayatana.indicator.notifications.gschema.xml
index b85f14b..c0e4901 100644
--- a/data/org.ayatana.indicator.notifications.gschema.xml.in
+++ b/data/org.ayatana.indicator.notifications.gschema.xml
@@ -1,9 +1,9 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.ayatana.indicator.notifications" path="/org/ayatana/indicator/notifications/">
+<schemalist>
+  <schema gettext-domain="ayatana-indicator-notifications" id="org.ayatana.indicator.notifications" path="/org/ayatana/indicator/notifications/">
     <key name="filter-list" type="as">
       <default>[]</default>
-      <_summary>Discard notifications by application name</_summary>
-      <_description>If an application name is in the filter list, all notifications matching the application name will be discarded.</_description>
+      <summary>Discard notifications by application name</summary>
+      <description>If an application name is in the filter list, all notifications matching the application name will be discarded.</description>
     </key>
     <key name="filter-list-hints" type="as">
       <default>[]</default>
@@ -18,8 +18,8 @@
     <key name="max-items" type="i">
       <range min="1" max="10"/>
       <default>5</default>
-      <_summary>Maximum number of visible items</_summary>
-      <_description>The indicator will only display at most the number of notifications indicated by this value.</_description>
+      <summary>Maximum number of visible items</summary>
+      <description>The indicator will only display at most the number of notifications indicated by this value.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.ayatana.indicator.notifications.gschema.xml.in.in b/data/org.ayatana.indicator.notifications.gschema.xml.in.in
deleted file mode 100644
index 280cc2b..0000000
--- a/data/org.ayatana.indicator.notifications.gschema.xml.in.in
+++ /dev/null
@@ -1,40 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.ayatana.indicator.notifications" path="/org/ayatana/indicator/notifications/">
-    <key name="filter-list" type="as">
-      <default>[]</default>
-      <_summary>Discard notifications by application name</_summary>
-      <_description>If an application name is in the filter list, all notifications matching the application name will be discarded.</_description>
-    </key>
-    <key name="filter-list-hints" type="as">
-      <default>[]</default>
-      <summary>Recent application names to suggest for the filter list</summary>
-      <description>Keeps track of recent application names so we can suggest them in the settings.</description>
-    </key>
-    <key name="clear-on-middle-click" type="b">
-      <default>false</default>
-      <_summary>Clear notifications on middle click</_summary>
-      <_description>Normally when middle clicking the notification icon, the unread status will be toggled if the queue is not empty. With this option enabled, the notification queue will be cleared instead.</_description>
-    </key>
-    <key name="do-not-disturb" type="b">
-      <default>false</default>
-      <summary>Enable do-not-disturb mode</summary>
-      <description>On supported desktops enables do-not-disturb mode on the notification daemon.</description>
-    </key>
-    <key name="hide-indicator" type="b">
-      <default>false</default>
-      <_summary>Hide the indicator</_summary>
-      <_description>If true, the indicator is hidden.</_description>
-    </key>
-    <key name="max-items" type="i">
-      <range min="1" max="10"/>
-      <default>5</default>
-      <_summary>Maximum number of visible items</_summary>
-      <_description>The indicator will only display at most the number of notifications indicated by this value.</_description>
-    </key>
-    <key name="swap-clear-settings" type="b">
-      <default>false</default>
-      <summary>Swap the Clear and Settings items in the menu</summary>
-      <description>This will move the Clear option to the bottom of the menu, below the Settings item.</description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c8c6c6e..c8300cf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-data/org.ayatana.indicator.notifications.gschema.xml.in.in
+data/org.ayatana.indicator.notifications.gschema.xml
 src/dbus-spy.c
 src/dbus-spy.h
 src/main.c
diff --git a/po/ayatana-indicator-notifications.pot b/po/ayatana-indicator-notifications.pot
index 64c171a..b23158a 100644
--- a/po/ayatana-indicator-notifications.pot
+++ b/po/ayatana-indicator-notifications.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-05 13:31+0200\n"
+"POT-Creation-Date: 2022-09-11 14:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,61 +17,61 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
+#: data/org.ayatana.indicator.notifications.gschema.xml:1
 msgid "Discard notifications by application name"
 msgstr ""
 
-#: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:2
+#: data/org.ayatana.indicator.notifications.gschema.xml:2
 msgid ""
 "If an application name is in the filter list, all notifications matching the "
 "application name will be discarded."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-msgid "Clear notifications on middle click"
+#: data/org.ayatana.indicator.notifications.gschema.xml:3
+msgid "Recent application names to suggest for the filter list"
 msgstr ""
 
-#: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:4
+#: data/org.ayatana.indicator.notifications.gschema.xml:4
 msgid ""
-"Normally when middle clicking the notification icon, the unread status will "
-"be toggled if the queue is not empty. With this option enabled, the "
-"notification queue will be cleared instead."
+"Keeps track of recent application names so we can suggest them in the "
+"settings."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:5
-msgid "Hide the indicator"
+#: data/org.ayatana.indicator.notifications.gschema.xml:5
+msgid "Enable do-not-disturb mode"
 msgstr ""
 
-#: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:6
-msgid "If true, the indicator is hidden."
+#: data/org.ayatana.indicator.notifications.gschema.xml:6
+msgid ""
+"On supported desktops enables do-not-disturb mode on the notification daemon."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:7
+#: data/org.ayatana.indicator.notifications.gschema.xml:7
 msgid "Maximum number of visible items"
 msgstr ""
 
-#: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:8
+#: data/org.ayatana.indicator.notifications.gschema.xml:8
 msgid ""
 "The indicator will only display at most the number of notifications "
 "indicated by this value."
 msgstr ""
 
-#: ../src/service.c:221
+#: src/service.c:221
 msgid "from"
 msgstr ""
 
-#: ../src/service.c:270 ../src/service.c:300
+#: src/service.c:270 ../src/service.c:300
 msgid "Notifications"
 msgstr ""
 
-#: ../src/service.c:271
+#: src/service.c:271
 msgid "List of past system notifications, do-not-disturb switch"
 msgstr ""
 
-#: ../src/service.c:328
+#: src/service.c:328
 msgid "Clear"
 msgstr ""
 
-#: ../src/service.c:339
+#: src/service.c:339
 msgid "Do not disturb"
 msgstr ""
diff --git a/update-po.sh b/update-po.sh
index 59ad5c4..2f4377e 100755
--- a/update-po.sh
+++ b/update-po.sh
@@ -29,10 +29,11 @@ cat LINGUAS | while read lingua; do
 	fi
 
 	sed -e 's/\.xml\.in\.in\.h:/.xml.in.in:/g'	\
-            -e 's/\.xml\.in\.h:/.xml.in:/g'		\
+	    -e 's/\.xml\.in\.h:/.xml.in:/g'		\
 	    -e 's/\.ini\.in\.h:/.ini.in:/g'		\
 	    -e 's/\.xml\.h:/.xml:/g'			\
 	    -e 's/\.ini\.h:/.ini:/g'			\
+	    -e 's@#: \.\./@#: @g'			\
 	    -i ${lingua}.po
 
 done
diff --git a/update-pot.sh b/update-pot.sh
index db9c893..ae7bb10 100755
--- a/update-pot.sh
+++ b/update-pot.sh
@@ -23,4 +23,5 @@ sed -e 's/\.xml\.in\.in.\h:/.xml.in.in:/g'	\
     -e 's/\.ini\.in\.h:/.ini.in:/g'		\
     -e 's/\.xml\.h:/.xml:/g'			\
     -e 's/\.ini\.h:/.ini:/g'			\
+    -e 's@#: \.\./@#: @g'			\
     -i po/${GETTEXT_DOMAIN}.pot