Skip to content

Commit 8dca115

Browse files
committed
Replace prioritise by prioritize
1 parent 69af2fa commit 8dca115

5 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎python/core/qgspallabeling.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ class QgsPalLayerSettings
408408
bool centroidInside; // whether centroid-point calculated must be inside polygon
409409

410410
/** Ordered list of predefined label positions for points. Positions earlier
411-
* in the list will be prioritised over later positions. Only used when the placement
411+
* in the list will be prioritized over later positions. Only used when the placement
412412
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
413413
* @note not available in Python bindings
414414
*/

‎scripts/spelling.dat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,8 @@ prepaired:prepared
357357
primative:primitive
358358
princliple:principle
359359
priorty:priority
360+
prioritise:prioritize
361+
prioritising:prioritizing
360362
proccesors:processors
361363
proces:process
362364
processessing:processing

‎src/core/pal/feature.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ namespace pal
143143
*/
144144
int createCandidatesOverPoint( double x, double y, QList<LabelPosition *> &lPos, double angle );
145145

146-
/** Generates candidates following a prioritised list of predefined positions around a point.
146+
/** Generates candidates following a prioritized list of predefined positions around a point.
147147
* @param x x coordinate of the point
148148
* @param y y coordinate of the point
149149
* @param lPos pointer to an array of candidates, will be filled by generated candidate

‎src/core/qgspallabeling.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ class CORE_EXPORT QgsPalLayerSettings
427427
bool centroidInside; // whether centroid-point calculated must be inside polygon
428428

429429
/** Ordered list of predefined label positions for points. Positions earlier
430-
* in the list will be prioritised over later positions. Only used when the placement
430+
* in the list will be prioritized over later positions. Only used when the placement
431431
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
432432
* @note not available in Python bindings
433433
*/

‎src/ui/qgstextformatwidgetbase.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3868,7 +3868,7 @@ font-style: italic;</string>
38683868
<item row="0" column="0">
38693869
<widget class="QRadioButton" name="radPredefinedOrder">
38703870
<property name="toolTip">
3871-
<string>Uses cartographically 'ideal' placements, prioritising label placement with best visual relationship with the point feature</string>
3871+
<string>Uses 'ideal' cartographic placements, prioritizing label placement with best visual relationship with the point feature</string>
38723872
</property>
38733873
<property name="text">
38743874
<string>Cartographic</string>

0 commit comments

Comments
 (0)