include user.py in translations

qgis · May 30, 2015 · 2ab8a0b · 2ab8a0b
1 parent 96b535b
commit 2ab8a0b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -772,7 +772,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
      * @note added in QGIS 2.9
      */
     static QStringList splitToLines( const QString& text, const QString& wrapCharacter );
-    
+
     /** Splits a text string to a list of graphemes, which are the smallest allowable character
      * divisions in the string. This accounts for scripts were individual characters are not
      * allowed to be split apart (eg Arabic and Indic based scripts)

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 ..