Skip to content
Permalink
Browse files

include user.py in translations

Conflicts:
	python/core/qgspallabeling.sip

(cherry-picked from 2ab8a0b)
  • Loading branch information
jef-n authored and slarosa committed May 30, 2015
1 parent e4c2c68 commit e7b19a5e7922f28fa6b5fa1c81a075425c0d19f6
Showing with 2 additions and 3 deletions.
  1. +1 −2 python/user.py
  2. +1 −1 scripts/update_ts.sh
@@ -23,8 +23,7 @@ def load_user_expressions(path):
except:
error = traceback.format_exc()
msgtitle = QCoreApplication.translate("UserExpressions", "User expressions")
msg = QCoreApplication.translate("UserExpressions",
"The user expression {0} is not valid".format(name))
msg = QCoreApplication.translate("UserExpressions", "The user expression {0} is not valid").format(name)
QgsMessageLog.logMessage(msg +"\n"+ error, msgtitle, QgsMessageLog.WARNING)


@@ -88,7 +88,7 @@ fi

echo Updating python translations
cd python
pylupdate4 utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
pylupdate4 user.py utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
rm python-i18n.ts
cd ..

0 comments on commit e7b19a5

Please sign in to comment.
You can’t perform that action at this time.