Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
include user.py in translations
Conflicts:
	python/core/qgspallabeling.sip

(cherry-picked from 2ab8a0b)
  • Loading branch information
jef-n authored and slarosa committed Jul 13, 2015
1 parent e4c2c68 commit e7b19a5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions python/user.py
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion scripts/update_ts.sh
Expand Up @@ -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 ..
Expand Down

0 comments on commit e7b19a5

Please sign in to comment.