diff --git a/Makefile b/Makefile
index d9d05bf6f..2171d4f47 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@ ARCH:=$(shell uname -m)
dist: locales inx
bin/build-dist $(EXTENSIONS)
bin/build-electron
- cp inx/*.inx dist
cp -a images/examples dist/inkstitch
cp -a palettes dist/inkstitch
cp -a symbols dist/inkstitch
@@ -21,11 +20,16 @@ dist: locales inx
else \
cp -a electron/dist/*-unpacked dist/inkstitch/electron; \
fi
- if [ "$$BUILD" = "windows" ]; then \
- cd dist; zip -r ../inkstitch-$(VERSION)-win32.zip *; \
- else \
- cd dist; tar zcf ../inkstitch-$(VERSION)-$(OS)-$(ARCH).tar.gz *; \
- fi
+ for d in inx/*; do \
+ lang=$${d%.*}; \
+ lang=$${lang#*/}; \
+ cp $$d/*.inx dist; \
+ if [ "$$BUILD" = "windows" ]; then \
+ cd dist; zip -r ../inkstitch-$(VERSION)-win32-$$lang.zip *; cd ..; \
+ else \
+ cd dist; tar zcf ../inkstitch-$(VERSION)-$(OS)-$(ARCH)-$$lang.tar.gz *; cd ..; \
+ fi; \
+ done
distclean:
rm -rf build dist inx locales *.spec *.tar.gz *.zip electron/node_modules electron/dist
diff --git a/bin/generate-inx-files b/bin/generate-inx-files
index a16fb32eb..44edea15b 100755
--- a/bin/generate-inx-files
+++ b/bin/generate-inx-files
@@ -11,6 +11,8 @@ sys.path.append(parent_dir)
# try find add inkex.py et al. as well
sys.path.append(os.path.join(parent_dir, "inkscape", "share", "extensions"))
sys.path.append(os.path.join("/usr/share/inkscape/extensions"))
+# default inkex.py location on macOS
+sys.path.append("/Applications/Inkscape.app/Contents/Resources/share/inkscape/extensions/")
from lib.inx import generate_inx_files
diff --git a/lib/inx/utils.py b/lib/inx/utils.py
index a22b18925..1dc96829f 100644
--- a/lib/inx/utils.py
+++ b/lib/inx/utils.py
@@ -1,3 +1,4 @@
+import errno
import os
import gettext
from os.path import dirname
@@ -28,8 +29,16 @@ def build_environment():
def write_inx_file(name, contents):
- inx_file_name = "inkstitch_%s_%s.inx" % (name, current_locale)
- with open(os.path.join(inx_path, inx_file_name), 'w') as inx_file:
+ inx_locale_dir = os.path.join(inx_path, current_locale)
+
+ try:
+ os.makedirs(inx_locale_dir)
+ except OSError as e:
+ if e.errno != errno.EEXIST:
+ raise
+
+ inx_file_name = "inkstitch_%s.inx" % name
+ with open(os.path.join(inx_locale_dir, inx_file_name), 'w') as inx_file:
print >> inx_file, contents.encode("utf-8")
diff --git a/templates/auto_satin.inx b/templates/auto_satin.inx
index d825d8a11..60ca29cd5 100644
--- a/templates/auto_satin.inx
+++ b/templates/auto_satin.inx
@@ -11,9 +11,7 @@
all
-
-
-
+
diff --git a/templates/convert_to_satin.inx b/templates/convert_to_satin.inx
index d214502a9..d0f879111 100644
--- a/templates/convert_to_satin.inx
+++ b/templates/convert_to_satin.inx
@@ -9,9 +9,7 @@
all
-
-
-
+
diff --git a/templates/cut_satin.inx b/templates/cut_satin.inx
index 4d330f062..c96d90929 100644
--- a/templates/cut_satin.inx
+++ b/templates/cut_satin.inx
@@ -9,9 +9,7 @@
all
-
-
-
+
diff --git a/templates/embroider.inx b/templates/embroider.inx
index 54f3be1ba..f030c8d66 100644
--- a/templates/embroider.inx
+++ b/templates/embroider.inx
@@ -19,10 +19,7 @@
all
-
- {# L10N This is used for the submenu under Extensions -> Ink/Stitch. Translate this to your language's word for its language, e.g. "Español" for the spanish translation. #}
-
-
+