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

Attributes GH PR #64: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/64

3 files changed, 24 insertions, 31 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e269b30..c445b3c 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,13 +3,6 @@
 ##
 
 set (SCHEMA_NAME "org.ayatana.indicator.power.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.power.gschema.xml b/data/org.ayatana.indicator.power.gschema.xml
new file mode 100644
index 0000000..1e30e31
--- /dev/null
+++ b/data/org.ayatana.indicator.power.gschema.xml
@@ -0,0 +1,24 @@
+<schemalist>
+  <enum id="ayatana-indicator-power-icon-policy-enum">
+    <value nick="present" value="0" />
+    <value nick="charge" value="1" />
+    <value nick="never" value="2" />
+  </enum>
+  <schema gettext-domain="ayatana-indicator-power" id="org.ayatana.indicator.power" path="/org/ayatana/indicator/power/">
+    <key name="show-time" type="b">
+      <default>false</default>
+      <summary>Show time in Menu Bar</summary>
+      <description>Whether or not to show the time in the menu bar.</description>
+    </key>
+    <key name="show-percentage" type="b">
+      <default>false</default>
+      <summary>Show percentage in Menu Bar</summary>
+      <description>Whether or not to show the percentage in the menu bar.</description>
+    </key>
+    <key enum="ayatana-indicator-power-icon-policy-enum" name="icon-policy">
+      <default>"present"</default>
+      <summary>When to show the battery status in the menu bar?</summary>
+      <description>Options for when to show battery status. Valid options are "present", "charge", and "never".</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.ayatana.indicator.power.gschema.xml.in b/data/org.ayatana.indicator.power.gschema.xml.in
deleted file mode 100644
index 867173a..0000000
--- a/data/org.ayatana.indicator.power.gschema.xml.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist>
-  <enum id="ayatana-indicator-power-icon-policy-enum">
-    <value nick="present" value="0" />
-    <value nick="charge" value="1" />
-    <value nick="never" value="2" />
-  </enum>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.ayatana.indicator.power" path="/org/ayatana/indicator/power/">
-    <key name="show-time" type="b">
-      <default>false</default>
-      <_summary>Show time in Menu Bar</_summary>
-      <_description>Whether or not to show the time in the menu bar.</_description>
-    </key>
-    <key name="show-percentage" type="b">
-      <default>false</default>
-      <_summary>Show percentage in Menu Bar</_summary>
-      <_description>Whether or not to show the percentage in the menu bar.</_description>
-    </key>
-    <key enum="ayatana-indicator-power-icon-policy-enum" name="icon-policy">
-      <default>"present"</default>
-      <_summary>When to show the battery status in the menu bar?</_summary>
-      <_description>Options for when to show battery status. Valid options are "present", "charge", and "never".</_description>
-    </key>
-  </schema>
-</schemalist>