include user.py in translations

jef-n · slarosa · commit e7b19a5e7922 · 2015-07-13T15:37:00.000+02:00
Conflicts: python/core/qgspallabeling.sip (cherry-picked from 2ab8a0b)
diff --git a/python/user.py b/python/user.py
@@ -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)
 
 
diff --git a/scripts/update_ts.sh b/scripts/update_ts.sh
@@ -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 ..
