Skip to content

Commit 94cf3fc

Browse files
committed
Use "customize" instead of "customise"
Since we default to US spelling, we should always be using "customize"
1 parent fa5a7d2 commit 94cf3fc

File tree

48 files changed

+66
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+66
-64
lines changed

NEWS

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ This release has following new features:
435435
- Map Composer : Atlas navigation improvements
436436
- Map Composer : Custom format for grid annotations
437437
- Map Composer : Multiline text handling and automatic text wrapping in composer attribute tables
438-
- Map Composer : Advanced customisation of cell background color
438+
- Map Composer : Advanced customization of cell background color
439439
- Map Composer : Add fit page to contents option and options for cropping exports to contents
440440
- Map Composer : Force vector layers to render as a raster images
441441
- Map Composer : Data defined control over map layers and style presets

doc/news.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ <H1>5. What's new in Version 2.12 'Lyon'?</H1>
527527
<LI>Map Composer : Atlas navigation improvements
528528
<LI>Map Composer : Custom format for grid annotations
529529
<LI>Map Composer : Multiline text handling and automatic text wrapping in composer attribute tables
530-
<LI>Map Composer : Advanced customisation of cell background color
530+
<LI>Map Composer : Advanced customization of cell background color
531531
<LI>Map Composer : Add fit page to contents option and options for cropping exports to contents
532532
<LI>Map Composer : Force vector layers to render as a raster images
533533
<LI>Map Composer : Data defined control over map layers and style presets

doc/news.t2t

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ This release has following new features:
427427
- Map Composer : Atlas navigation improvements
428428
- Map Composer : Custom format for grid annotations
429429
- Map Composer : Multiline text handling and automatic text wrapping in composer attribute tables
430-
- Map Composer : Advanced customisation of cell background color
430+
- Map Composer : Advanced customization of cell background color
431431
- Map Composer : Add fit page to contents option and options for cropping exports to contents
432432
- Map Composer : Force vector layers to render as a raster images
433433
- Map Composer : Data defined control over map layers and style presets

python/core/auto_generated/layertree/qgslayertreenode.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Turn textual references to layers into map layer object from project.
145145
This method should be called after readXml()
146146
If ``looseMatching`` is true then a looser match will be used, where a layer
147147
will match if the name, public source, and data provider match. This can be
148-
used to match legend customisation from different projects where layers
148+
used to match legend customization from different projects where layers
149149
will have different layer IDs.
150150

151151
.. versionadded:: 3.0

python/core/auto_generated/layout/qgslayoutexporter.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ The ``dpi`` argument can be set to the actual DPI of exported file, or left as -
355355
%Docstring
356356
Generates the file name for a page during export.
357357

358-
Subclasses can override this method to customise page file naming.
358+
Subclasses can override this method to customize page file naming.
359359
%End
360360

361361
};

python/core/auto_generated/layout/qgslayoutrendercontext.sip.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ whether they will be rendered in layout exports.
167167
%Docstring
168168
Sets the current item ``layer`` to draw while exporting. QgsLayoutItem subclasses
169169
which support multi-layer SVG exports must check the currentExportLayer()
170-
and customise their rendering based on the layer.
170+
and customize their rendering based on the layer.
171171

172172
If ``layer`` is -1, all item layers will be rendered.
173173

@@ -178,7 +178,7 @@ If ``layer`` is -1, all item layers will be rendered.
178178
%Docstring
179179
Returns the current item layer to draw while exporting. QgsLayoutItem subclasses
180180
which support multi-layer SVG exports must check this
181-
and customise their rendering based on the layer.
181+
and customize their rendering based on the layer.
182182

183183
If ``layer`` is -1, all item layers should be rendered.
184184

python/core/auto_generated/processing/qgsprocessingparameters.sip.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,15 +322,15 @@ method.
322322
QVariantMap &metadata();
323323
%Docstring
324324
Returns the parameter's freeform metadata. This is mostly used by parameter widget wrappers
325-
in order to customise their appearance and behavior.
325+
in order to customize their appearance and behavior.
326326

327327
.. seealso:: :py:func:`setMetadata`
328328
%End
329329

330330
void setMetadata( const QVariantMap &metadata );
331331
%Docstring
332332
Sets the parameter's freeform ``metadata``. This is mostly used by parameter widget wrappers
333-
in order to customise their appearance and behavior.
333+
in order to customize their appearance and behavior.
334334

335335
.. seealso:: :py:func:`metadata`
336336
%End

python/core/auto_generated/qgsvectordataprovider.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ Must be implemented by providers that support delete styles from db returning tr
487487
Creates a new vector layer feature renderer, using provider backend specific information.
488488

489489
The ``configuration`` map can be used to pass provider-specific configuration maps to the provider to
490-
allow customisation of the returned renderer. Support and format of ``configuration`` varies by provider.
490+
allow customization of the returned renderer. Support and format of ``configuration`` varies by provider.
491491

492492
When called with an empty ``configuration`` map the provider's default renderer will be returned.
493493

python/gui/auto_generated/attributetable/qgsfieldconditionalformatwidget.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class QgsFieldConditionalFormatWidget : QWidget
1212
{
1313
%Docstring
14-
A widget for customising conditional formatting options.
14+
A widget for customizing conditional formatting options.
1515

1616
.. versionadded:: 2.12
1717
%End

python/gui/auto_generated/editorwidgets/qgsmultiedittoolbutton.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Returns the current displayed state of the button.
4444

4545
void setField( const QgsField &field );
4646
%Docstring
47-
Sets the field associated with this button. This is used to customise the widget menu
47+
Sets the field associated with this button. This is used to customize the widget menu
4848
and tooltips to match the field properties.
4949

5050
:param field: associated field

python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class QgsEffectStackCompactWidget: QgsPanelWidget
183183
{
184184
%Docstring
185185
A small widget consisting of a checkbox for enabling/disabling an effect stack
186-
and a button for opening an effect stack customisation dialog.
186+
and a button for opening an effect stack customization dialog.
187187

188188
.. versionadded:: 2.9
189189

python/gui/auto_generated/locator/qgslocatorwidget.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Returns a pointer to the locator utilized by this widget.
3939
void setMapCanvas( QgsMapCanvas *canvas );
4040
%Docstring
4141
Sets a map ``canvas`` to associate with the widget. This allows the
42-
widget to customise the searches performed by its locator(), such
42+
widget to customize the searches performed by its locator(), such
4343
as prioritizing results which are near the current canvas extent.
4444
%End
4545

python/gui/auto_generated/qgscolorbutton.sip.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Returns the string used for the "no color" option in the button's drop-down menu
264264
void setContext( const QString &context );
265265
%Docstring
266266
Sets the context string for the color button. The context string is passed to all color swatch
267-
grids shown in the button's drop-down menu, to allow them to customise their display colors
267+
grids shown in the button's drop-down menu, to allow them to customize their display colors
268268
based on the context.
269269

270270
:param context: context string for the color button's color swatch grids
@@ -275,7 +275,7 @@ based on the context.
275275
QString context() const;
276276
%Docstring
277277
Returns the context string for the color button. The context string is passed to all color swatch
278-
grids shown in the button's drop-down menu, to allow them to customise their display colors
278+
grids shown in the button's drop-down menu, to allow them to customize their display colors
279279
based on the context.
280280

281281
:return: context string for the color button's color swatch grids

python/gui/auto_generated/qgscolorrampbutton.sip.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Returns true if the current color is null.
179179
void setContext( const QString &context );
180180
%Docstring
181181
Sets the context string for the color ramp button. The context string is passed to all color ramp
182-
preview icons shown in the button's drop-down menu, to (eventually) allow them to customise their display colors
182+
preview icons shown in the button's drop-down menu, to (eventually) allow them to customize their display colors
183183
based on the context.
184184

185185
:param context: context string for the color dialog button's color ramp preview icons
@@ -190,7 +190,7 @@ based on the context.
190190
QString context() const;
191191
%Docstring
192192
Returns the context string for the color ramp button. The context string is passed to all color ramp
193-
preview icons shown in the button's drop-down menu, to (eventually) allow them to customise their display colors
193+
preview icons shown in the button's drop-down menu, to (eventually) allow them to customize their display colors
194194
based on the context.
195195

196196
:return: context context string for the color dialog button's color ramp preview icons

python/gui/auto_generated/qgsfontbutton.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class QgsFontButton : QToolButton
1313
{
1414
%Docstring
15-
A button for customising QgsTextFormat settings.
15+
A button for customizing QgsTextFormat settings.
1616

1717
The button will open a detailed text format settings dialog when clicked. An attached drop-down
1818
menu allows for copying and pasting text styles, picking colors for the text, and for dropping

python/gui/auto_generated/qgspropertyassistantwidget.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Shows a user-friendly assistant guiding users through the creation of QgsPropert
3030
const QgsVectorLayer *layer = 0 );
3131
%Docstring
3232
Constructor for QgsPropertyAssistantWidget. Aside from a ``parent`` widget, the constructor accepts a
33-
corresponding property ``definition`` from which it customises the displayed options (eg a color based
33+
corresponding property ``definition`` from which it customizes the displayed options (eg a color based
3434
property definition will show an assistant to allow creation of color based properties).
3535
The ``initialState`` dictates the initial state to show in the widget. A corresponding ``layer``
3636
can also be set to allow population of GUI widgets such as field selectors.

python/gui/auto_generated/qgsshortcutsmanager.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ Returns a shortcut by its name, or None if nothing found
290290

291291
QString settingsPath() const;
292292
%Docstring
293-
Returns the root settings path used to store shortcut customisation.
293+
Returns the root settings path used to store shortcut customization.
294294
%End
295295

296296
};

python/gui/auto_generated/qgstextformatwidget.sip.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
class QgsTextFormatWidget : QWidget, protected Ui::QgsTextFormatWidgetBase
1616
{
1717
%Docstring
18-
A widget for customising text formatting settings.
18+
A widget for customizing text formatting settings.
1919

2020
QgsTextFormatWidget provides a widget for controlling the appearance of text rendered
2121
using QgsTextRenderer. The widget includes all settings contained within
@@ -131,7 +131,7 @@ Updates label placement options to reflect current state of widget
131131
class QgsTextFormatDialog : QDialog
132132
{
133133
%Docstring
134-
A simple dialog for customising text formatting settings.
134+
A simple dialog for customizing text formatting settings.
135135

136136
QgsTextFormatDialog provides a dialog for controlling the appearance of text rendered
137137
using :py:class:`QgsTextRenderer`. The dialog includes all settings contained within
@@ -168,7 +168,7 @@ Returns the current formatting settings defined by the widget.
168168
class QgsTextFormatPanelWidget : QgsPanelWidgetWrapper
169169
{
170170
%Docstring
171-
A panel widget for customising text formatting settings.
171+
A panel widget for customizing text formatting settings.
172172

173173
QgsTextFormatPanelWidget provides a panel widget for controlling the appearance of text rendered
174174
using :py:class:`QgsTextRenderer`. The dialog includes all settings contained within

python/gui/auto_generated/symbology/qgsnullsymbolrendererwidget.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
class QgsNullSymbolRendererWidget : QgsRendererWidget
1414
{
1515
%Docstring
16-
Blank widget for customising QgsNullSymbolRenderer.
16+
Blank widget for customizing QgsNullSymbolRenderer.
1717

1818
.. versionadded:: 2.16
1919
%End

scripts/spell_check/spelling.dat

+2
Original file line numberDiff line numberDiff line change
@@ -1888,6 +1888,8 @@ currenly:currently
18881888
currnt:current
18891889
curriculem:curriculum
18901890
customicable:customizable
1891+
customisation:customization
1892+
customise:customize
18911893
cxan:cyan
18921894
cyclinder:cylinder
18931895
cymk:CMYK

src/app/layout/qgslayoutattributeselectiondialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ bool QgsLayoutAttributeTableColumnModel::setData( const QModelIndex &index, cons
230230
switch ( index.column() )
231231
{
232232
case 0:
233-
// also update column's heading, if it hasn't been customised
233+
// also update column's heading, if it hasn't been customized
234234
if ( column->heading().isEmpty() || ( column->heading() == column->attribute() ) )
235235
{
236236
column->setHeading( value.toString() );

src/app/layout/qgslayoutattributeselectiondialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class QgsLayoutAttributeTableColumnModel: public QAbstractTableModel
8787

8888
/**
8989
* Resets the attribute table's columns to match the source layer's fields. Remove all existing
90-
* attribute table columns and column customisations.
90+
* attribute table columns and column customizations.
9191
*/
9292
void resetToLayer();
9393

src/app/layout/qgslayoutattributetablewidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ QgsLayoutAttributeTableWidget::QgsLayoutAttributeTableWidget( QgsLayoutFrame *fr
6868
connect( mEmptyFrameCheckBox, &QCheckBox::toggled, this, &QgsLayoutAttributeTableWidget::mEmptyFrameCheckBox_toggled );
6969
connect( mHideEmptyBgCheckBox, &QCheckBox::toggled, this, &QgsLayoutAttributeTableWidget::mHideEmptyBgCheckBox_toggled );
7070
connect( mWrapBehaviorComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsLayoutAttributeTableWidget::mWrapBehaviorComboBox_currentIndexChanged );
71-
connect( mAdvancedCustomisationButton, &QPushButton::clicked, this, &QgsLayoutAttributeTableWidget::mAdvancedCustomisationButton_clicked );
71+
connect( mAdvancedCustomizationButton, &QPushButton::clicked, this, &QgsLayoutAttributeTableWidget::mAdvancedCustomizationButton_clicked );
7272
setPanelTitle( tr( "Table Properties" ) );
7373

7474
mContentFontToolButton->setMode( QgsFontButton::ModeQFont );
@@ -887,7 +887,7 @@ void QgsLayoutAttributeTableWidget::mWrapBehaviorComboBox_currentIndexChanged( i
887887
mTable->endCommand();
888888
}
889889

890-
void QgsLayoutAttributeTableWidget::mAdvancedCustomisationButton_clicked()
890+
void QgsLayoutAttributeTableWidget::mAdvancedCustomizationButton_clicked()
891891
{
892892
if ( !mTable )
893893
{

src/app/layout/qgslayoutattributetablewidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class QgsLayoutAttributeTableWidget: public QgsLayoutItemBaseWidget, private Ui:
8484
void mEmptyFrameCheckBox_toggled( bool checked );
8585
void mHideEmptyBgCheckBox_toggled( bool checked );
8686
void mWrapBehaviorComboBox_currentIndexChanged( int index );
87-
void mAdvancedCustomisationButton_clicked();
87+
void mAdvancedCustomizationButton_clicked();
8888

8989
//! Inserts a new maximum number of features into the spin box (without the spinbox emitting a signal)
9090
void setMaximumNumberOfFeatures( int n );

src/app/layout/qgslayoutimageexportoptionsdialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424

2525
/**
26-
* A dialog for customising the properties of an exported image file.
26+
* A dialog for customizing the properties of an exported image file.
2727
* \since QGIS 3.0
2828
*/
2929
class QgsLayoutImageExportOptionsDialog: public QDialog, private Ui::QgsLayoutImageExportOptionsDialog

src/app/layout/qgslayouttablebackgroundcolorsdialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class QCheckBox;
2626
class QgsColorButton;
2727

2828
/**
29-
* A dialog for customisation of the cell background colors for a QgsLayoutTable
29+
* A dialog for customization of the cell background colors for a QgsLayoutTable
3030
* \since QGIS 3.0
3131
*/
3232
class QgsLayoutTableBackgroundColorsDialog: public QDialog, private Ui::QgsLayoutTableBackgroundDialog

src/app/qgscustomprojectiondialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
class QDir;
2727

2828
/**
29-
The custom projection widget is used to define the projection family, ellipsoid and paremters needed by proj4 to assemble a customised projection definition. The resulting projection will be store in an sqlite backend.
29+
The custom projection widget is used to define the projection family, ellipsoid and paremters needed by proj4 to assemble a customized projection definition. The resulting projection will be store in an sqlite backend.
3030
*/
3131
class APP_EXPORT QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectionDialogBase
3232
{

src/core/layertree/qgslayertreenode.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class CORE_EXPORT QgsLayerTreeNode : public QObject
150150
* This method should be called after readXml()
151151
* If \a looseMatching is true then a looser match will be used, where a layer
152152
* will match if the name, public source, and data provider match. This can be
153-
* used to match legend customisation from different projects where layers
153+
* used to match legend customization from different projects where layers
154154
* will have different layer IDs.
155155
* \since QGIS 3.0
156156
*/

src/core/layout/qgslayoutexporter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ class CORE_EXPORT QgsLayoutExporter
483483
/**
484484
* Generates the file name for a page during export.
485485
*
486-
* Subclasses can override this method to customise page file naming.
486+
* Subclasses can override this method to customize page file naming.
487487
*/
488488
virtual QString generateFileName( const PageExportDetails &details ) const;
489489

src/core/layout/qgslayoutrendercontext.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class CORE_EXPORT QgsLayoutRenderContext : public QObject
166166
/**
167167
* Sets the current item \a layer to draw while exporting. QgsLayoutItem subclasses
168168
* which support multi-layer SVG exports must check the currentExportLayer()
169-
* and customise their rendering based on the layer.
169+
* and customize their rendering based on the layer.
170170
*
171171
* If \a layer is -1, all item layers will be rendered.
172172
*
@@ -177,7 +177,7 @@ class CORE_EXPORT QgsLayoutRenderContext : public QObject
177177
/**
178178
* Returns the current item layer to draw while exporting. QgsLayoutItem subclasses
179179
* which support multi-layer SVG exports must check this
180-
* and customise their rendering based on the layer.
180+
* and customize their rendering based on the layer.
181181
*
182182
* If \a layer is -1, all item layers should be rendered.
183183
*

src/core/processing/qgsprocessingparameters.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -384,22 +384,22 @@ class CORE_EXPORT QgsProcessingParameterDefinition
384384

385385
/**
386386
* Returns the parameter's freeform metadata. This is mostly used by parameter widget wrappers
387-
* in order to customise their appearance and behavior.
387+
* in order to customize their appearance and behavior.
388388
* \see setMetadata()
389389
* \note not available in Python bindings.
390390
*/
391391
SIP_SKIP QVariantMap metadata() const { return mMetadata; }
392392

393393
/**
394394
* Returns the parameter's freeform metadata. This is mostly used by parameter widget wrappers
395-
* in order to customise their appearance and behavior.
395+
* in order to customize their appearance and behavior.
396396
* \see setMetadata()
397397
*/
398398
QVariantMap &metadata() { return mMetadata; }
399399

400400
/**
401401
* Sets the parameter's freeform \a metadata. This is mostly used by parameter widget wrappers
402-
* in order to customise their appearance and behavior.
402+
* in order to customize their appearance and behavior.
403403
* \see metadata()
404404
*/
405405
void setMetadata( const QVariantMap &metadata ) { mMetadata = metadata; }
@@ -504,7 +504,7 @@ class CORE_EXPORT QgsProcessingParameterDefinition
504504
//! Parameter flags
505505
Flags mFlags;
506506

507-
//! Freeform metadata for parameter. Mostly used by widget wrappers to customise their appearance and behavior.
507+
//! Freeform metadata for parameter. Mostly used by widget wrappers to customize their appearance and behavior.
508508
QVariantMap mMetadata;
509509

510510
//! Pointer to algorithm which owns this parameter

src/core/qgsvectordataprovider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
488488
* Creates a new vector layer feature renderer, using provider backend specific information.
489489
*
490490
* The \a configuration map can be used to pass provider-specific configuration maps to the provider to
491-
* allow customisation of the returned renderer. Support and format of \a configuration varies by provider.
491+
* allow customization of the returned renderer. Support and format of \a configuration varies by provider.
492492
*
493493
* When called with an empty \a configuration map the provider's default renderer will be returned.
494494
*

src/gui/attributetable/qgsfieldconditionalformatwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**
2828
* \ingroup gui
2929
* \class QgsFieldConditionalFormatWidget
30-
* A widget for customising conditional formatting options.
30+
* A widget for customizing conditional formatting options.
3131
* \since QGIS 2.12
3232
*/
3333
class GUI_EXPORT QgsFieldConditionalFormatWidget : public QWidget, private Ui::QgsFieldConditionalWidget

0 commit comments

Comments
 (0)