File tree Expand file tree Collapse file tree 3 files changed +3
-4
lines changed Expand file tree Collapse file tree 3 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -772,7 +772,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
772
772
* @note added in QGIS 2.9
773
773
*/
774
774
static QStringList splitToLines( const QString& text, const QString& wrapCharacter );
775
-
775
+
776
776
/** Splits a text string to a list of graphemes, which are the smallest allowable character
777
777
* divisions in the string. This accounts for scripts were individual characters are not
778
778
* allowed to be split apart (eg Arabic and Indic based scripts)
Original file line number Diff line number Diff line change @@ -23,8 +23,7 @@ def load_user_expressions(path):
23
23
except :
24
24
error = traceback .format_exc ()
25
25
msgtitle = QCoreApplication .translate ("UserExpressions" , "User expressions" )
26
- msg = QCoreApplication .translate ("UserExpressions" ,
27
- "The user expression {0} is not valid" .format (name ))
26
+ msg = QCoreApplication .translate ("UserExpressions" , "The user expression {0} is not valid" ).format (name )
28
27
QgsMessageLog .logMessage (msg + "\n " + error , msgtitle , QgsMessageLog .WARNING )
29
28
30
29
Original file line number Diff line number Diff line change 88
88
89
89
echo Updating python translations
90
90
cd python
91
- pylupdate4 utils.py {console,pyplugin_installer}/* .{py,ui} -ts python-i18n.ts
91
+ pylupdate4 user.py utils.py {console,pyplugin_installer}/* .{py,ui} -ts python-i18n.ts
92
92
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
93
93
rm python-i18n.ts
94
94
cd ..
You can’t perform that action at this time.
0 commit comments