Merge branch 'sunweaver-pr/fix-and-update-translation-template'

Attributes GH PR #44: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/pull/44

7 files changed, 46 insertions, 28 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 35bbfd54..662ca716 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -56,8 +56,5 @@ install(FILES 50-org.ayatana.indicator.keyboard.AccountsService.pkla DESTINATION
 
 # org.ayatana.indicator.keyboard.gschema.xml
 
-find_package (Intltool REQUIRED)
-set (ENV{LC_ALL} "C")
-intltool_merge_translations ("${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicator.keyboard.gschema.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.indicator.keyboard.gschema.xml" ALL UTF8 STYLE "xml" NO_TRANSLATIONS)
 find_package (GSettings REQUIRED)
 add_schema ("org.ayatana.indicator.keyboard.gschema.xml")
diff --git a/data/org.ayatana.indicator.keyboard.gschema.xml b/data/org.ayatana.indicator.keyboard.gschema.xml
new file mode 100644
index 00000000..67a50765
--- /dev/null
+++ b/data/org.ayatana.indicator.keyboard.gschema.xml
@@ -0,0 +1,19 @@
+<schemalist>
+    <schema gettext-domain="ayatana-indicator-keyboard" id="org.ayatana.indicator.keyboard" path="/org/ayatana/indicator/keyboard/">
+        <key name="language-icon-desktop" type="b">
+            <default>true</default>
+            <summary>Show the language icon in desktop mode.</summary>
+            <description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</description>
+        </key>
+        <key name="language-icon-phone" type="b">
+            <default>false</default>
+            <summary>Show the language icon in phone mode.</summary>
+            <description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</description>
+        </key>
+        <key name="language-icon-greeter" type="b">
+            <default>false</default>
+            <summary>Show the language icon in the greeter.</summary>
+            <description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</description>
+        </key>
+    </schema>
+</schemalist>
diff --git a/data/org.ayatana.indicator.keyboard.gschema.xml.in b/data/org.ayatana.indicator.keyboard.gschema.xml.in
deleted file mode 100644
index e80a89e9..00000000
--- a/data/org.ayatana.indicator.keyboard.gschema.xml.in
+++ /dev/null
@@ -1,19 +0,0 @@
-<schemalist>
-    <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.ayatana.indicator.keyboard" path="/org/ayatana/indicator/keyboard/">
-        <key name="language-icon-desktop" type="b">
-            <default>true</default>
-            <_summary>Show the language icon in desktop mode.</_summary>
-            <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</_description>
-        </key>
-        <key name="language-icon-phone" type="b">
-            <default>false</default>
-            <_summary>Show the language icon in phone mode.</_summary>
-            <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</_description>
-        </key>
-        <key name="language-icon-greeter" type="b">
-            <default>false</default>
-            <_summary>Show the language icon in the greeter.</_summary>
-            <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</_description>
-        </key>
-    </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 56552034..8dd4f062 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+data/org.ayatana.indicator.keyboard.gschema.xml
 src/main.c
 src/keyboard-lomiri.c
 src/keyboard-x11.c
diff --git a/po/ayatana-indicator-keyboard.pot b/po/ayatana-indicator-keyboard.pot
index 254f14fe..0d55d939 100644
--- a/po/ayatana-indicator-keyboard.pot
+++ b/po/ayatana-indicator-keyboard.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:18+0200\n"
+"POT-Creation-Date: 2022-09-11 13:13+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,18 +17,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/service.c:89
+#: data/org.ayatana.indicator.keyboard.gschema.xml:1
+msgid "Show the language icon in desktop mode."
+msgstr ""
+
+#: data/org.ayatana.indicator.keyboard.gschema.xml:2
+msgid ""
+"If enabled, the indicator shows the current layout icon. Otherwise, it "
+"displays a generic keyboard icon."
+msgstr ""
+
+#: data/org.ayatana.indicator.keyboard.gschema.xml:3
+msgid "Show the language icon in phone mode."
+msgstr ""
+
+#: data/org.ayatana.indicator.keyboard.gschema.xml:4
+msgid "Show the language icon in the greeter."
+msgstr ""
+
+#: src/service.c:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/service.c:90
+#: src/service.c:91
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: ../src/service.c:109
+#: src/service.c:128
 msgid "Current keyboard layout"
 msgstr ""
 
-#: ../src/service.c:166
+#: src/service.c:185
 msgid "Keyboard Settings…"
 msgstr ""
diff --git a/update-po.sh b/update-po.sh
index 59ad5c45..2f4377e0 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 db9c8931..ae7bb10d 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