Localization-related script fixes

generate-locales.sh

@@ -4,32 +4,9 @@
 GETTEXT_DOMAIN="syncthing-gtk"
 MESSAGES_PO="messages.po"
 
-if [[ $(uname) == *"_NT"* ]] ; then
-	# MinGW can't do most of this
-	for lang in locale/* ; do
-		filename=${lang}/LC_MESSAGES/${GETTEXT_DOMAIN}.po
-		mo=${lang}/LC_MESSAGES/${GETTEXT_DOMAIN}.mo
-		msgfmt ${filename} -o ${mo}
-	done
-	exit 0
-fi
-
-# Generate messages.po
-[ -e ${MESSAGES_PO} ] && rm ${MESSAGES_PO}
-xgettext -e syncthing_gtk/*.py *.glade
-
 for lang in locale/* ; do
 	filename=${lang}/LC_MESSAGES/${GETTEXT_DOMAIN}.po
 	mo=${lang}/LC_MESSAGES/${GETTEXT_DOMAIN}.mo
-	mkdir -p ${lang}/LC_MESSAGES
-	if [ -e ${filename} ] ; then
-		# Merge new strings to existing po file
-		msgmerge --update ${filename} ${MESSAGES_PO} || exit 1
-		echo "Merged" ${filename}
-		msgfmt ${filename} -o ${mo}
-	else
-		# Copy new po file
-		cp ${MESSAGES_PO} ${filename} || exit 1
-		echo "Created" ${filename}
-	fi
+	msgfmt ${filename} -o ${mo}
+	echo "Created" ${mo}
 done

generate-source-locale.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Constants
+GETTEXT_DOMAIN="syncthing-gtk"
+MESSAGES_PO="messages.po"
+SRCLOCALE="en"
+
+# Generate messages.po
+[ -e ${MESSAGES_PO} ] && rm ${MESSAGES_PO}
+xgettext -e syncthing_gtk/*.py *.glade
+
+filename=${SRCLOCALE}/LC_MESSAGES/${GETTEXT_DOMAIN}.po
+mo=${SRCLOCALE}/LC_MESSAGES/${GETTEXT_DOMAIN}.mo
+mkdir -p ${SRCLOCALE}/LC_MESSAGES
+if [ -e ${filename} ] ; then
+	# Merge new strings to existing po file
+	msgmerge --update ${filename} ${MESSAGES_PO} || exit 1
+	echo "Merged" ${filename}
+	msgfmt ${filename} -o ${mo}
+else
+	# Copy new po file
+	cp ${MESSAGES_PO} ${filename} || exit 1
+	echo "Created" ${filename}
+fi

scripts/syncthing-gtk

@@ -11,7 +11,8 @@ if __name__ == "__main__":
 	if os.path.exists("/usr/local/share/syncthing-gtk"):
 		path = "/usr/local/share/syncthing-gtk"
 
-	from syncthing_gtk.tools import init_logging
+	from syncthing_gtk.tools import init_logging, init_locale
+	init_locale()
 	init_logging()
 
 	from syncthing_gtk import App