Current location

narf Source control manager Git

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bowman <jbowman@safaribooksonline.com>2016-03-18 16:46:31 -0400
committerBen Sturmfels <ben@sturm.com.au>2020-05-13 13:55:00 +1000
commit85107918b5481f0d47e6409a3bbdcaf8789aaba4 (patch)
treeacf293ec9ceaf07d1246cd4c4effbc7f48b5c733
parent5224d700dde21342535e0e79b3c521dd447aed21 (diff)
Fix Mac dev setup issues [#5442].
A trailing slash in devtools/compile_translations.sh caused that script to fail because the parameter to pybabel's -l option ended up blank instead of containing the language code. A few files and directories were missing from .gitignore and hence wound up in the list of local changes to be committed.
-rw-r--r--.gitignore5
-rw-r--r--AUTHORS1
-rwxr-xr-xdevtools/compile_translations.sh2
3 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 63c47d4d..8ffffa51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@
/aclocal.m4
# Tests
+/mediagoblin/tests/.cache/
/mediagoblin/tests/user_dev/
# File extensions
@@ -65,3 +66,7 @@ venv*
/extlib/tinymce/
/extlib/video.js/
/extlib/videojs-resolution-switcher
+
+# Mac files
+.DS_Store
+.Python
diff --git a/AUTHORS b/AUTHORS
index 632e8f4e..09602f8e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -54,6 +54,7 @@ Thank you!
* Jaakko Luttinen
* Jakob Kramer
* Jef van Schendel
+* Jeremy Bowman
* Jeremy Pope
* jerome
* Jessica Tallon
diff --git a/devtools/compile_translations.sh b/devtools/compile_translations.sh
index 787a4554..1ef9d979 100755
--- a/devtools/compile_translations.sh
+++ b/devtools/compile_translations.sh
@@ -35,7 +35,7 @@ fi
##
## List of uncompilable translations: Lojban (jbo), Interlingua (ia)
-for file in `find mediagoblin/i18n/ -name "*.po"`; do
+for file in `find mediagoblin/i18n -name "*.po"`; do
if [ "$file" != "mediagoblin/i18n/jbo/mediagoblin.po" ] && \
[ "$file" != "mediagoblin/i18n/ia/mediagoblin.po" ] && \
[ "$file" != "mediagoblin/i18n/templates/en/mediagoblin.po" ]; then