Update po-files via Makefile with gettext instead of using update.js .

Get rid of (mostly unmaintained) intltools.
Make gsettings schema translatable

.gitignore

@@ -16,5 +16,4 @@ staging/
 *~
 *.gmo
 metadata.json
-*.gschema.xml
 *.gschema.valid

README.md

@@ -48,7 +48,7 @@ Make sure you have the following dependencies installed:
 * *gnome-common*,
 * *autoconf*,
 * *automake*,
-* *intltool*.
+* *gettext-devel*.
 * *gnome-tweak-tool*.
 
 Run the following commands:

configure.ac

@@ -15,7 +15,10 @@ GETTEXT_PACKAGE=gnome-shell-extension-openweather
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
-IT_PROG_INTLTOOL(0.26)
+
+# i18n
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.18.2])
 
 PKG_PROG_PKG_CONFIG([0.22])
 

data/Makefile.am

@@ -21,11 +21,8 @@ metadata.json: metadata.json.in $(top_builddir)/config.status
 
 CLEANFILES = metadata.json
 
-gschemas_in = org.gnome.shell.extensions.openweather.gschema.xml.in
+gsettings_SCHEMAS = org.gnome.shell.extensions.openweather.gschema.xml
 
-@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
-gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml) @GSETTINGS_RULES@
-
-EXTRA_DIST += $(gschemas_in)
-CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
+EXTRA_DIST += $(gsettings_SCHEMAS)

data/org.gnome.shell.extensions.openweather.gschema.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="gnome-shell-extension-openweather">
+  <enum id="org.gnome.shell.extensions.openweather.weather-provider">
+    <value value="0" nick="openweathermap"/>
+    <value value="1" nick="forecast.io"/>
+  </enum>
+  <enum id="org.gnome.shell.extensions.openweather.geolocation-provider">
+    <value value="0" nick="openstreetmaps"/>
+    <value value="1" nick="geocode"/>
+    <value value="2" nick="mapquest"/>
+  </enum>
+  <enum id="org.gnome.shell.extensions.openweather.unit">
+    <value value="0" nick="celsius"/>
+    <value value="1" nick="fahrenheit"/>
+    <value value="2" nick="kelvin"/>
+    <value value="3" nick="rankine"/>
+    <value value="4" nick="reaumur"/>
+    <value value="5" nick="roemer"/>
+    <value value="6" nick="delisle"/>
+    <value value="7" nick="newton"/>
+  </enum>
+  <enum id="org.gnome.shell.extensions.openweather.pressure-unit">
+    <value value="0" nick="hPa"/>
+    <value value="1" nick="inHg"/>
+    <value value="2" nick="bar"/>
+    <value value="3" nick="Pa"/>
+    <value value="4" nick="kPa"/>
+    <value value="5" nick="atm"/>
+    <value value="6" nick="at"/>
+    <value value="7" nick="Torr"/>
+    <value value="8" nick="psi"/>
+    <value value="9" nick="mmHg"/>
+  </enum>
+  <enum id="org.gnome.shell.extensions.openweather.wind-speed-unit">
+    <value value="0" nick="kph"/>
+    <value value="1" nick="mph"/>
+    <value value="2" nick="m/s"/>
+    <value value="3" nick="knots"/>
+    <value value="4" nick="ft/s"/>
+    <value value="5" nick="Beaufort"/>
+  </enum>
+  <enum id="org.gnome.shell.extensions.openweather.wind-dir-indicators">
+    <value value="0" nick="arrows"/>
+    <value value="1" nick="letters"/>
+  </enum>
+  <enum id="org.gnome.shell.extensions.openweather.position">
+    <value value="0" nick="center"/>
+    <value value="1" nick="right"/>
+    <value value="2" nick="left"/>
+  </enum>
+  <schema path="/org/gnome/shell/extensions/openweather/" id="org.gnome.shell.extensions.openweather">
+    <key name="weather-provider" enum="org.gnome.shell.extensions.openweather.weather-provider">
+      <default>'openweathermap'</default>
+      <summary>Weather Provider</summary>
+    </key>
+    <key name="geolocation-provider" enum="org.gnome.shell.extensions.openweather.geolocation-provider">
+      <default>'openstreetmaps'</default>
+      <summary>Geolocation Provider</summary>
+    </key>
+    <key name="unit" enum="org.gnome.shell.extensions.openweather.unit">
+      <default>'fahrenheit'</default>
+      <summary>Temperature Unit</summary>
+    </key>
+    <key name="pressure-unit" enum="org.gnome.shell.extensions.openweather.pressure-unit">
+      <default>'inHg'</default>
+      <summary>Pressure Unit</summary>
+    </key>
+    <key name="wind-speed-unit" enum="org.gnome.shell.extensions.openweather.wind-speed-unit">
+      <default>'mph'</default>
+      <summary>Wind Speed Units</summary>
+      <description>Choose the units used for wind speed. Allowed values are 'kph', 'mph', 'm/s', 'knots', 'ft/s' or 'Beaufort'.</description>
+    </key>
+    <key type="b" name="wind-direction">
+      <default>true</default>
+      <summary>Wind Direction by Arrows</summary>
+      <description>Choose whether to display wind direction through arrows or letters.</description>
+    </key>
+    <key type="s" name="city">
+      <default>'-8.5211767,179.1976747>Vaiaku, Tuvalu>-1'</default>
+      <summary>City to be displayed</summary>
+    </key>
+    <key type="i" name="actual-city">
+      <default>0</default>
+      <summary>Actual City</summary>
+    </key>
+    <key type="b" name="translate-condition">
+      <default>true</default>
+      <summary>Translate Conditions</summary>
+    </key>
+    <key type="b" name="use-symbolic-icons">
+      <default>true</default>
+      <summary>Symbolic Icons</summary>
+    </key>
+    <key type="b" name="use-text-on-buttons">
+      <default>false</default>
+      <summary>Use text on buttons in menu</summary>
+    </key>
+    <key type="b" name="show-text-in-panel">
+      <default>true</default>
+      <summary>Temperature in Panel</summary>
+    </key>
+    <key type="b" name="show-comment-in-panel">
+      <default>false</default>
+      <summary>Conditions in Panel</summary>
+    </key>
+    <key type="b" name="show-comment-in-forecast">
+      <default>true</default>
+      <summary>Conditions in Forecast</summary>
+    </key>
+    <key name="position-in-panel" enum="org.gnome.shell.extensions.openweather.position">
+      <default>'center'</default>
+      <summary>Position in Panel</summary>
+    </key>
+    <key type="i" name="refresh-interval-current">
+      <default>600</default>
+      <summary>Refresh interval (actual weather)</summary>
+    </key>
+    <key type="i" name="refresh-interval-forecast">
+      <default>3600</default>
+      <summary>Refresh interval (forecast)</summary>
+    </key>
+    <key type="b" name="center-forecast">
+      <default>false</default>
+      <summary>Center forecastbox.</summary>
+    </key>
+    <key type="i" name="days-forecast">
+      <default>2</default>
+      <summary>Number of days in forecast</summary>
+    </key>
+    <key type="i" name="decimal-places">
+      <default>1</default>
+      <summary>Maximal number of digits after the decimal point</summary>
+    </key>
+    <key type="s" name="appid">
+      <default>''</default>
+      <summary>Your personal API key from openweathermap.org</summary>
+    </key>
+    <key type="b" name="use-default-owm-key">
+      <default>true</default>
+      <summary>Use the extensions default API key from openweathermap.org</summary>
+    </key>
+    <key type="s" name="appid-fc">
+      <default>''</default>
+      <summary>Your personal API key from forecast.io</summary>
+    </key>
+    <key type="s" name="geolocation-appid-mapquest">
+      <default>''</default>
+      <summary>Your personal AppKey from developer.geocode.farm</summary>
+    </key>
+  </schema>
+</schemalist>

gnome-shell-extension-openweather.spec

@@ -19,7 +19,7 @@ Source0:        https://github.com/jenslody/gnome-shell-extension-openweather/ta
 BuildArch:      noarch
 
 # The version of gnome-common in CentOS7 is only 3.7.4
-BuildRequires:  autoconf, automake, glib2-devel, gnome-common >= 3.7.4, intltool
+BuildRequires:  autoconf, automake, glib2-devel, gnome-common >= 3.7.4, gettext-devel
 Requires:       gnome-shell >= 3.8.0
 
 %description